r16856 - in /packages/unstable/gdesklets/debian: changelog control control.in patches/40_dont_update_mime.diff patches/70_relibtoolize.diff rules
manphiz-guest at users.alioth.debian.org
manphiz-guest at users.alioth.debian.org
Mon Sep 1 14:08:59 UTC 2008
Author: manphiz-guest
Date: Mon Sep 1 14:08:57 2008
New Revision: 16856
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16856
Log:
* Include patches based on Cesare Tirabassi <norsetto at ubuntu.com>'s proposal
to stop gdesklets from generating mime to /usr/share/mime.
Thanks Cesare Tirabassi. Closes: #497370.
+ Added 40_dont_update_mime.diff based on Cesare's patch.
+ Refresh 70_relibtoolize.diff.
- Remove lines to remove mime files by hand in debian/rules based on
Cesare's patch.
+ Fix RC bug, hence high urgency.
Added:
packages/unstable/gdesklets/debian/patches/40_dont_update_mime.diff
Modified:
packages/unstable/gdesklets/debian/changelog
packages/unstable/gdesklets/debian/control
packages/unstable/gdesklets/debian/control.in
packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff
packages/unstable/gdesklets/debian/rules
Modified: packages/unstable/gdesklets/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/changelog?rev=16856&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/changelog (original)
+++ packages/unstable/gdesklets/debian/changelog Mon Sep 1 14:08:57 2008
@@ -1,3 +1,16 @@
+gdesklets (0.36-4) unstable; urgency=high
+
+ * Include patches based on Cesare Tirabassi <norsetto at ubuntu.com>'s proposal
+ to stop gdesklets from generating mime to /usr/share/mime.
+ Thanks Cesare Tirabassi. Closes: #497370.
+ + Added 40_dont_update_mime.diff based on Cesare's patch.
+ + Refresh 70_relibtoolize.diff.
+ - Remove lines to remove mime files by hand in debian/rules based on
+ Cesare's patch.
+ + Fix RC bug, hence high urgency.
+
+ -- Deng Xiyue <manphiz-guest at users.alioth.debian.org> Mon, 01 Sep 2008 21:53:21 +0800
+
gdesklets (0.36-3) unstable; urgency=low
[ Loic Minier ]
Modified: packages/unstable/gdesklets/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control?rev=16856&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control (original)
+++ packages/unstable/gdesklets/debian/control Mon Sep 1 14:08:57 2008
@@ -18,7 +18,8 @@
libxml-parser-perl,
librsvg2-dev (>= 2.8.0),
autotools-dev,
- python-support (>= 0.3)
+ python-support (>= 0.3),
+ intltool
Standards-Version: 3.7.3
XS-Python-Version: all
Modified: packages/unstable/gdesklets/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/control.in?rev=16856&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/control.in (original)
+++ packages/unstable/gdesklets/debian/control.in Mon Sep 1 14:08:57 2008
@@ -18,7 +18,8 @@
libxml-parser-perl,
librsvg2-dev (>= 2.8.0),
autotools-dev,
- python-support (>= 0.3)
+ python-support (>= 0.3),
+ intltool
Standards-Version: 3.7.3
XS-Python-Version: all
Added: packages/unstable/gdesklets/debian/patches/40_dont_update_mime.diff
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/patches/40_dont_update_mime.diff?rev=16856&op=file
==============================================================================
--- packages/unstable/gdesklets/debian/patches/40_dont_update_mime.diff (added)
+++ packages/unstable/gdesklets/debian/patches/40_dont_update_mime.diff Mon Sep 1 14:08:57 2008
@@ -1,0 +1,21 @@
+diff -urN gdesklets-0.36.orig/data/Makefile.am gdesklets-0.36/data/Makefile.am
+--- gdesklets-0.36.orig/data/Makefile.am 2007-11-26 03:50:12.000000000 +0800
++++ gdesklets-0.36/data/Makefile.am 2008-09-01 21:25:00.000000000 +0800
+@@ -49,17 +49,11 @@
+ cd $(DESTDIR)/$(fakepixmapdir); \
+ $(LN_S) -f ../../../share/pixmaps/gdesklets.png gdesklets.png;
+
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
+
+ uninstall-local: uninstall-desktopDATA uninstall-sharedmimepackageDATA
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
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=16856&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff (original)
+++ packages/unstable/gdesklets/debian/patches/70_relibtoolize.diff Mon Sep 1 14:08:57 2008
@@ -1,6 +1,6 @@
diff -urN gdesklets-0.36.orig/aclocal.m4 gdesklets-0.36/aclocal.m4
--- gdesklets-0.36.orig/aclocal.m4 2008-02-17 01:45:31.000000000 +0800
-+++ gdesklets-0.36/aclocal.m4 2008-03-01 01:27:23.000000000 +0800
++++ gdesklets-0.36/aclocal.m4 2008-09-01 21:27:15.000000000 +0800
@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
@@ -50,11 +50,11 @@
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 35 IT_PROG_INTLTOOL
-+# serial 36 IT_PROG_INTLTOOL
++# serial 40 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
-@@ -460,7 +467,7 @@
+@@ -460,17 +467,24 @@
esac
if test -n "$1"; then
@@ -62,8 +62,27 @@
+ AC_MSG_CHECKING([for intltool >= $1])
INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-@@ -489,6 +496,7 @@
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ ]
+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
+ fi
+
++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+@@ -489,6 +503,7 @@
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
@@ -71,12 +90,16 @@
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -508,6 +516,21 @@
+@@ -508,13 +523,23 @@
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
-+
+
+-# Use the tools built into the package, not the ones that are installed.
+-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
+-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
+-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+# Check the gettext tools to make sure they are GNU
+AC_PATH_PROG(XGETTEXT, xgettext)
+AC_PATH_PROG(MSGMERGE, msgmerge)
@@ -91,9 +114,12 @@
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+fi
- # Use the tools built into the package, not the ones that are installed.
- AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-@@ -530,19 +553,16 @@
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
++AC_PATH_PROG(INTLTOOL_PERL, [perl])
+ if test -z "$INTLTOOL_PERL"; then
+ AC_MSG_ERROR([perl not found; required for intltool])
+ fi
+@@ -530,19 +555,16 @@
fi
fi
@@ -117,38 +143,65 @@
[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" \
+@@ -563,48 +585,6 @@
+
+ IT_PO_SUBDIR([po])
+
+-dnl The following is very similar to
+-dnl
+-dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
+-dnl
+-dnl with the following slight differences:
+-dnl - the *.in files are in ac_aux_dir,
+-dnl - if the file haven't changed upon reconfigure, it's not touched,
+-dnl - the evaluation of the third parameter enables a hack which computes
+-dnl the actual value of $libdir,
+-dnl - the user sees "executing intltool commands", instead of
+-dnl "creating intltool-extract" and such.
+-dnl
+-dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
+-dnl a reason for it.
+-
+-AC_CONFIG_COMMANDS([intltool], [
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
-@@ -601,9 +617,7 @@
- ],
- [INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
- prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+-],
+-[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'])
-
+-
])
-@@ -652,7 +666,7 @@
+
+@@ -652,7 +632,7 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
-+# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -740,7 +754,6 @@
+@@ -740,7 +720,6 @@
AC_REQUIRE([AC_OBJEXT])dnl
AC_REQUIRE([AC_EXEEXT])dnl
dnl
@@ -156,7 +209,7 @@
AC_LIBTOOL_SYS_MAX_CMD_LEN
AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
AC_LIBTOOL_OBJDIR
-@@ -815,7 +828,7 @@
+@@ -815,7 +794,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -165,7 +218,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -842,6 +855,8 @@
+@@ -842,6 +821,8 @@
;;
esac
@@ -174,7 +227,7 @@
AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
enable_win32_dll=yes, enable_win32_dll=no)
-@@ -902,8 +917,9 @@
+@@ -902,8 +883,9 @@
# Check for compiler boilerplate output or warnings with
# the simple compiler test code.
AC_DEFUN([_LT_COMPILER_BOILERPLATE],
@@ -186,7 +239,7 @@
eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
_lt_compiler_boilerplate=`cat conftest.err`
$rm conftest*
-@@ -915,13 +931,85 @@
+@@ -915,13 +897,85 @@
# Check for linker boilerplate output or warnings with
# the simple link test code.
AC_DEFUN([_LT_LINKER_BOILERPLATE],
@@ -275,7 +328,7 @@
# _LT_AC_SYS_LIBPATH_AIX
# ----------------------
-@@ -932,12 +1020,20 @@
+@@ -932,12 +986,20 @@
# If we don't find anything, use the default library path according
# to the aix ld manual.
AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
@@ -301,7 +354,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
])# _LT_AC_SYS_LIBPATH_AIX
-@@ -1168,13 +1264,17 @@
+@@ -1168,13 +1230,17 @@
rm -rf conftest*
;;
@@ -320,7 +373,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -1191,6 +1291,9 @@
+@@ -1191,6 +1257,9 @@
;;
*64-bit*)
case $host in
@@ -330,7 +383,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -1231,7 +1334,11 @@
+@@ -1231,7 +1300,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -343,7 +396,7 @@
esac
;;
esac
-@@ -1262,7 +1369,7 @@
+@@ -1262,7 +1335,7 @@
AC_CACHE_CHECK([$1], [$2],
[$2=no
ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
@@ -352,7 +405,7 @@
lt_compiler_flag="$3"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -1303,11 +1410,12 @@
+@@ -1303,11 +1376,12 @@
# ------------------------------------------------------------
# Check whether the given compiler option works
AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
@@ -367,7 +420,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -1323,7 +1431,7 @@
+@@ -1323,7 +1397,7 @@
$2=yes
fi
fi
@@ -376,7 +429,7 @@
LDFLAGS="$save_LDFLAGS"
])
-@@ -1421,24 +1529,27 @@
+@@ -1421,24 +1495,27 @@
fi
;;
*)
@@ -421,7 +474,7 @@
;;
esac
])
-@@ -1591,7 +1702,7 @@
+@@ -1591,7 +1668,7 @@
AC_CHECK_FUNC([shl_load],
[lt_cv_dlopen="shl_load"],
[AC_CHECK_LIB([dld], [shl_load],
@@ -430,7 +483,7 @@
[AC_CHECK_FUNC([dlopen],
[lt_cv_dlopen="dlopen"],
[AC_CHECK_LIB([dl], [dlopen],
-@@ -1599,7 +1710,7 @@
+@@ -1599,7 +1676,7 @@
[AC_CHECK_LIB([svld], [dlopen],
[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
[AC_CHECK_LIB([dld], [dld_link],
@@ -439,7 +492,7 @@
])
])
])
-@@ -1665,7 +1776,8 @@
+@@ -1665,7 +1742,8 @@
# ---------------------------------
# Check to see if options -c and -o are simultaneously supported by compiler
AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
@@ -449,7 +502,7 @@
AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
[_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-@@ -1673,7 +1785,7 @@
+@@ -1673,7 +1751,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -458,7 +511,7 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -1813,6 +1925,7 @@
+@@ -1813,6 +1891,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -466,7 +519,7 @@
AC_MSG_RESULT([yes])
else
AC_MSG_RESULT([no])
-@@ -1830,7 +1943,8 @@
+@@ -1830,7 +1909,8 @@
# -----------------------------
# PORTME Fill in your ld.so characteristics
AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
@@ -476,7 +529,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -1844,20 +1958,58 @@
+@@ -1844,20 +1924,58 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -540,7 +593,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -1875,7 +2027,7 @@
+@@ -1875,7 +1993,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -549,7 +602,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2014,12 +2166,8 @@
+@@ -2014,12 +2132,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -564,7 +617,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -2073,7 +2221,7 @@
+@@ -2073,7 +2187,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -573,7 +626,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -2136,7 +2284,7 @@
+@@ -2136,7 +2250,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -582,7 +635,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -2207,7 +2355,7 @@
+@@ -2207,7 +2321,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -591,7 +644,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -2313,6 +2461,10 @@
+@@ -2313,6 +2427,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -602,7 +655,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -2408,6 +2560,13 @@
+@@ -2408,6 +2526,13 @@
AC_MSG_RESULT([$dynamic_linker])
test "$dynamic_linker" = no && can_build_shared=no
@@ -616,7 +669,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -2418,7 +2577,8 @@
+@@ -2418,7 +2543,8 @@
# _LT_AC_TAGCONFIG
# ----------------
AC_DEFUN([_LT_AC_TAGCONFIG],
@@ -626,7 +679,7 @@
[AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
[include additional configurations @<:@automatic@:>@])],
[tagnames="$withval"])
-@@ -2679,7 +2839,7 @@
+@@ -2679,7 +2805,7 @@
# AC_PATH_TOOL_PREFIX
# -------------------
@@ -635,7 +688,7 @@
AC_DEFUN([AC_PATH_TOOL_PREFIX],
[AC_REQUIRE([AC_PROG_EGREP])dnl
AC_MSG_CHECKING([for $1])
-@@ -2742,7 +2902,7 @@
+@@ -2742,7 +2868,7 @@
# AC_PATH_MAGIC
# -------------
@@ -644,7 +697,7 @@
AC_DEFUN([AC_PATH_MAGIC],
[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
-@@ -2889,7 +3049,7 @@
+@@ -2889,7 +3015,7 @@
# how to check for library dependencies
# -- PORTME fill in with the dynamic library characteristics
AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
@@ -653,7 +706,7 @@
lt_cv_deplibs_check_method,
[lt_cv_file_magic_cmd='$MAGIC_CMD'
lt_cv_file_magic_test_file=
-@@ -2906,7 +3066,7 @@
+@@ -2906,7 +3032,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -662,7 +715,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -2928,9 +3088,15 @@
+@@ -2928,9 +3054,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -681,7 +734,7 @@
;;
darwin* | rhapsody*)
-@@ -2975,7 +3141,7 @@
+@@ -2975,7 +3107,7 @@
esac
;;
@@ -690,7 +743,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
;;
-@@ -3025,6 +3191,10 @@
+@@ -3025,6 +3157,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -701,7 +754,7 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -3077,7 +3247,7 @@
+@@ -3077,7 +3213,7 @@
lt_cv_path_NM="$NM"
else
lt_nm_to_check="${ac_tool_prefix}nm"
@@ -710,7 +763,7 @@
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
-@@ -3293,10 +3463,10 @@
+@@ -3293,10 +3429,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -723,7 +776,7 @@
_LT_AC_SYS_COMPILER
-@@ -3332,7 +3502,7 @@
+@@ -3332,7 +3468,7 @@
fi
;;
@@ -732,7 +785,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -3389,6 +3559,7 @@
+@@ -3389,6 +3525,7 @@
_LT_AC_TAGVAR(predeps, $1)=
_LT_AC_TAGVAR(postdeps, $1)=
_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
@@ -740,7 +793,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -3398,10 +3569,10 @@
+@@ -3398,10 +3535,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -753,7 +806,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -3498,7 +3669,7 @@
+@@ -3498,7 +3635,7 @@
# FIXME: insert proper C++ library support
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
@@ -762,7 +815,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -3511,7 +3682,7 @@
+@@ -3511,7 +3648,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -771,7 +824,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -3547,7 +3718,7 @@
+@@ -3547,7 +3684,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -780,7 +833,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -3657,59 +3828,31 @@
+@@ -3657,59 +3794,31 @@
fi
;;
darwin* | rhapsody*)
@@ -851,7 +904,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -3792,9 +3935,7 @@
+@@ -3792,9 +3901,7 @@
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -862,7 +915,7 @@
*)
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
;;
-@@ -3862,7 +4003,7 @@
+@@ -3862,7 +3969,7 @@
;;
esac
;;
@@ -871,7 +924,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -3954,7 +4095,7 @@
+@@ -3954,7 +4061,7 @@
_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -880,7 +933,7 @@
# Portland Group C++ compiler
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -3982,6 +4123,29 @@
+@@ -3982,6 +4089,29 @@
# dependencies.
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
;;
@@ -910,7 +963,7 @@
esac
;;
lynxos*)
-@@ -4020,16 +4184,20 @@
+@@ -4020,16 +4150,20 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
;;
openbsd*)
@@ -940,7 +993,7 @@
;;
osf3*)
case $cc_basename in
-@@ -4191,15 +4359,10 @@
+@@ -4191,15 +4325,10 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -959,7 +1012,7 @@
;;
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -4246,6 +4409,12 @@
+@@ -4246,6 +4375,12 @@
fi
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -972,7 +1025,7 @@
fi
;;
esac
-@@ -4361,7 +4530,8 @@
+@@ -4361,7 +4496,8 @@
# compiler output when linking a shared library.
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
@@ -982,7 +1035,7 @@
dnl we can't use the lt_simple_compile_test_code here,
dnl because it contains code intended for an executable,
dnl not a library. It's possible we should let each
-@@ -4486,10 +4656,15 @@
+@@ -4486,10 +4622,15 @@
$rm -f confest.$objext
@@ -999,7 +1052,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
_LT_AC_TAGVAR(predep_objects,$1)=
-@@ -4497,19 +4672,51 @@
+@@ -4497,19 +4638,51 @@
_LT_AC_TAGVAR(postdeps,$1)=
;;
@@ -1053,7 +1106,7 @@
case " $_LT_AC_TAGVAR(postdeps, $1) " in
*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
esac
-@@ -4552,10 +4759,17 @@
+@@ -4552,10 +4725,17 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1073,7 +1126,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4587,7 +4801,7 @@
+@@ -4587,7 +4767,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -1082,7 +1135,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -4634,10 +4848,10 @@
+@@ -4634,10 +4814,10 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1095,7 +1148,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_AC_SYS_COMPILER
-@@ -4690,7 +4904,7 @@
+@@ -4690,7 +4870,7 @@
_LT_AC_TAGVAR(objext, $1)=$objext
# Code to be used in simple compile tests
@@ -1104,7 +1157,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -4764,6 +4978,7 @@
+@@ -4764,6 +4944,7 @@
_LT_AC_TAGVAR(predeps, $1) \
_LT_AC_TAGVAR(postdeps, $1) \
_LT_AC_TAGVAR(compiler_lib_search_path, $1) \
@@ -1112,7 +1165,7 @@
_LT_AC_TAGVAR(archive_cmds, $1) \
_LT_AC_TAGVAR(archive_expsym_cmds, $1) \
_LT_AC_TAGVAR(postinstall_cmds, $1) \
-@@ -4779,6 +4994,7 @@
+@@ -4779,6 +4960,7 @@
_LT_AC_TAGVAR(module_cmds, $1) \
_LT_AC_TAGVAR(module_expsym_cmds, $1) \
_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
@@ -1120,7 +1173,7 @@
_LT_AC_TAGVAR(exclude_expsyms, $1) \
_LT_AC_TAGVAR(include_expsyms, $1); do
-@@ -4825,7 +5041,7 @@
+@@ -4825,7 +5007,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -1129,7 +1182,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -5062,6 +5278,10 @@
+@@ -5062,6 +5244,10 @@
# shared library.
postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
@@ -1140,7 +1193,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-@@ -5150,7 +5370,7 @@
+@@ -5150,7 +5336,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -1149,7 +1202,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-@@ -5233,6 +5453,7 @@
+@@ -5233,6 +5419,7 @@
# ---------------------------------
AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -1157,7 +1210,7 @@
AC_REQUIRE([AC_PROG_NM])
AC_REQUIRE([AC_OBJEXT])
# Check for command to grab the raw symbol name followed by C symbol from nm.
-@@ -5410,7 +5631,7 @@
+@@ -5410,7 +5597,7 @@
echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
cat conftest.$ac_ext >&5
fi
@@ -1166,7 +1219,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -5459,13 +5680,16 @@
+@@ -5459,13 +5646,16 @@
# like `-m68040'.
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1186,7 +1239,7 @@
;;
darwin* | rhapsody*)
# PIC is the default on this platform
-@@ -5476,7 +5700,7 @@
+@@ -5476,7 +5666,7 @@
# DJGPP does not support shared libraries at all
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -1195,7 +1248,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5502,7 +5726,7 @@
+@@ -5502,7 +5692,7 @@
esac
else
case $host_os in
@@ -1204,7 +1257,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -5598,7 +5822,7 @@
+@@ -5598,7 +5788,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
;;
@@ -1213,7 +1266,7 @@
# Portland Group C++ compiler.
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-@@ -5612,6 +5836,14 @@
+@@ -5612,6 +5802,14 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
*)
@@ -1228,7 +1281,7 @@
;;
esac
;;
-@@ -5732,14 +5964,17 @@
+@@ -5732,14 +5930,17 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
@@ -1249,7 +1302,7 @@
;;
darwin* | rhapsody*)
-@@ -5748,7 +5983,7 @@
+@@ -5748,7 +5949,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
;;
@@ -1258,7 +1311,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -5806,10 +6041,11 @@
+@@ -5806,10 +6007,11 @@
esac
;;
@@ -1272,7 +1325,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -5858,6 +6094,22 @@
+@@ -5858,6 +6060,22 @@
# All Alpha code is PIC.
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1295,7 +1348,7 @@
esac
;;
-@@ -5867,6 +6119,10 @@
+@@ -5867,6 +6085,10 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
@@ -1306,7 +1359,7 @@
solaris*)
_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -5926,7 +6182,7 @@
+@@ -5926,7 +6148,7 @@
#
if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
@@ -1315,7 +1368,7 @@
[$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
[case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
"" | " "*) ;;
-@@ -5950,7 +6206,7 @@
+@@ -5950,7 +6172,7 @@
#
wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
@@ -1324,7 +1377,7 @@
$lt_tmp_static_flag,
[],
[_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-@@ -5961,11 +6217,12 @@
+@@ -5961,11 +6183,12 @@
# ------------------------------------
# See if the linker supports building shared libraries.
AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
@@ -1339,7 +1392,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -5978,7 +6235,7 @@
+@@ -5978,7 +6201,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -1348,7 +1401,7 @@
;;
linux* | k*bsd*-gnu)
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-@@ -5987,6 +6244,7 @@
+@@ -5987,6 +6210,7 @@
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -1356,7 +1409,7 @@
],[
runpath_var=
_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -6017,12 +6275,14 @@
+@@ -6017,12 +6241,14 @@
# it will be wrapped by ` (' and `)$', so one must not match beginning or
# end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
# as well as any symbol that contains `d'.
@@ -1372,7 +1425,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
_LT_CC_BASENAME([$compiler])
-@@ -6072,7 +6332,7 @@
+@@ -6072,7 +6298,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -1381,7 +1434,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -6120,7 +6380,7 @@
+@@ -6120,7 +6346,7 @@
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_AC_TAGVAR(always_export_symbols, $1)=no
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -1390,7 +1443,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -6138,7 +6398,7 @@
+@@ -6138,7 +6364,7 @@
fi
;;
@@ -1399,7 +1452,7 @@
_LT_AC_TAGVAR(hardcode_direct, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-@@ -6153,7 +6413,7 @@
+@@ -6153,7 +6379,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -1408,7 +1461,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -6171,13 +6431,22 @@
+@@ -6171,13 +6397,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -1433,7 +1486,7 @@
fi
_LT_AC_TAGVAR(link_all_deplibs, $1)=no
else
-@@ -6218,7 +6487,7 @@
+@@ -6218,7 +6453,7 @@
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
case `$LD -v 2>&1` in
@@ -1442,7 +1495,7 @@
_LT_AC_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-@@ -6283,7 +6552,7 @@
+@@ -6283,7 +6518,7 @@
fi
;;
@@ -1451,7 +1504,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -6303,7 +6572,7 @@
+@@ -6303,7 +6538,7 @@
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
# need to do runtime linking.
@@ -1460,7 +1513,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -6337,7 +6606,7 @@
+@@ -6337,7 +6572,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -1469,7 +1522,7 @@
else
# We have old collect2
_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-@@ -6430,7 +6699,7 @@
+@@ -6430,7 +6665,7 @@
# The linker will automatically build a .lib file if we build a DLL.
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
# FIXME: Should let the user specify the lib program.
@@ -1478,7 +1531,7 @@
_LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
-@@ -6463,19 +6732,18 @@
+@@ -6463,19 +6698,18 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -1504,7 +1557,7 @@
_LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -6637,24 +6905,28 @@
+@@ -6637,24 +6871,28 @@
;;
openbsd*)
@@ -1550,7 +1603,7 @@
fi
;;
-@@ -6713,17 +6985,16 @@
+@@ -6713,17 +6951,16 @@
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
@@ -1577,7 +1630,7 @@
esac
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
-@@ -6780,7 +7051,7 @@
+@@ -6780,7 +7017,7 @@
fi
;;
@@ -1586,7 +1639,7 @@
_LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -6855,7 +7126,7 @@
+@@ -6855,7 +7092,7 @@
# to ld, don't add -lc before -lgcc.
AC_MSG_CHECKING([whether -lc should be explicitly linked in])
$rm conftest*
@@ -1595,7 +1648,7 @@
if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
soname=conftest
-@@ -6958,6 +7229,30 @@
+@@ -6958,6 +7195,30 @@
[AC_CHECK_TOOL(RC, windres, no)
])
@@ -1626,7 +1679,7 @@
# NOTE: This macro has been submitted for inclusion into #
# GNU Autoconf as AC_PROG_SED. When it is available in #
# a released version of Autoconf we should remove this #
-@@ -6978,12 +7273,13 @@
+@@ -6978,12 +7239,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -1641,7 +1694,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -7016,6 +7312,7 @@
+@@ -7016,6 +7278,7 @@
done
])
SED=$lt_cv_path_SED
@@ -1649,7 +1702,7 @@
AC_MSG_RESULT([$SED])
])
-@@ -7167,7 +7464,7 @@
+@@ -7167,7 +7430,7 @@
_PKG_TEXT
@@ -1658,7 +1711,7 @@
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-@@ -7177,7 +7474,7 @@
+@@ -7177,7 +7440,7 @@
fi[]dnl
])# PKG_CHECK_MODULES
@@ -1667,7 +1720,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7187,14 +7484,31 @@
+@@ -7187,14 +7450,31 @@
# ----------------------------
# Automake X.Y traces this macro to ensure aclocal.m4 has been
# generated from the m4 files accompanying Automake X.Y.
@@ -1702,7 +1755,7 @@
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-@@ -7251,14 +7565,14 @@
+@@ -7251,14 +7531,14 @@
# AM_CONDITIONAL -*- Autoconf -*-
@@ -1719,7 +1772,7 @@
# AM_CONDITIONAL(NAME, SHELL-CONDITION)
# -------------------------------------
-@@ -7267,8 +7581,10 @@
+@@ -7267,8 +7547,10 @@
[AC_PREREQ(2.52)dnl
ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
@@ -1732,7 +1785,7 @@
if $2; then
$1_TRUE=
$1_FALSE='#'
-@@ -7282,15 +7598,14 @@
+@@ -7282,15 +7564,14 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
@@ -1750,7 +1803,7 @@
# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
# written in clear, in which case automake, when reading aclocal.m4,
-@@ -7318,6 +7633,7 @@
+@@ -7318,6 +7599,7 @@
ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
[$1], CXX, [depcc="$CXX" am_compiler_list=],
[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
@@ -1758,7 +1811,7 @@
[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
[depcc="$$1" am_compiler_list=])
-@@ -7383,6 +7699,7 @@
+@@ -7383,6 +7665,7 @@
depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
$SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
>/dev/null 2>conftest.err &&
@@ -1766,7 +1819,7 @@
grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-@@ -7435,7 +7752,8 @@
+@@ -7435,7 +7718,8 @@
AMDEPBACKSLASH='\'
fi
AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
@@ -1776,7 +1829,7 @@
])
# Generate code to set up dependency tracking. -*- Autoconf -*-
-@@ -7460,8 +7778,9 @@
+@@ -7460,8 +7744,9 @@
# some people rename them; so instead we look at the file content.
# Grep'ing the first line is not enough: some people post-process
# each Makefile.in and add a new line on top of each file to say so.
@@ -1788,7 +1841,7 @@
dirpart=`AS_DIRNAME("$mf")`
else
continue
-@@ -7520,14 +7839,14 @@
+@@ -7520,14 +7805,14 @@
# Do all the work for Automake. -*- Autoconf -*-
@@ -1806,7 +1859,7 @@
# This macro actually does too much. Some checks are only needed if
# your package does certain things. But this isn't really a big deal.
-@@ -7544,16 +7863,20 @@
+@@ -7544,16 +7829,20 @@
# arguments mandatory, and then we can depend on a new Autoconf
# release and drop the old call support.
AC_DEFUN([AM_INIT_AUTOMAKE],
@@ -1832,7 +1885,7 @@
fi
# test whether we have cygpath
-@@ -7573,6 +7896,9 @@
+@@ -7573,6 +7862,9 @@
AC_SUBST([PACKAGE], [$1])dnl
AC_SUBST([VERSION], [$2])],
[_AM_SET_OPTIONS([$1])dnl
@@ -1842,7 +1895,7 @@
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-@@ -7608,6 +7934,10 @@
+@@ -7608,6 +7900,10 @@
[_AM_DEPENDENCIES(CXX)],
[define([AC_PROG_CXX],
defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
@@ -1853,7 +1906,7 @@
])
])
-@@ -7621,16 +7951,17 @@
+@@ -7621,16 +7917,17 @@
# our stamp files there.
AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
[# Compute $1's index in $config_headers.
@@ -1873,7 +1926,7 @@
# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
#
-@@ -7643,7 +7974,7 @@
+@@ -7643,7 +7940,7 @@
# Define $install_sh.
AC_DEFUN([AM_PROG_INSTALL_SH],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -1882,7 +1935,7 @@
AC_SUBST(install_sh)])
# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
-@@ -7750,14 +8081,14 @@
+@@ -7750,14 +8047,14 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
@@ -1899,7 +1952,7 @@
# AM_MISSING_PROG(NAME, PROGRAM)
# ------------------------------
-@@ -7773,6 +8104,7 @@
+@@ -7773,6 +8070,7 @@
# If it does, set am_missing_run to use it, otherwise, to nothing.
AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
@@ -1907,7 +1960,7 @@
test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
# Use eval to expand $SHELL
if eval "$MISSING --run true"; then
-@@ -7783,7 +8115,7 @@
+@@ -7783,7 +8081,7 @@
fi
])
@@ -1916,7 +1969,7 @@
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
-@@ -7791,60 +8123,23 @@
+@@ -7791,60 +8089,23 @@
# AM_PROG_MKDIR_P
# ---------------
@@ -1993,7 +2046,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-@@ -8137,9 +8432,21 @@
+@@ -8137,9 +8398,21 @@
if test "$cross_compiling" != no; then
AC_CHECK_TOOL([STRIP], [strip], :)
fi
@@ -2018,7 +2071,7 @@
# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
diff -urN gdesklets-0.36.orig/Additions/bg/Makefile.in gdesklets-0.36/Additions/bg/Makefile.in
--- gdesklets-0.36.orig/Additions/bg/Makefile.in 2008-02-17 01:45:39.000000000 +0800
-+++ gdesklets-0.36/Additions/bg/Makefile.in 2008-03-01 01:27:29.000000000 +0800
++++ gdesklets-0.36/Additions/bg/Makefile.in 2008-09-01 21:27:22.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.
@@ -2274,7 +2327,7 @@
# 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
++++ gdesklets-0.36/Additions/Makefile.in 2008-09-01 21:27:22.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.
@@ -2613,7 +2666,7 @@
# 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
++++ gdesklets-0.36/config/Makefile.in 2008-09-01 21:27:24.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.
@@ -2880,9 +2933,326 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
+diff -urN gdesklets-0.36.orig/config.guess gdesklets-0.36/config.guess
+--- gdesklets-0.36.orig/config.guess 2008-02-17 01:46:07.000000000 +0800
++++ gdesklets-0.36/config.guess 2008-09-01 21:27:28.000000000 +0800
+@@ -1,10 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+-# Inc.
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
++# Free Software Foundation, Inc.
+
+-timestamp='2006-07-02'
++timestamp='2008-01-23'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -56,8 +56,8 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+-Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
++2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -161,6 +161,7 @@
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
++ sh5el) machine=sh5le-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+@@ -329,7 +330,7 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+- i86pc:SunOS:5.*:*)
++ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ sun4*:SunOS:6*:*)
+@@ -531,7 +532,7 @@
+ echo rs6000-ibm-aix3.2
+ fi
+ exit ;;
+- *:AIX:*:[45])
++ *:AIX:*:[456])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+@@ -780,7 +781,7 @@
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit ;;
+- i*:MINGW*:*)
++ *:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit ;;
+ i*:windows32*:*)
+@@ -790,12 +791,18 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- x86:Interix*:[3456]*)
+- echo i586-pc-interix${UNAME_RELEASE}
+- exit ;;
+- EM64T:Interix*:[3456]*)
+- echo x86_64-unknown-interix${UNAME_RELEASE}
+- exit ;;
++ *:Interix*:[3456]*)
++ case ${UNAME_MACHINE} in
++ x86)
++ echo i586-pc-interix${UNAME_RELEASE}
++ exit ;;
++ EM64T | authenticamd)
++ echo x86_64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ IA64)
++ echo ia64-unknown-interix${UNAME_RELEASE}
++ exit ;;
++ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
+@@ -829,7 +836,14 @@
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
+ arm*:Linux:*:*)
+- echo ${UNAME_MACHINE}-unknown-linux-gnu
++ eval $set_cc_for_build
++ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
++ | grep -q __ARM_EABI__
++ then
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ else
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
++ fi
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+@@ -950,6 +964,9 @@
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit ;;
++ xtensa*:Linux:*:*)
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
++ exit ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+@@ -1208,6 +1225,15 @@
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit ;;
++ SX-7:SUPER-UX:*:*)
++ echo sx7-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8:SUPER-UX:*:*)
++ echo sx8-nec-superux${UNAME_RELEASE}
++ exit ;;
++ SX-8R:SUPER-UX:*:*)
++ echo sx8r-nec-superux${UNAME_RELEASE}
++ exit ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit ;;
+@@ -1458,9 +1484,9 @@
+ the operating system you are using. It is advised that you
+ download the most up to date version of the config scripts from
+
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ and
+- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
++ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
+
+ If the version you run ($0) is already up to date, please
+ send the following data and any information you think might be
+diff -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-09-01 21:27:28.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
++++ gdesklets-0.36/configure 2008-09-01 21:27:19.000000000 +0800
@@ -807,6 +807,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
@@ -2891,17 +3261,27 @@
CYGPATH_W
PACKAGE
VERSION
-@@ -865,14 +866,14 @@
+@@ -847,6 +848,9 @@
+ CPP
+ GREP
+ EGREP
++INTLTOOL_UPDATE
++INTLTOOL_MERGE
++INTLTOOL_EXTRACT
+ INTLTOOL_DESKTOP_RULE
+ INTLTOOL_DIRECTORY_RULE
+ INTLTOOL_KEYS_RULE
+@@ -865,14 +869,11 @@
INTLTOOL_SCHEMAS_RULE
INTLTOOL_THEME_RULE
INTLTOOL_SERVICE_RULE
+-INTLTOOL_EXTRACT
+-INTLTOOL_MERGE
+-INTLTOOL_UPDATE
+INTLTOOL_POLICY_RULE
+XGETTEXT
+MSGMERGE
+MSGFMT
- INTLTOOL_EXTRACT
- INTLTOOL_MERGE
- INTLTOOL_UPDATE
INTLTOOL_PERL
-INTLTOOL_ICONV
-INTLTOOL_MSGFMT
@@ -3116,7 +3496,151 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
am__fastdepCC_TRUE=
-@@ -4246,6 +4262,7 @@
+@@ -4217,8 +4233,8 @@
+ echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
++ INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+@@ -4228,6 +4244,132 @@
+ { (exit 1); exit 1; }; }
+ fi
+
++# Extract the first word of "intltool-update", so it can be a program name with args.
++set dummy intltool-update; 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_UPDATE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_UPDATE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # 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_UPDATE="$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
++
++ ;;
++esac
++fi
++INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
++if test -n "$INTLTOOL_UPDATE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++echo "${ECHO_T}$INTLTOOL_UPDATE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-merge", so it can be a program name with args.
++set dummy intltool-merge; 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_MERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_MERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # 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_MERGE="$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
++
++ ;;
++esac
++fi
++INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
++if test -n "$INTLTOOL_MERGE"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++echo "${ECHO_T}$INTLTOOL_MERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "intltool-extract", so it can be a program name with args.
++set dummy intltool-extract; 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_EXTRACT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $INTLTOOL_EXTRACT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # 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_EXTRACT="$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
++
++ ;;
++esac
++fi
++INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
++if test -n "$INTLTOOL_EXTRACT"; then
++ { echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++echo "${ECHO_T}$INTLTOOL_EXTRACT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
++ { { echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
++echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -4246,6 +4388,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 $< $@'
@@ -3124,18 +3648,18 @@
-@@ -4266,24 +4283,18 @@
+@@ -4266,24 +4409,18 @@
-# Use the tools built into the package, not the ones that are installed.
-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--
+
-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-
+-
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
+# Check the gettext tools to make sure they are GNU
@@ -3155,7 +3679,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4293,7 +4304,7 @@
+@@ -4293,7 +4430,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -3164,7 +3688,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4304,49 +4315,26 @@
+@@ -4304,49 +4441,26 @@
;;
esac
fi
@@ -3223,7 +3747,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4356,7 +4344,7 @@
+@@ -4356,7 +4470,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -3232,7 +3756,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4364,14 +4352,13 @@
+@@ -4364,14 +4478,13 @@
done
IFS=$as_save_IFS
@@ -3251,7 +3775,7 @@
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
-@@ -4382,12 +4369,12 @@
+@@ -4382,12 +4495,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; }
@@ -3267,7 +3791,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4397,7 +4384,7 @@
+@@ -4397,7 +4510,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -3276,7 +3800,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4405,71 +4392,51 @@
+@@ -4405,71 +4518,43 @@
done
IFS=$as_save_IFS
@@ -3349,16 +3873,9 @@
+ { (exit 1); exit 1; }; }
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'
-+
-+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -3375,7 +3892,7 @@
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -4479,7 +4446,7 @@
+@@ -4479,7 +4564,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_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
@@ -3384,7 +3901,7 @@
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
-@@ -4487,20 +4454,41 @@
+@@ -4487,20 +4572,41 @@
done
IFS=$as_save_IFS
@@ -3431,7 +3948,7 @@
# Substitute ALL_LINGUAS so we can use it in po/Makefile
-@@ -4519,7 +4507,7 @@
+@@ -4519,7 +4625,7 @@
main ()
{
extern int _nl_msg_cat_cntr;
@@ -3440,7 +3957,18 @@
;
return 0;
}
-@@ -4880,12 +4868,13 @@
+@@ -4651,10 +4757,6 @@
+
+
+
+-ac_config_commands="$ac_config_commands intltool"
+-
+-
+-
+ # Find a good install program. We prefer a C program (faster),
+ # so one script is as good as another. But avoid the broken or
+ # incompatible versions:
+@@ -4880,12 +4982,13 @@
test -z "$as_dir" && as_dir=.
for lt_ac_prog in sed gsed; do
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3455,7 +3983,7 @@
lt_ac_max=0
lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-@@ -4920,6 +4909,7 @@
+@@ -4920,6 +5023,7 @@
fi
SED=$lt_cv_path_SED
@@ -3463,7 +3991,7 @@
{ echo "$as_me:$LINENO: result: $SED" >&5
echo "${ECHO_T}$SED" >&6; }
-@@ -5119,8 +5109,8 @@
+@@ -5119,8 +5223,8 @@
echo "${ECHO_T}no, using $LN_S" >&6; }
fi
@@ -3474,7 +4002,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5139,7 +5129,7 @@
+@@ -5139,7 +5243,7 @@
# whether `pass_all' will *always* work, you probably want this one.
case $host_os in
@@ -3483,7 +4011,7 @@
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5161,9 +5151,15 @@
+@@ -5161,9 +5265,15 @@
mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
@@ -3502,7 +4030,7 @@
;;
darwin* | rhapsody*)
-@@ -5208,7 +5204,7 @@
+@@ -5208,7 +5318,7 @@
esac
;;
@@ -3511,7 +4039,7 @@
# PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
;;
-@@ -5258,6 +5254,10 @@
+@@ -5258,6 +5368,10 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -3522,7 +4050,16 @@
solaris*)
lt_cv_deplibs_check_method=pass_all
;;
-@@ -5379,7 +5379,8 @@
+@@ -5344,7 +5458,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 5347 "configure"' > conftest.$ac_ext
++ echo '#line 5461 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -5379,7 +5493,8 @@
rm -rf conftest*
;;
@@ -3532,7 +4069,7 @@
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -5390,6 +5391,9 @@
+@@ -5390,6 +5505,9 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
@@ -3542,7 +4079,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_i386"
;;
-@@ -5406,6 +5410,9 @@
+@@ -5406,6 +5524,9 @@
;;
*64-bit*)
case $host in
@@ -3552,7 +4089,7 @@
x86_64-*linux*)
LD="${LD-ld} -m elf_x86_64"
;;
-@@ -5509,7 +5516,11 @@
+@@ -5509,7 +5630,11 @@
*64-bit*)
case $lt_cv_prog_gnu_ld in
yes*) LD="${LD-ld} -m elf64_sparc" ;;
@@ -3565,7 +4102,7 @@
esac
;;
esac
-@@ -6163,6 +6174,7 @@
+@@ -6163,6 +6288,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 &&
@@ -3573,7 +4110,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
-@@ -6192,9 +6204,7 @@
+@@ -6192,9 +6318,7 @@
echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
@@ -3584,7 +4121,7 @@
test "x$enable_dependency_tracking" != xno \
&& test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
am__fastdepCXX_TRUE=
-@@ -6702,7 +6712,6 @@
+@@ -6702,7 +6826,6 @@
# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
@@ -3592,7 +4129,7 @@
# find the maximum length of command line arguments
{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-@@ -6789,24 +6798,27 @@
+@@ -6789,24 +6912,27 @@
fi
;;
*)
@@ -3637,7 +4174,7 @@
;;
esac
-@@ -6823,6 +6835,7 @@
+@@ -6823,6 +6949,7 @@
@@ -3645,7 +4182,7 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-@@ -7013,7 +7026,7 @@
+@@ -7013,7 +7140,7 @@
echo "$progname: failed program was:" >&5
cat conftest.$ac_ext >&5
fi
@@ -3654,7 +4191,7 @@
# Do not use the global_symbol_pipe unless it works.
if test "$pipe_works" = yes; then
-@@ -7411,7 +7424,7 @@
+@@ -7411,7 +7538,7 @@
test -z "$ac_objext" && ac_objext=o
# Determine commands to create old-style static archives.
@@ -3663,7 +4200,7 @@
old_postinstall_cmds='chmod 644 $oldlib'
old_postuninstall_cmds=
-@@ -7573,6 +7586,318 @@
+@@ -7573,6 +7700,318 @@
;;
esac
@@ -3982,7 +4519,7 @@
enable_dlopen=no
enable_win32_dll=no
-@@ -7611,10 +7936,10 @@
+@@ -7611,10 +8050,10 @@
objext=$objext
# Code to be used in simple compile tests
@@ -3995,7 +4532,7 @@
# If no C compiler was specified, use CC.
-@@ -7629,16 +7954,16 @@
+@@ -7629,16 +8068,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4015,7 +4552,7 @@
-@@ -7655,7 +7980,7 @@
+@@ -7655,7 +8094,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -4024,21 +4561,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7666,11 +7991,11 @@
+@@ -7666,11 +8105,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7669: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:7994: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8108: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7673: \$? = $ac_status" >&5
-+ echo "$as_me:7998: \$? = $ac_status" >&5
++ echo "$as_me:8112: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -7721,13 +8046,15 @@
+@@ -7721,13 +8160,15 @@
lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
;;
@@ -4056,7 +4593,7 @@
lt_prog_compiler_pic='-DDLL_EXPORT'
;;
-@@ -7737,7 +8064,7 @@
+@@ -7737,7 +8178,7 @@
lt_prog_compiler_pic='-fno-common'
;;
@@ -4065,7 +4602,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -7795,7 +8122,7 @@
+@@ -7795,7 +8236,7 @@
esac
;;
@@ -4074,7 +4611,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic='-DDLL_EXPORT'
-@@ -7847,6 +8174,22 @@
+@@ -7847,6 +8288,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static='-non_shared'
;;
@@ -4097,7 +4634,7 @@
esac
;;
-@@ -7856,6 +8199,10 @@
+@@ -7856,6 +8313,10 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -4108,7 +4645,7 @@
solaris*)
lt_prog_compiler_pic='-KPIC'
lt_prog_compiler_static='-Bstatic'
-@@ -7918,12 +8265,12 @@
+@@ -7918,12 +8379,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; }
@@ -4124,17 +4661,17 @@
lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -7934,27 +8281,27 @@
+@@ -7934,27 +8395,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7937: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8284: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8398: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7941: \$? = $ac_status" >&5
-+ echo "$as_me:8288: \$? = $ac_status" >&5
++ echo "$as_me:8402: \$? = $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.
@@ -4158,7 +4695,7 @@
case $lt_prog_compiler_pic in
"" | " "*) ;;
*) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-@@ -7981,13 +8328,13 @@
+@@ -7981,13 +8442,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; }
@@ -4175,7 +4712,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -7997,20 +8344,20 @@
+@@ -7997,20 +8458,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
@@ -4202,7 +4739,7 @@
:
else
lt_prog_compiler_static=
-@@ -8027,7 +8374,7 @@
+@@ -8027,7 +8488,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -4211,21 +4748,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -8038,11 +8385,11 @@
+@@ -8038,11 +8499,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8041: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8502: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8045: \$? = $ac_status" >&5
-+ echo "$as_me:8392: \$? = $ac_status" >&5
++ echo "$as_me:8506: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -8122,12 +8469,13 @@
+@@ -8122,12 +8583,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'.
@@ -4240,7 +4777,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -8186,7 +8534,7 @@
+@@ -8186,7 +8648,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -4249,7 +4786,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs=no
-@@ -8234,7 +8582,7 @@
+@@ -8234,7 +8696,7 @@
allow_undefined_flag=unsupported
always_export_symbols=no
enable_shared_with_static_runtimes=yes
@@ -4258,7 +4795,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -8252,7 +8600,7 @@
+@@ -8252,7 +8714,7 @@
fi
;;
@@ -4267,7 +4804,7 @@
hardcode_direct=no
hardcode_shlibpath_var=no
hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-@@ -8267,7 +8615,7 @@
+@@ -8267,7 +8729,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'
;;
@@ -4276,7 +4813,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -8285,13 +8633,22 @@
+@@ -8285,13 +8747,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -4301,7 +4838,7 @@
fi
link_all_deplibs=no
else
-@@ -8397,7 +8754,7 @@
+@@ -8397,7 +8868,7 @@
fi
;;
@@ -4310,7 +4847,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -8417,7 +8774,7 @@
+@@ -8417,7 +8888,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.
@@ -4319,7 +4856,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -8451,7 +8808,7 @@
+@@ -8451,7 +8922,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4328,7 +4865,7 @@
else
# We have old collect2
hardcode_direct=unsupported
-@@ -8525,11 +8882,18 @@
+@@ -8525,11 +8996,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -4351,7 +4888,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8584,11 +8948,18 @@
+@@ -8584,11 +9062,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -4374,7 +4911,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -8642,7 +9013,7 @@
+@@ -8642,7 +9127,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.
@@ -4383,7 +4920,7 @@
fix_srcfile_path='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes=yes
;;
-@@ -8675,19 +9046,18 @@
+@@ -8675,19 +9160,18 @@
link_all_deplibs=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -4409,7 +4946,7 @@
module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -8849,24 +9219,28 @@
+@@ -8849,24 +9333,28 @@
;;
openbsd*)
@@ -4455,7 +4992,7 @@
fi
;;
-@@ -8925,17 +9299,16 @@
+@@ -8925,17 +9413,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -4482,7 +5019,7 @@
esac
link_all_deplibs=yes
;;
-@@ -8992,7 +9365,7 @@
+@@ -8992,7 +9479,7 @@
fi
;;
@@ -4491,7 +5028,7 @@
no_undefined_flag='${wl}-z,text'
archive_cmds_need_lc=no
hardcode_shlibpath_var=no
-@@ -9069,7 +9442,7 @@
+@@ -9069,7 +9556,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*
@@ -4500,7 +5037,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -9127,17 +9500,55 @@
+@@ -9127,17 +9614,55 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -4560,7 +5097,7 @@
else
sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
fi
-@@ -9158,7 +9569,7 @@
+@@ -9158,7 +9683,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -4569,7 +5106,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9297,12 +9708,8 @@
+@@ -9297,12 +9822,8 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -4584,7 +5121,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -9356,7 +9763,7 @@
+@@ -9356,7 +9877,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -4593,7 +5130,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -9419,7 +9826,7 @@
+@@ -9419,7 +9940,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -4602,7 +5139,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -9490,7 +9897,7 @@
+@@ -9490,7 +10011,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -4611,7 +5148,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -9596,6 +10003,10 @@
+@@ -9596,6 +10117,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -4622,7 +5159,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -9692,6 +10103,21 @@
+@@ -9692,6 +10217,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -4644,7 +5181,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -9749,6 +10175,7 @@
+@@ -9749,6 +10289,7 @@
darwin*)
if test -n "$STRIP" ; then
striplib="$STRIP -x"
@@ -4652,7 +5189,7 @@
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
-@@ -10010,7 +10437,7 @@
+@@ -10010,7 +10551,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
@@ -4661,7 +5198,7 @@
else
{ echo "$as_me:$LINENO: checking for dlopen" >&5
echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
-@@ -10286,7 +10713,7 @@
+@@ -10286,7 +10827,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
@@ -4670,25 +5207,25 @@
fi
-@@ -10335,7 +10762,7 @@
+@@ -10335,7 +10876,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10338 "configure"
-+#line 10765 "configure"
++#line 10879 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10435,7 +10862,7 @@
+@@ -10435,7 +10976,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10438 "configure"
-+#line 10865 "configure"
++#line 10979 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -10562,7 +10989,7 @@
+@@ -10562,7 +11103,7 @@
fi
;;
@@ -4697,7 +5234,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -10618,6 +11045,7 @@
+@@ -10618,6 +11159,7 @@
predeps \
postdeps \
compiler_lib_search_path \
@@ -4705,7 +5242,7 @@
archive_cmds \
archive_expsym_cmds \
postinstall_cmds \
-@@ -10633,6 +11061,7 @@
+@@ -10633,6 +11175,7 @@
module_cmds \
module_expsym_cmds \
lt_cv_prog_compiler_c_o \
@@ -4713,7 +5250,7 @@
exclude_expsyms \
include_expsyms; do
-@@ -10677,7 +11106,7 @@
+@@ -10677,7 +11220,7 @@
# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
#
@@ -4722,7 +5259,7 @@
# Free Software Foundation, Inc.
#
# This file is part of GNU Libtool:
-@@ -10913,6 +11342,10 @@
+@@ -10913,6 +11456,10 @@
# shared library.
postdeps=$lt_postdeps
@@ -4733,7 +5270,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path
-@@ -11001,7 +11434,7 @@
+@@ -11001,7 +11548,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -4742,7 +5279,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols
-@@ -11161,6 +11594,7 @@
+@@ -11161,6 +11708,7 @@
predeps_CXX=
postdeps_CXX=
compiler_lib_search_path_CXX=
@@ -4750,7 +5287,7 @@
# Source file extension for C++ test sources.
ac_ext=cpp
-@@ -11170,10 +11604,10 @@
+@@ -11170,10 +11718,10 @@
objext_CXX=$objext
# Code to be used in simple compile tests
@@ -4763,7 +5300,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -11189,16 +11623,16 @@
+@@ -11189,16 +11737,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -4783,7 +5320,7 @@
# Allow CC to be a program name with arguments.
-@@ -11405,7 +11839,7 @@
+@@ -11405,7 +11953,7 @@
# FIXME: insert proper C++ library support
ld_shlibs_CXX=no
;;
@@ -4792,7 +5329,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -11418,7 +11852,7 @@
+@@ -11418,7 +11966,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.
@@ -4801,7 +5338,7 @@
for ld_flag in $LDFLAGS; do
case $ld_flag in
*-brtl*)
-@@ -11454,7 +11888,7 @@
+@@ -11454,7 +12002,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -4810,7 +5347,7 @@
else
# We have old collect2
hardcode_direct_CXX=unsupported
-@@ -11528,11 +11962,18 @@
+@@ -11528,11 +12076,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -4833,7 +5370,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11588,11 +12029,18 @@
+@@ -11588,11 +12143,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -4856,7 +5393,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -11662,59 +12110,31 @@
+@@ -11662,59 +12224,31 @@
fi
;;
darwin* | rhapsody*)
@@ -4927,7 +5464,7 @@
module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -11797,9 +12217,7 @@
+@@ -11797,9 +12331,7 @@
hardcode_libdir_separator_CXX=:
case $host_cpu in
@@ -4938,7 +5475,7 @@
*)
export_dynamic_flag_spec_CXX='${wl}-E'
;;
-@@ -11867,7 +12285,7 @@
+@@ -11867,7 +12399,7 @@
;;
esac
;;
@@ -4947,7 +5484,7 @@
hardcode_direct_CXX=no
hardcode_shlibpath_var_CXX=no
hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-@@ -11959,7 +12377,7 @@
+@@ -11959,7 +12491,7 @@
export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
;;
@@ -4956,7 +5493,7 @@
# Portland Group C++ compiler
archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-@@ -11987,6 +12405,29 @@
+@@ -11987,6 +12519,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'
;;
@@ -4986,7 +5523,7 @@
esac
;;
lynxos*)
-@@ -12025,16 +12466,20 @@
+@@ -12025,16 +12580,20 @@
ld_shlibs_CXX=no
;;
openbsd*)
@@ -5016,7 +5553,7 @@
;;
osf3*)
case $cc_basename in
-@@ -12196,15 +12641,10 @@
+@@ -12196,15 +12755,10 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5035,7 +5572,7 @@
;;
esac
link_all_deplibs_CXX=yes
-@@ -12251,6 +12691,12 @@
+@@ -12251,6 +12805,12 @@
fi
hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -5048,7 +5585,7 @@
fi
;;
esac
-@@ -12338,7 +12784,6 @@
+@@ -12338,7 +12898,6 @@
GCC_CXX="$GXX"
LD_CXX="$LD"
@@ -5056,7 +5593,7 @@
cat > conftest.$ac_ext <<EOF
class Foo
{
-@@ -12440,9 +12885,14 @@
+@@ -12440,9 +12999,14 @@
$rm -f confest.$objext
@@ -5072,7 +5609,7 @@
# Interix 3.5 installs completely hosed .la files for C++, so rather than
# hack all around it, let's just trust "g++" to DTRT.
predep_objects_CXX=
-@@ -12450,19 +12900,51 @@
+@@ -12450,19 +13014,51 @@
postdeps_CXX=
;;
@@ -5126,7 +5663,7 @@
case " $postdeps_CXX " in
*" -lc "*) archive_cmds_need_lc_CXX=no ;;
esac
-@@ -12493,12 +12975,14 @@
+@@ -12493,12 +13089,14 @@
# like `-m68040'.
lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5143,7 +5680,7 @@
lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
;;
darwin* | rhapsody*)
-@@ -12510,7 +12994,7 @@
+@@ -12510,7 +13108,7 @@
# DJGPP does not support shared libraries at all
lt_prog_compiler_pic_CXX=
;;
@@ -5152,7 +5689,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -12536,7 +13020,7 @@
+@@ -12536,7 +13134,7 @@
esac
else
case $host_os in
@@ -5161,7 +5698,7 @@
# All AIX code is PIC.
if test "$host_cpu" = ia64; then
# AIX 5 now supports IA64 processor
-@@ -12632,7 +13116,7 @@
+@@ -12632,7 +13230,7 @@
lt_prog_compiler_pic_CXX='-KPIC'
lt_prog_compiler_static_CXX='-static'
;;
@@ -5170,7 +5707,7 @@
# Portland Group C++ compiler.
lt_prog_compiler_wl_CXX='-Wl,'
lt_prog_compiler_pic_CXX='-fpic'
-@@ -12646,6 +13130,14 @@
+@@ -12646,6 +13244,14 @@
lt_prog_compiler_static_CXX='-non_shared'
;;
*)
@@ -5185,7 +5722,7 @@
;;
esac
;;
-@@ -12755,12 +13247,12 @@
+@@ -12755,12 +13361,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; }
@@ -5201,17 +5738,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -12771,27 +13263,27 @@
+@@ -12771,27 +13377,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12774: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13266: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13380: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12778: \$? = $ac_status" >&5
-+ echo "$as_me:13270: \$? = $ac_status" >&5
++ echo "$as_me:13384: \$? = $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.
@@ -5235,7 +5772,7 @@
case $lt_prog_compiler_pic_CXX in
"" | " "*) ;;
*) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-@@ -12818,13 +13310,13 @@
+@@ -12818,13 +13424,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; }
@@ -5252,7 +5789,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -12834,20 +13326,20 @@
+@@ -12834,20 +13440,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
@@ -5279,7 +5816,7 @@
:
else
lt_prog_compiler_static_CXX=
-@@ -12864,7 +13356,7 @@
+@@ -12864,7 +13470,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -5288,21 +5825,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -12875,11 +13367,11 @@
+@@ -12875,11 +13481,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12878: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:13370: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:13484: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12882: \$? = $ac_status" >&5
-+ echo "$as_me:13374: \$? = $ac_status" >&5
++ echo "$as_me:13488: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -12932,7 +13424,7 @@
+@@ -12932,7 +13538,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
@@ -5311,7 +5848,7 @@
# If we're using GNU nm, then we don't want the "-C" option.
# -C means demangle to AIX nm, but means don't demangle with GNU nm
if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-@@ -12945,7 +13437,7 @@
+@@ -12945,7 +13551,7 @@
export_symbols_cmds_CXX="$ltdll_cmds"
;;
cygwin* | mingw*)
@@ -5320,7 +5857,7 @@
;;
linux* | k*bsd*-gnu)
link_all_deplibs_CXX=no
-@@ -12954,6 +13446,7 @@
+@@ -12954,6 +13560,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
esac
@@ -5328,7 +5865,7 @@
{ echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
-@@ -12979,7 +13472,7 @@
+@@ -12979,7 +13586,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*
@@ -5337,7 +5874,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -13037,20 +13530,7 @@
+@@ -13037,20 +13644,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -5359,7 +5896,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -13068,7 +13548,7 @@
+@@ -13068,7 +13662,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -5368,7 +5905,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13207,12 +13687,7 @@
+@@ -13207,12 +13801,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -5382,7 +5919,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -13266,7 +13741,7 @@
+@@ -13266,7 +13855,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -5391,7 +5928,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -13329,7 +13804,7 @@
+@@ -13329,7 +13918,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -5400,7 +5937,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -13400,7 +13875,7 @@
+@@ -13400,7 +13989,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -5409,7 +5946,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -13506,6 +13981,10 @@
+@@ -13506,6 +14095,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -5420,7 +5957,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -13602,6 +14081,21 @@
+@@ -13602,6 +14195,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -5442,7 +5979,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -13685,6 +14179,7 @@
+@@ -13685,6 +14293,7 @@
predeps_CXX \
postdeps_CXX \
compiler_lib_search_path_CXX \
@@ -5450,7 +5987,7 @@
archive_cmds_CXX \
archive_expsym_cmds_CXX \
postinstall_cmds_CXX \
-@@ -13700,6 +14195,7 @@
+@@ -13700,6 +14309,7 @@
module_cmds_CXX \
module_expsym_cmds_CXX \
lt_cv_prog_compiler_c_o_CXX \
@@ -5458,7 +5995,7 @@
exclude_expsyms_CXX \
include_expsyms_CXX; do
-@@ -13932,6 +14428,10 @@
+@@ -13932,6 +14542,10 @@
# shared library.
postdeps=$lt_postdeps_CXX
@@ -5469,7 +6006,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-@@ -14020,7 +14520,7 @@
+@@ -14020,7 +14634,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -5478,7 +6015,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_CXX
-@@ -14111,10 +14611,17 @@
+@@ -14111,10 +14725,17 @@
objext_F77=$objext
# Code to be used in simple compile tests
@@ -5498,7 +6035,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -14130,16 +14637,16 @@
+@@ -14130,16 +14751,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -5518,7 +6055,7 @@
# Allow CC to be a program name with arguments.
-@@ -14177,7 +14684,7 @@
+@@ -14177,7 +14798,7 @@
postinstall_cmds='$RANLIB $lib'
fi
;;
@@ -5527,7 +6064,7 @@
if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
test "$enable_shared" = yes && enable_static=no
fi
-@@ -14223,13 +14730,15 @@
+@@ -14223,13 +14844,15 @@
lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
;;
@@ -5545,7 +6082,7 @@
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
;;
-@@ -14239,7 +14748,7 @@
+@@ -14239,7 +14862,7 @@
lt_prog_compiler_pic_F77='-fno-common'
;;
@@ -5554,7 +6091,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -14297,7 +14806,7 @@
+@@ -14297,7 +14920,7 @@
esac
;;
@@ -5563,7 +6100,7 @@
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-@@ -14349,6 +14858,22 @@
+@@ -14349,6 +14972,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -5586,7 +6123,7 @@
esac
;;
-@@ -14358,6 +14883,10 @@
+@@ -14358,6 +14997,10 @@
lt_prog_compiler_static_F77='-non_shared'
;;
@@ -5597,7 +6134,7 @@
solaris*)
lt_prog_compiler_pic_F77='-KPIC'
lt_prog_compiler_static_F77='-Bstatic'
-@@ -14420,12 +14949,12 @@
+@@ -14420,12 +15063,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; }
@@ -5613,17 +6150,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_F77"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -14436,27 +14965,27 @@
+@@ -14436,27 +15079,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14439: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:14968: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15082: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14443: \$? = $ac_status" >&5
-+ echo "$as_me:14972: \$? = $ac_status" >&5
++ echo "$as_me:15086: \$? = $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.
@@ -5647,7 +6184,7 @@
case $lt_prog_compiler_pic_F77 in
"" | " "*) ;;
*) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-@@ -14483,13 +15012,13 @@
+@@ -14483,13 +15126,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; }
@@ -5664,7 +6201,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -14499,20 +15028,20 @@
+@@ -14499,20 +15142,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
@@ -5691,7 +6228,7 @@
:
else
lt_prog_compiler_static_F77=
-@@ -14529,7 +15058,7 @@
+@@ -14529,7 +15172,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -5700,21 +6237,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -14540,11 +15069,11 @@
+@@ -14540,11 +15183,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14543: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15072: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15186: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14547: \$? = $ac_status" >&5
-+ echo "$as_me:15076: \$? = $ac_status" >&5
++ echo "$as_me:15190: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -14624,12 +15153,13 @@
+@@ -14624,12 +15267,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'.
@@ -5729,7 +6266,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -14688,7 +15218,7 @@
+@@ -14688,7 +15332,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -5738,7 +6275,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_F77=no
-@@ -14736,7 +15266,7 @@
+@@ -14736,7 +15380,7 @@
allow_undefined_flag_F77=unsupported
always_export_symbols_F77=no
enable_shared_with_static_runtimes_F77=yes
@@ -5747,7 +6284,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -14754,7 +15284,7 @@
+@@ -14754,7 +15398,7 @@
fi
;;
@@ -5756,7 +6293,7 @@
hardcode_direct_F77=no
hardcode_shlibpath_var_F77=no
hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-@@ -14769,7 +15299,7 @@
+@@ -14769,7 +15413,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'
;;
@@ -5765,7 +6302,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -14787,13 +15317,22 @@
+@@ -14787,13 +15431,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -5790,7 +6327,7 @@
fi
link_all_deplibs_F77=no
else
-@@ -14899,7 +15438,7 @@
+@@ -14899,7 +15552,7 @@
fi
;;
@@ -5799,7 +6336,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -14919,7 +15458,7 @@
+@@ -14919,7 +15572,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.
@@ -5808,7 +6345,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -14953,7 +15492,7 @@
+@@ -14953,7 +15606,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -5817,7 +6354,7 @@
else
# We have old collect2
hardcode_direct_F77=unsupported
-@@ -15017,11 +15556,18 @@
+@@ -15017,11 +15670,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -5840,7 +6377,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15066,11 +15612,18 @@
+@@ -15066,11 +15726,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -5863,7 +6400,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -15124,7 +15677,7 @@
+@@ -15124,7 +15791,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.
@@ -5872,7 +6409,7 @@
fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_F77=yes
;;
-@@ -15157,19 +15710,18 @@
+@@ -15157,19 +15824,18 @@
link_all_deplibs_F77=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -5898,7 +6435,7 @@
module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -15331,24 +15883,28 @@
+@@ -15331,24 +15997,28 @@
;;
openbsd*)
@@ -5944,7 +6481,7 @@
fi
;;
-@@ -15407,17 +15963,16 @@
+@@ -15407,17 +16077,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -5971,7 +6508,7 @@
esac
link_all_deplibs_F77=yes
;;
-@@ -15474,7 +16029,7 @@
+@@ -15474,7 +16143,7 @@
fi
;;
@@ -5980,7 +6517,7 @@
no_undefined_flag_F77='${wl}-z,text'
archive_cmds_need_lc_F77=no
hardcode_shlibpath_var_F77=no
-@@ -15551,7 +16106,7 @@
+@@ -15551,7 +16220,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*
@@ -5989,7 +6526,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -15609,20 +16164,7 @@
+@@ -15609,20 +16278,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6011,7 +6548,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -15640,7 +16182,7 @@
+@@ -15640,7 +16296,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -6020,7 +6557,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15779,12 +16321,7 @@
+@@ -15779,12 +16435,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -6034,7 +6571,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -15838,7 +16375,7 @@
+@@ -15838,7 +16489,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -6043,7 +6580,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -15901,7 +16438,7 @@
+@@ -15901,7 +16552,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6052,7 +6589,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15972,7 +16509,7 @@
+@@ -15972,7 +16623,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -6061,7 +6598,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -16078,6 +16615,10 @@
+@@ -16078,6 +16729,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6072,7 +6609,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -16174,6 +16715,21 @@
+@@ -16174,6 +16829,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -6094,7 +6631,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -16257,6 +16813,7 @@
+@@ -16257,6 +16927,7 @@
predeps_F77 \
postdeps_F77 \
compiler_lib_search_path_F77 \
@@ -6102,7 +6639,7 @@
archive_cmds_F77 \
archive_expsym_cmds_F77 \
postinstall_cmds_F77 \
-@@ -16272,6 +16829,7 @@
+@@ -16272,6 +16943,7 @@
module_cmds_F77 \
module_expsym_cmds_F77 \
lt_cv_prog_compiler_c_o_F77 \
@@ -6110,7 +6647,7 @@
exclude_expsyms_F77 \
include_expsyms_F77; do
-@@ -16504,6 +17062,10 @@
+@@ -16504,6 +17176,10 @@
# shared library.
postdeps=$lt_postdeps_F77
@@ -6121,7 +6658,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-@@ -16592,7 +17154,7 @@
+@@ -16592,7 +17268,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6130,7 +6667,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_F77
-@@ -16650,10 +17212,10 @@
+@@ -16650,10 +17326,10 @@
objext_GCJ=$objext
# Code to be used in simple compile tests
@@ -6143,7 +6680,7 @@
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-@@ -16669,16 +17231,16 @@
+@@ -16669,16 +17345,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6163,7 +6700,7 @@
# Allow CC to be a program name with arguments.
-@@ -16716,7 +17278,7 @@
+@@ -16716,7 +17392,7 @@
else
lt_cv_prog_compiler_rtti_exceptions=no
ac_outfile=conftest.$ac_objext
@@ -6172,21 +6709,21 @@
lt_compiler_flag="-fno-rtti -fno-exceptions"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16727,11 +17289,11 @@
+@@ -16727,11 +17403,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16730: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17292: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17406: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16734: \$? = $ac_status" >&5
-+ echo "$as_me:17296: \$? = $ac_status" >&5
++ echo "$as_me:17410: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -16782,14 +17344,16 @@
+@@ -16782,14 +17458,16 @@
lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
;;
@@ -6206,7 +6743,7 @@
;;
darwin* | rhapsody*)
-@@ -16798,7 +17362,7 @@
+@@ -16798,7 +17476,7 @@
lt_prog_compiler_pic_GCJ='-fno-common'
;;
@@ -6215,7 +6752,7 @@
# Interix 3.x gcc -fpic/-fPIC options generate broken code.
# Instead, we relocate shared libraries at runtime.
;;
-@@ -16856,10 +17420,10 @@
+@@ -16856,10 +17534,10 @@
esac
;;
@@ -6228,7 +6765,7 @@
;;
hpux9* | hpux10* | hpux11*)
-@@ -16908,6 +17472,22 @@
+@@ -16908,6 +17586,22 @@
# All Alpha code is PIC.
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6251,7 +6788,7 @@
esac
;;
-@@ -16917,6 +17497,10 @@
+@@ -16917,6 +17611,10 @@
lt_prog_compiler_static_GCJ='-non_shared'
;;
@@ -6262,7 +6799,7 @@
solaris*)
lt_prog_compiler_pic_GCJ='-KPIC'
lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -16979,12 +17563,12 @@
+@@ -16979,12 +17677,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; }
@@ -6278,17 +6815,17 @@
lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
-@@ -16995,27 +17579,27 @@
+@@ -16995,27 +17693,27 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16998: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17582: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17696: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17002: \$? = $ac_status" >&5
-+ echo "$as_me:17586: \$? = $ac_status" >&5
++ echo "$as_me:17700: \$? = $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.
@@ -6312,7 +6849,7 @@
case $lt_prog_compiler_pic_GCJ in
"" | " "*) ;;
*) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-@@ -17042,13 +17626,13 @@
+@@ -17042,13 +17740,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; }
@@ -6329,7 +6866,7 @@
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
# The linker can only warn and ignore the option if not recognized
# So say no if there are warnings
-@@ -17058,20 +17642,20 @@
+@@ -17058,20 +17756,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
@@ -6356,7 +6893,7 @@
:
else
lt_prog_compiler_static_GCJ=
-@@ -17088,7 +17672,7 @@
+@@ -17088,7 +17786,7 @@
mkdir conftest
cd conftest
mkdir out
@@ -6365,21 +6902,21 @@
lt_compiler_flag="-o out/conftest2.$ac_objext"
# Insert the option either (1) after the last *FLAGS variable, or
-@@ -17099,11 +17683,11 @@
+@@ -17099,11 +17797,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17102: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:17686: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17800: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17106: \$? = $ac_status" >&5
-+ echo "$as_me:17690: \$? = $ac_status" >&5
++ echo "$as_me:17804: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17183,12 +17767,13 @@
+@@ -17183,12 +17881,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'.
@@ -6394,7 +6931,7 @@
extract_expsyms_cmds=
# Just being paranoid about ensuring that cc_basename is set.
for cc_temp in $compiler""; do
-@@ -17247,7 +17832,7 @@
+@@ -17247,7 +17946,7 @@
# See if GNU ld supports shared libraries.
case $host_os in
@@ -6403,7 +6940,7 @@
# On AIX/PPC, the GNU linker is very broken
if test "$host_cpu" != ia64; then
ld_shlibs_GCJ=no
-@@ -17295,7 +17880,7 @@
+@@ -17295,7 +17994,7 @@
allow_undefined_flag_GCJ=unsupported
always_export_symbols_GCJ=no
enable_shared_with_static_runtimes_GCJ=yes
@@ -6412,7 +6949,7 @@
if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-@@ -17313,7 +17898,7 @@
+@@ -17313,7 +18012,7 @@
fi
;;
@@ -6421,7 +6958,7 @@
hardcode_direct_GCJ=no
hardcode_shlibpath_var_GCJ=no
hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-@@ -17328,7 +17913,7 @@
+@@ -17328,7 +18027,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'
;;
@@ -6430,7 +6967,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -17346,13 +17931,22 @@
+@@ -17346,13 +18045,22 @@
ifc* | ifort*) # Intel Fortran compiler
tmp_addflag=' -nofor_main' ;;
esac
@@ -6455,7 +6992,7 @@
fi
link_all_deplibs_GCJ=no
else
-@@ -17458,7 +18052,7 @@
+@@ -17458,7 +18166,7 @@
fi
;;
@@ -6464,7 +7001,7 @@
if test "$host_cpu" = ia64; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
-@@ -17478,7 +18072,7 @@
+@@ -17478,7 +18186,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.
@@ -6473,7 +7010,7 @@
for ld_flag in $LDFLAGS; do
if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
aix_use_runtimelinking=yes
-@@ -17512,7 +18106,7 @@
+@@ -17512,7 +18220,7 @@
strings "$collect2name" | grep resolve_lib_name >/dev/null
then
# We have reworked collect2
@@ -6482,7 +7019,7 @@
else
# We have old collect2
hardcode_direct_GCJ=unsupported
-@@ -17586,11 +18180,18 @@
+@@ -17586,11 +18294,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -6505,7 +7042,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17645,11 +18246,18 @@
+@@ -17645,11 +18360,18 @@
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
@@ -6528,7 +7065,7 @@
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -17703,7 +18311,7 @@
+@@ -17703,7 +18425,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.
@@ -6537,7 +7074,7 @@
fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
enable_shared_with_static_runtimes_GCJ=yes
;;
-@@ -17736,19 +18344,18 @@
+@@ -17736,19 +18458,18 @@
link_all_deplibs_GCJ=yes
if test "$GCC" = yes ; then
output_verbose_link_cmd='echo'
@@ -6563,7 +7100,7 @@
module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
;;
*)
-@@ -17910,24 +18517,28 @@
+@@ -17910,24 +18631,28 @@
;;
openbsd*)
@@ -6609,7 +7146,7 @@
fi
;;
-@@ -17986,17 +18597,16 @@
+@@ -17986,17 +18711,16 @@
case $host_os in
solaris2.[0-5] | solaris2.[0-5].*) ;;
*)
@@ -6636,7 +7173,7 @@
esac
link_all_deplibs_GCJ=yes
;;
-@@ -18053,7 +18663,7 @@
+@@ -18053,7 +18777,7 @@
fi
;;
@@ -6645,7 +7182,7 @@
no_undefined_flag_GCJ='${wl}-z,text'
archive_cmds_need_lc_GCJ=no
hardcode_shlibpath_var_GCJ=no
-@@ -18130,7 +18740,7 @@
+@@ -18130,7 +18854,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*
@@ -6654,7 +7191,7 @@
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
-@@ -18188,20 +18798,7 @@
+@@ -18188,20 +18912,7 @@
version_type=none
dynamic_linker="$host_os ld.so"
sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -6676,7 +7213,7 @@
need_lib_prefix=unknown
hardcode_into_libs=no
-@@ -18219,7 +18816,7 @@
+@@ -18219,7 +18930,7 @@
soname_spec='${libname}${release}${shared_ext}$major'
;;
@@ -6685,7 +7222,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18358,12 +18955,7 @@
+@@ -18358,12 +19069,7 @@
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -6699,7 +7236,7 @@
sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
;;
-@@ -18417,7 +19009,7 @@
+@@ -18417,7 +19123,7 @@
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
;;
@@ -6708,7 +7245,7 @@
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
;;
-@@ -18480,7 +19072,7 @@
+@@ -18480,7 +19186,7 @@
postinstall_cmds='chmod 555 $lib'
;;
@@ -6717,7 +7254,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -18551,7 +19143,7 @@
+@@ -18551,7 +19257,7 @@
# Append ld.so.conf contents to the search path
if test -f /etc/ld.so.conf; then
@@ -6726,7 +7263,7 @@
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
fi
-@@ -18657,6 +19249,10 @@
+@@ -18657,6 +19363,10 @@
sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
;;
@@ -6737,7 +7274,7 @@
solaris*)
version_type=linux
need_lib_prefix=no
-@@ -18753,6 +19349,21 @@
+@@ -18753,6 +19463,21 @@
echo "${ECHO_T}$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
@@ -6759,7 +7296,7 @@
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
if test "$GCC" = yes; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-@@ -18836,6 +19447,7 @@
+@@ -18836,6 +19561,7 @@
predeps_GCJ \
postdeps_GCJ \
compiler_lib_search_path_GCJ \
@@ -6767,7 +7304,7 @@
archive_cmds_GCJ \
archive_expsym_cmds_GCJ \
postinstall_cmds_GCJ \
-@@ -18851,6 +19463,7 @@
+@@ -18851,6 +19577,7 @@
module_cmds_GCJ \
module_expsym_cmds_GCJ \
lt_cv_prog_compiler_c_o_GCJ \
@@ -6775,7 +7312,7 @@
exclude_expsyms_GCJ \
include_expsyms_GCJ; do
-@@ -19083,6 +19696,10 @@
+@@ -19083,6 +19810,10 @@
# shared library.
postdeps=$lt_postdeps_GCJ
@@ -6786,7 +7323,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-@@ -19171,7 +19788,7 @@
+@@ -19171,7 +19902,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6795,7 +7332,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_GCJ
-@@ -19228,7 +19845,7 @@
+@@ -19228,7 +19959,7 @@
objext_RC=$objext
# Code to be used in simple compile tests
@@ -6804,7 +7341,7 @@
# Code to be used in simple link tests
lt_simple_link_test_code="$lt_simple_compile_test_code"
-@@ -19247,16 +19864,16 @@
+@@ -19247,16 +19978,16 @@
# save warnings/boilerplate of simple test code
ac_outfile=conftest.$ac_objext
@@ -6824,7 +7361,7 @@
# Allow CC to be a program name with arguments.
-@@ -19316,6 +19933,7 @@
+@@ -19316,6 +20047,7 @@
predeps_RC \
postdeps_RC \
compiler_lib_search_path_RC \
@@ -6832,7 +7369,7 @@
archive_cmds_RC \
archive_expsym_cmds_RC \
postinstall_cmds_RC \
-@@ -19331,6 +19949,7 @@
+@@ -19331,6 +20063,7 @@
module_cmds_RC \
module_expsym_cmds_RC \
lt_cv_prog_compiler_c_o_RC \
@@ -6840,7 +7377,7 @@
exclude_expsyms_RC \
include_expsyms_RC; do
-@@ -19563,6 +20182,10 @@
+@@ -19563,6 +20296,10 @@
# shared library.
postdeps=$lt_postdeps_RC
@@ -6851,7 +7388,7 @@
# The library search path used internally by the compiler when linking
# a shared library.
compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-@@ -19651,7 +20274,7 @@
+@@ -19651,7 +20388,7 @@
sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
# Fix the shell variable \$srcfile for the compiler.
@@ -6860,7 +7397,7 @@
# Set to yes if exported symbols are required.
always_export_symbols=$always_export_symbols_RC
-@@ -20373,7 +20996,7 @@
+@@ -20373,7 +21110,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6869,7 +7406,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20383,7 +21006,7 @@
+@@ -20383,7 +21120,7 @@
and GDESKLETS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6878,7 +7415,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20497,7 +21120,7 @@
+@@ -20497,7 +21234,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6887,7 +7424,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20507,7 +21130,7 @@
+@@ -20507,7 +21244,7 @@
and UTILS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6896,7 +7433,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20611,7 +21234,7 @@
+@@ -20611,7 +21348,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6905,7 +7442,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20621,7 +21244,7 @@
+@@ -20621,7 +21358,7 @@
and GLIBTOP_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6914,7 +7451,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20725,7 +21348,7 @@
+@@ -20725,7 +21462,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6923,7 +7460,7 @@
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
-@@ -20735,7 +21358,7 @@
+@@ -20735,7 +21472,7 @@
and SVG_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6932,7 +7469,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20839,7 +21462,7 @@
+@@ -20839,7 +21576,7 @@
and TILING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6941,7 +7478,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
-@@ -20849,7 +21472,7 @@
+@@ -20849,7 +21586,7 @@
and TILING_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6950,7 +7487,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -20953,7 +21576,7 @@
+@@ -20953,7 +21690,7 @@
and X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6959,7 +7496,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
-@@ -20963,7 +21586,7 @@
+@@ -20963,7 +21700,7 @@
and X11_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6968,7 +7505,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21067,7 +21690,7 @@
+@@ -21067,7 +21804,7 @@
and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6977,7 +7514,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
-@@ -21077,7 +21700,7 @@
+@@ -21077,7 +21814,7 @@
and SHARED_MIME_INFO_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -6986,7 +7523,7 @@
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
-@@ -21378,7 +22001,7 @@
+@@ -21378,7 +22115,7 @@
fi
fi
@@ -6995,7 +7532,7 @@
gt_cv_have_gettext=no
-@@ -22349,8 +22972,8 @@
+@@ -22349,8 +23086,8 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -7006,7 +7543,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -23200,6 +23823,7 @@
+@@ -23200,6 +23937,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
@@ -7014,18 +7551,27 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -23295,9 +23919,7 @@
+@@ -23293,11 +24031,6 @@
+ # INIT-COMMANDS
+ #
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"
+-INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+-prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}'
_ACEOF
-@@ -23480,6 +24102,7 @@
+@@ -23310,7 +24043,6 @@
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+ "Controls/ArrayBuffer/Makefile") CONFIG_FILES="$CONFIG_FILES Controls/ArrayBuffer/Makefile" ;;
+ "Controls/Calendar/Makefile") CONFIG_FILES="$CONFIG_FILES Controls/Calendar/Makefile" ;;
+@@ -23480,6 +24212,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
@@ -7033,27 +7579,43 @@
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
-@@ -23536,7 +24159,6 @@
- INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
- INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
- INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+@@ -23520,6 +24253,9 @@
+ CPP!$CPP$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
++INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
++INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
++INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+ INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+ INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+@@ -23533,10 +24269,6 @@
+ 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
+-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
-@@ -23578,15 +24200,16 @@
+@@ -23578,15 +24310,16 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
++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
INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+-INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+-INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+-INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+INTLTOOL_POLICY_RULE!$INTLTOOL_POLICY_RULE$ac_delim
+XGETTEXT!$XGETTEXT$ac_delim
+MSGMERGE!$MSGMERGE$ac_delim
+MSGFMT!$MSGFMT$ac_delim
- INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
- INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
- INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
@@ -7062,7 +7624,7 @@
ALL_LINGUAS!$ALL_LINGUAS$ac_delim
DATADIRNAME!$DATADIRNAME$ac_delim
build!$build$ac_delim
-@@ -23597,10 +24220,13 @@
+@@ -23597,10 +24330,13 @@
host_cpu!$host_cpu$ac_delim
host_vendor!$host_vendor$ac_delim
host_os!$host_os$ac_delim
@@ -7076,7 +7638,7 @@
CXX!$CXX$ac_delim
CXXFLAGS!$CXXFLAGS$ac_delim
ac_ct_CXX!$ac_ct_CXX$ac_delim
-@@ -23641,10 +24267,8 @@
+@@ -23641,10 +24377,8 @@
UPDATE_DESKTOP_DATABASE!$UPDATE_DESKTOP_DATABASE$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
@@ -7087,7 +7649,7 @@
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
GMOFILES!$GMOFILES$ac_delim
-@@ -23662,7 +24286,7 @@
+@@ -23662,7 +24396,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -7096,7 +7658,7 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -23889,6 +24513,11 @@
+@@ -23889,6 +24623,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
@@ -7108,7 +7670,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -23942,6 +24571,7 @@
+@@ -23942,6 +24681,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
@@ -7116,7 +7678,7 @@
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
-@@ -24057,21 +24687,22 @@
+@@ -24057,21 +24797,22 @@
fi
rm -f "$tmp/out12"
# Compute $ac_file's index in $config_headers.
@@ -7146,7 +7708,7 @@
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
-@@ -24106,8 +24737,9 @@
+@@ -24106,8 +24847,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.
@@ -7158,20 +7720,37 @@
dirpart=`$as_dirname -- "$mf" ||
$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
X"$mf" : 'X\(//\)[^/]' \| \
-@@ -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" \
+@@ -24221,27 +24963,6 @@
+ done
+ done
+ ;;
+- "intltool":C)
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+- < ${ac_aux_dir}/${file}.in > ${file}.out
+- if cmp -s ${file} ${file}.out 2>/dev/null; then
+- rm -f ${file}.out
+- else
+- mv -f ${file}.out ${file}
+- fi
+- chmod ugo+x ${file}
+- chmod u+w ${file}
+-done
+-
+- ;;
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+ esac ;;
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
++++ gdesklets-0.36/Controls/ArrayBuffer/Makefile.in 2008-09-01 21:27:22.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.
@@ -7440,7 +8019,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Controls/Calendar/Makefile.in gdesklets-0.36/Controls/Calendar/Makefile.in
--- gdesklets-0.36.orig/Controls/Calendar/Makefile.in 2008-02-17 01:45:39.000000000 +0800
-+++ gdesklets-0.36/Controls/Calendar/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/Calendar/Makefile.in 2008-09-01 21:27:22.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.
@@ -7709,7 +8288,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Controls/EventPipe/Makefile.in gdesklets-0.36/Controls/EventPipe/Makefile.in
--- gdesklets-0.36.orig/Controls/EventPipe/Makefile.in 2008-02-17 01:45:40.000000000 +0800
-+++ gdesklets-0.36/Controls/EventPipe/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/EventPipe/Makefile.in 2008-09-01 21:27:22.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.
@@ -7978,7 +8557,7 @@
# 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
++++ gdesklets-0.36/Controls/HDDTemp/Makefile.in 2008-09-01 21:27:23.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.
@@ -8247,7 +8826,7 @@
# 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
++++ gdesklets-0.36/Controls/Makefile.in 2008-09-01 21:27:23.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.
@@ -8617,7 +9196,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.36.orig/Controls/Sensor/Makefile.in gdesklets-0.36/Controls/Sensor/Makefile.in
--- gdesklets-0.36.orig/Controls/Sensor/Makefile.in 2008-02-17 01:45:41.000000000 +0800
-+++ gdesklets-0.36/Controls/Sensor/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/Sensor/Makefile.in 2008-09-01 21:27:23.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.
@@ -8886,7 +9465,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Controls/System/Makefile.in gdesklets-0.36/Controls/System/Makefile.in
--- gdesklets-0.36.orig/Controls/System/Makefile.in 2008-02-17 01:45:42.000000000 +0800
-+++ gdesklets-0.36/Controls/System/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/System/Makefile.in 2008-09-01 21:27:23.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.
@@ -9155,7 +9734,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Controls/Time/Makefile.in gdesklets-0.36/Controls/Time/Makefile.in
--- gdesklets-0.36.orig/Controls/Time/Makefile.in 2008-02-17 01:45:42.000000000 +0800
-+++ gdesklets-0.36/Controls/Time/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/Time/Makefile.in 2008-09-01 21:27:23.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.
@@ -9424,7 +10003,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Controls/URI/Makefile.in gdesklets-0.36/Controls/URI/Makefile.in
--- gdesklets-0.36.orig/Controls/URI/Makefile.in 2008-02-17 01:45:43.000000000 +0800
-+++ gdesklets-0.36/Controls/URI/Makefile.in 2008-03-01 01:27:30.000000000 +0800
++++ gdesklets-0.36/Controls/URI/Makefile.in 2008-09-01 21:27:23.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.
@@ -9693,7 +10272,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/data/Makefile.in gdesklets-0.36/data/Makefile.in
--- gdesklets-0.36.orig/data/Makefile.in 2008-02-17 01:45:50.000000000 +0800
-+++ gdesklets-0.36/data/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/data/Makefile.in 2008-09-01 21:27:25.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.
@@ -9993,9 +10572,27 @@
uninstall-sharedmimepackageDATA
@INTLTOOL_DESKTOP_RULE@
+@@ -549,17 +555,11 @@
+ cd $(DESTDIR)/$(fakepixmapdir); \
+ $(LN_S) -f ../../../share/pixmaps/gdesklets.png gdesklets.png;
+
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
+
+ uninstall-local: uninstall-desktopDATA uninstall-sharedmimepackageDATA
+- if test -n "$(UPDATE_MIME_DATABASE)"; then \
+- $(UPDATE_MIME_DATABASE) "$(DESTDIR)${sharedmimedir}"; \
+- fi;
+ if test -n "$(UPDATE_DESKTOP_DATABASE)"; then \
+ $(UPDATE_DESKTOP_DATABASE) "$(DESTDIR)${desktopdir}"; \
+ fi;
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
++++ gdesklets-0.36/depcomp 2008-09-01 21:27:28.000000000 +0800
@@ -1,9 +1,10 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
@@ -10148,7 +10745,7 @@
# $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
++++ gdesklets-0.36/display/Makefile.in 2008-09-01 21:27:25.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.
@@ -10417,7 +11014,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Displays/15pieces/gDesklets/Makefile.in gdesklets-0.36/Displays/15pieces/gDesklets/Makefile.in
--- gdesklets-0.36.orig/Displays/15pieces/gDesklets/Makefile.in 2008-02-17 01:45:45.000000000 +0800
-+++ gdesklets-0.36/Displays/15pieces/gDesklets/Makefile.in 2008-03-01 01:27:31.000000000 +0800
++++ gdesklets-0.36/Displays/15pieces/gDesklets/Makefile.in 2008-09-01 21:27:24.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.
@@ -10673,7 +11270,7 @@
# 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
++++ gdesklets-0.36/Displays/15pieces/Globe/Makefile.in 2008-09-01 21:27:23.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.
@@ -10929,7 +11526,7 @@
# 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
++++ gdesklets-0.36/Displays/15pieces/Gnome/Makefile.in 2008-09-01 21:27:23.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.
@@ -11185,7 +11782,7 @@
# 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
++++ gdesklets-0.36/Displays/15pieces/Makefile.in 2008-09-01 21:27:23.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.
@@ -11544,7 +12141,7 @@
# 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
++++ gdesklets-0.36/Displays/15pieces/Numbers/Makefile.in 2008-09-01 21:27:23.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.
@@ -11800,7 +12397,7 @@
# 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
++++ gdesklets-0.36/Displays/15pieces/Tux/Makefile.in 2008-09-01 21:27:23.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.
@@ -12056,7 +12653,7 @@
# 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
++++ gdesklets-0.36/Displays/Calendar/Makefile.in 2008-09-01 21:27:24.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.
@@ -12415,7 +13012,7 @@
# 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
++++ gdesklets-0.36/Displays/Calendar/months/Makefile.in 2008-09-01 21:27:24.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.
@@ -12671,7 +13268,7 @@
# 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
++++ gdesklets-0.36/Displays/Clock/gfx/Makefile.in 2008-09-01 21:27:24.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.
@@ -12927,7 +13524,7 @@
# 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
++++ gdesklets-0.36/Displays/Clock/Makefile.in 2008-09-01 21:27:24.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.
@@ -13286,7 +13883,7 @@
# 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
++++ gdesklets-0.36/Displays/Makefile.in 2008-09-01 21:27:24.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.
@@ -13625,7 +14222,7 @@
# 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
++++ gdesklets-0.36/Displays/Quote-of-the-Day/Makefile.in 2008-09-01 21:27:24.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.
@@ -13881,7 +14478,7 @@
# 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
++++ gdesklets-0.36/doc/basic/Images/Makefile.in 2008-09-01 21:27:25.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.
@@ -14137,7 +14734,7 @@
# 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
++++ gdesklets-0.36/doc/basic/Makefile.in 2008-09-01 21:27:25.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.
@@ -14496,7 +15093,7 @@
# 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
++++ gdesklets-0.36/doc/Makefile.in 2008-09-01 21:27:25.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.
@@ -14835,7 +15432,7 @@
doc:
diff -urN gdesklets-0.36.orig/doc/man/Makefile.in gdesklets-0.36/doc/man/Makefile.in
--- gdesklets-0.36.orig/doc/man/Makefile.in 2008-02-17 01:45:52.000000000 +0800
-+++ gdesklets-0.36/doc/man/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/doc/man/Makefile.in 2008-09-01 21:27:25.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.
@@ -15094,7 +15691,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/factory/Makefile.in gdesklets-0.36/factory/Makefile.in
--- gdesklets-0.36.orig/factory/Makefile.in 2008-02-17 01:45:53.000000000 +0800
-+++ gdesklets-0.36/factory/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/factory/Makefile.in 2008-09-01 21:27:25.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.
@@ -15363,7 +15960,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/INSTALL gdesklets-0.36/INSTALL
--- gdesklets-0.36.orig/INSTALL 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/INSTALL 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/INSTALL 2008-09-01 21:27:28.000000000 +0800
@@ -1,8 +1,8 @@
Installation Instructions
*************************
@@ -15487,7 +16084,7 @@
======================
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
++++ gdesklets-0.36/install-sh 2008-09-01 21:27:22.000000000 +0800
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
@@ -16133,642 +16730,9 @@
# 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.5";
-+my $VERSION = "0.37.1";
-
- ## Loaded modules
- use strict;
-@@ -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/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
-@@ -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_quotedxml if $gettext_type eq "quotedxml";
- }
-
- sub entity_decode_minimal
-@@ -237,9 +239,9 @@
-
- s/'/'/g; # '
- s/"/"/g; # "
-- s/&/&/g;
- s/</</g;
- s/>/>/g;
-+ s/&/&/g;
-
- return $_;
- }
-@@ -731,6 +733,18 @@
- }
- }
-
-+sub type_quotedxml {
-+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
-+ my $message = $1;
-+ my $before = $`;
-+ $message =~ s/\\\"/\"/g;
-+ $message = entity_decode($message);
-+ $before =~ s/[^\n]//g;
-+ $messages{$message} = [];
-+ $loc{$message} = length ($before) + 2;
-+ }
-+}
-+
- sub type_glade {
- ### For translatable Glade XML files ###
-
-diff -urN gdesklets-0.36.orig/intltool-merge.in gdesklets-0.36/intltool-merge.in
---- gdesklets-0.36.orig/intltool-merge.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/intltool-merge.in 2008-02-25 13:45:01.000000000 +0800
-@@ -35,7 +35,7 @@
- ## Release information
- my $PROGRAM = "intltool-merge";
- my $PACKAGE = "intltool";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.37.1";
-
- ## Loaded modules
- use strict;
-@@ -61,6 +61,7 @@
- my $SCHEMAS_STYLE_ARG = 0;
- my $RFC822DEB_STYLE_ARG = 0;
- my $QUOTED_STYLE_ARG = 0;
-+my $QUOTEDXML_STYLE_ARG = 0;
- my $QUIET_ARG = 0;
- my $PASS_THROUGH_ARG = 0;
- my $UTF8_ARG = 0;
-@@ -81,6 +82,7 @@
- "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
- "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
- "quoted-style" => \$QUOTED_STYLE_ARG,
-+ "quotedxml-style" => \$QUOTEDXML_STYLE_ARG,
- "pass-through|p" => \$PASS_THROUGH_ARG,
- "utf8|u" => \$UTF8_ARG,
- "multiple-output|m" => \$MULTIPLE_OUTPUT,
-@@ -93,9 +95,24 @@
-
- my %po_files_by_lang = ();
- my %translations = ();
--my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
-+my $iconv = $ENV{"ICONV"} || "iconv";
- my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
-
-+sub isProgramInPath
-+{
-+ my ($file) = @_;
-+ # If either a file exists, or when run it returns 0 exit status
-+ return 1 if ((-x $file) or (system("$file -l >$devnull") == 0));
-+ return 0;
-+}
-+
-+if (! isProgramInPath ("$iconv"))
-+{
-+ print STDERR " *** iconv is not found on this system!\n".
-+ " *** Without it, intltool-merge can not convert encodings.\n";
-+ exit;
-+}
-+
- # Use this instead of \w for XML files to handle more possible characters.
- my $w = "[-A-Za-z0-9._:]";
-
-@@ -133,7 +150,7 @@
- &utf8_sanity_check;
- &preparation;
- &print_message;
-- &keys_merge_translations;
-+ &keys_merge_translations;
- &finalize;
- }
- elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-@@ -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;
-- "ed_merge_translations;
-+ "ed_merge_translations($QUOTEDXML_STYLE_ARG);
- &finalize;
- }
- else
-@@ -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
-+ --quotedxml-style includes translations in the quoted xml string style
- -x, --xml-style includes translations in the standard xml style
-
- Other options:
-@@ -260,8 +278,41 @@
-
- sub gather_po_files
- {
-- for my $po_file (glob "$PO_DIR/*.po") {
-- $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ if (my $linguas = $ENV{"LINGUAS"})
-+ {
-+ for my $lang (split / /, $linguas) {
-+ my $po_file = $PO_DIR . "/" . $lang . ".po";
-+ if (-e $po_file) {
-+ $po_files_by_lang{$lang} = $po_file;
-+ }
-+ }
-+ }
-+ else
-+ {
-+ if (open LINGUAS_FILE, "$PO_DIR/LINGUAS")
-+ {
-+ while (<LINGUAS_FILE>)
-+ {
-+ next if /^#/;
-+
-+ for my $lang (split)
-+ {
-+ chomp ($lang);
-+ my $po_file = $PO_DIR . "/" . $lang . ".po";
-+ if (-e $po_file) {
-+ $po_files_by_lang{$lang} = $po_file;
-+ }
-+ }
-+ }
-+
-+ close LINGUAS_FILE;
-+ }
-+ else
-+ {
-+ for my $po_file (glob "$PO_DIR/*.po") {
-+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ }
-+ }
- }
- }
-
-@@ -494,16 +545,15 @@
- return $string;
- }
-
--## NOTE: deal with < - < but not > - > because it seems its ok to have
--## > in the entity. For further info please look at #84738.
- sub entity_decode
- {
- local ($_) = @_;
-
- s/'/'/g; # '
- s/"/"/g; # "
-- s/&/&/g;
- s/</</g;
-+ s/>/>/g;
-+ s/&/&/g;
-
- return $_;
- }
-@@ -528,6 +578,7 @@
- return "&" if $_ == 38;
- return "'" if $_ == 39;
- return "<" if $_ == 60;
-+ return ">" if $_ == 62;
- return chr $_;
- }
-
-@@ -1028,43 +1079,74 @@
- close OUTPUT;
- print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
- }
-- }
-- open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-- binmode (OUTPUT) if $^O eq 'MSWin32';
-- my $tree = readXml($FILE);
-- print_header($FILE, \*OUTPUT);
-- parseTree(\*OUTPUT, $tree);
-- close OUTPUT;
-- print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-+ if ( ! -d "C" ) {
-+ mkdir "C" or -d "C" or die "Cannot create subdirectory C: $!\n";
-+ }
-+ open OUTPUT, ">C/$OUTFILE" or die "Cannot open C/$OUTFILE: $!\n";
-+ binmode (OUTPUT) if $^O eq 'MSWin32';
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree);
-+ close OUTPUT;
-+ print "CREATED C/$OUTFILE\n" unless $QUIET_ARG;
-+ } else {
-+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-+ binmode (OUTPUT) if $^O eq 'MSWin32';
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree);
-+ close OUTPUT;
-+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-+ }
- }
-
--sub keys_merge_translations
-+sub keys_merge_translation
- {
-- open INPUT, "<${FILE}" or die;
-- open OUTPUT, ">${OUTFILE}" or die;
-+ my ($lang) = @_;
-+
-+ if ( ! -d $lang && $MULTIPLE_OUTPUT)
-+ {
-+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
-+ }
-+
-+ open INPUT, "<${FILE}" or die "Cannot open ${FILE}: $!\n";
-+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
- binmode (OUTPUT) if $^O eq 'MSWin32';
-
-- while (<INPUT>)
-+ while (<INPUT>)
- {
-- if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
- {
-- my $string = $3;
-+ my $string = $3;
-
-- print OUTPUT;
-+ if (!$MULTIPLE_OUTPUT)
-+ {
-+ print OUTPUT;
-
-- my $non_translated_line = $_;
-+ my $non_translated_line = $_;
-
-- for my $lang (sort keys %po_files_by_lang)
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/[$lang]$1=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
- {
-- my $translation = $translations{$lang, $string};
-- next if !$translation;
-+ my $non_translated_line = $_;
-+ my $translation = $translations{$lang, $string};
-+ $translation = $string if !$translation;
-
- $_ = $non_translated_line;
-- s/(\w+)=.*/[$lang]$1=$translation/;
-+ s/(\w+)=.*/$1=$translation/;
- print OUTPUT;
- }
-- }
-- else
-+ }
-+ else
- {
- print OUTPUT;
- }
-@@ -1072,6 +1154,24 @@
-
- close OUTPUT;
- close INPUT;
-+
-+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub keys_merge_translations
-+{
-+ if ($MULTIPLE_OUTPUT)
-+ {
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ keys_merge_translation ($lang);
-+ }
-+ keys_merge_translation ("C");
-+ }
-+ else
-+ {
-+ keys_merge_translation (".");
-+ }
- }
-
- sub desktop_merge_translations
-@@ -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_merge_translations
- {
-+ my ($xml_mode) = @_;
-+
- if (!$MULTIPLE_OUTPUT) {
- print "Quoted only supports Multiple Output.\n";
- exit(1);
-@@ -1394,7 +1497,7 @@
- binmode (OUTPUT) if $^O eq 'MSWin32';
- while (<INPUT>)
- {
-- s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
-+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($xml_mode, $lang, $1) . "\""/ge;
- print OUTPUT;
- }
- close OUTPUT;
-diff -urN gdesklets-0.36.orig/intltool-update.in gdesklets-0.36/intltool-update.in
---- gdesklets-0.36.orig/intltool-update.in 2008-02-17 01:45:23.000000000 +0800
-+++ gdesklets-0.36/intltool-update.in 2008-02-25 13:45:01.000000000 +0800
-@@ -30,7 +30,7 @@
-
- ## Release information
- my $PROGRAM = "intltool-update";
--my $VERSION = "0.35.5";
-+my $VERSION = "0.37.1";
- my $PACKAGE = "intltool";
-
- ## Loaded modules
-@@ -71,7 +71,8 @@
- "sheet(?:\\.in)+|". # ?
- "schemas(?:\\.in)+|". # GConf specific
- "pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
--"kbd(?:\\.in)+"; # GOK specific.
-+"kbd(?:\\.in)+|". # GOK specific.
-+"policy(?:\\.in)+"; # PolicyKit files
-
- my $ini_support =
- "icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec
-@@ -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)+)$/;
- }, "..";
--
-+ find sub {
-+ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
-+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
-+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
-+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-+ }, "$SRCDIR/.." if "$SRCDIR" ne ".";
-
- open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
- @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-@@ -428,8 +434,8 @@
- last;
- }
-
-- ## 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
-@@ -489,11 +495,15 @@
- my %in2;
- foreach (@buf_potfiles_sorted)
- {
-+ s#^$SRCDIR/../##;
-+ s#^$SRCDIR/##;
- $in2{$_} = 1;
- }
-
- foreach (@buf_potfiles_ignore_sorted)
- {
-+ s#^$SRCDIR/../##;
-+ s#^$SRCDIR/##;
- $in2{$_} = 1;
- }
-
-@@ -501,9 +511,16 @@
-
- foreach (@buf_allfiles_sorted)
- {
-- if (!exists($in2{$_}))
-+ my $dummy = $_;
-+ my $srcdir = $SRCDIR;
-+
-+ $srcdir =~ s#^../##;
-+ $dummy =~ s#^$srcdir/../##;
-+ $dummy =~ s#^$srcdir/##;
-+ $dummy =~ s#_build/##;
-+ if (!exists($in2{$dummy}))
- {
-- push @result, $_
-+ push @result, $dummy
- }
- }
-
-@@ -563,11 +580,23 @@
- exit 1;
- }
-
--sub isIntltoolExtractInPath
-+sub isProgramInPath
- {
- my ($file) = @_;
- # If either a file exists, or when run it returns 0 exit status
-- return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
-+ return 1 if ((-x $file) or (system("$file --version >$devnull") == 0));
-+ return 0;
-+}
-+
-+sub isGNUGettextTool
-+{
-+ my ($file) = @_;
-+ # Check that we are using GNU gettext tools
-+ if (isProgramInPath ($file))
-+ {
-+ my $version = `$file --version`;
-+ return 1 if ($version =~ m/.*\(GNU .*\).*/);
-+ }
- return 0;
- }
-
-@@ -577,7 +606,7 @@
-
- ## Generate the .h header files, so we can allow glade and
- ## xml translation support
-- 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";
-@@ -624,13 +653,13 @@
- #
- sub GeneratePOTemplate
- {
-- my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
-+ my $XGETTEXT = $ENV{"XGETTEXT"} || "xgettext";
- my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
- chomp $XGETTEXT;
-
-- if (! -x $XGETTEXT)
-+ if (! isGNUGettextTool ("$XGETTEXT"))
- {
-- print STDERR " *** xgettext is not found on this system!\n".
-+ print STDERR " *** GNU xgettext is not found on this system!\n".
- " *** Without it, intltool-update can not extract strings.\n";
- exit;
- }
-@@ -726,13 +755,29 @@
- unlink "$MODULE.pot";
- my @xgettext_argument=("$XGETTEXT",
- "--add-comments",
-- "--directory\=\.",
-+ "--directory\=.",
-+ "--default-domain\=$MODULE",
-+ "--flag\=g_strdup_printf:1:c-format",
-+ "--flag\=g_string_printf:2:c-format",
-+ "--flag\=g_string_append_printf:2:c-format",
-+ "--flag\=g_error_new:3:c-format",
-+ "--flag\=g_set_error:4:c-format",
-+ "--flag\=g_markup_printf_escaped:1:c-format",
-+ "--flag\=g_log:3:c-format",
-+ "--flag\=g_print:1:c-format",
-+ "--flag\=g_printerr:1:c-format",
-+ "--flag\=g_printf:1:c-format",
-+ "--flag\=g_fprintf:2:c-format",
-+ "--flag\=g_sprintf:2:c-format",
-+ "--flag\=g_snprintf:3:c-format",
-+ "--flag\=g_scanner_error:2:c-format",
-+ "--flag\=g_scanner_warn:2:c-format",
- "--output\=$MODULE\.pot",
- "--files-from\=\.\/POTFILES\.in\.temp");
- my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
- push @xgettext_argument, $XGETTEXT_KEYWORDS;
- my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
-- push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
-+ push @xgettext_argument, "--msgid-bugs-address\=\"$MSGID_BUGS_ADDRESS\"" if $MSGID_BUGS_ADDRESS;
- push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
- push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
- my $xgettext_command = join ' ', @xgettext_argument;
-@@ -793,9 +838,16 @@
- {
- -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
-
-- my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
-+ my $MSGMERGE = $ENV{"MSGMERGE"} || "msgmerge";
- my ($lang, $outfile) = @_;
-
-+ if (! isGNUGettextTool ("$MSGMERGE"))
-+ {
-+ print STDERR " *** GNU msgmerge is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-+
- print "Merging $SRCDIR/$lang.po with $MODULE.pot..." if $VERBOSE;
-
- my $infile = "$SRCDIR/$lang.po";
-@@ -836,7 +888,14 @@
- sub Console_Write_TranslationStatus
- {
- my ($lang, $output_file) = @_;
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
-+
-+ if (! isGNUGettextTool ("$MSGFMT"))
-+ {
-+ print STDERR " *** GNU msgfmt is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-
- $output_file = "$SRCDIR/$lang.po" if ($output_file eq "");
-
-@@ -845,21 +904,28 @@
-
- sub Console_Write_CoverageReport
- {
-- my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+ my $MSGFMT = $ENV{"MSGFMT"} || "msgfmt";
-+
-+ if (! isGNUGettextTool ("$MSGFMT"))
-+ {
-+ print STDERR " *** GNU msgfmt is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-
- &GatherPOFiles;
-
- foreach my $lang (@languages)
- {
-- print "$lang: ";
-+ print STDERR "$lang: ";
- &POFile_Update ($lang, "");
- }
-
-- print "\n\n * Current translation support in $MODULE \n\n";
-+ print STDERR "\n\n * Current translation support in $MODULE \n\n";
-
- foreach my $lang (@languages)
- {
-- print "$lang: ";
-+ print STDERR "$lang: ";
- system ("$MSGFMT", "-o", "$devnull", "--verbose", "$SRCDIR/$lang.po");
- }
- }
-@@ -933,13 +999,13 @@
-
- $conf_in || die "Cannot find top_builddir in Makevars.";
- }
-- elsif (-f "../configure.ac")
-+ elsif (-f "$SRCDIR/../configure.ac")
- {
-- $conf_in = "../configure.ac";
-+ $conf_in = "$SRCDIR/../configure.ac";
- }
-- elsif (-f "../configure.in")
-+ elsif (-f "$SRCDIR/../configure.in")
- {
-- $conf_in = "../configure.in";
-+ $conf_in = "$SRCDIR/../configure.in";
- }
- else
- {
-@@ -1052,6 +1118,8 @@
- close IN;
- }
-
-+ # unwrap lines split with a trailing \
-+ $make_source =~ s/\\ $ \n/ /mxg;
- $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
-
- return $keywords;
diff -urN gdesklets-0.36.orig/layout/Makefile.in gdesklets-0.36/layout/Makefile.in
--- gdesklets-0.36.orig/layout/Makefile.in 2008-02-17 01:45:53.000000000 +0800
-+++ gdesklets-0.36/layout/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/layout/Makefile.in 2008-09-01 21:27:25.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.
@@ -17037,7 +17001,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/libdesklets/controls/Makefile.in gdesklets-0.36/libdesklets/controls/Makefile.in
--- gdesklets-0.36.orig/libdesklets/controls/Makefile.in 2008-02-17 01:45:54.000000000 +0800
-+++ gdesklets-0.36/libdesklets/controls/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/controls/Makefile.in 2008-09-01 21:27:25.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.
@@ -17306,7 +17270,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/libdesklets/Makefile.in gdesklets-0.36/libdesklets/Makefile.in
--- gdesklets-0.36.orig/libdesklets/Makefile.in 2008-02-17 01:45:54.000000000 +0800
-+++ gdesklets-0.36/libdesklets/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/Makefile.in 2008-09-01 21:27:25.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.
@@ -17676,7 +17640,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.36.orig/libdesklets/system/FreeBSD/Makefile.in gdesklets-0.36/libdesklets/system/FreeBSD/Makefile.in
--- gdesklets-0.36.orig/libdesklets/system/FreeBSD/Makefile.in 2008-02-17 01:45:55.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/FreeBSD/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/system/FreeBSD/Makefile.in 2008-09-01 21:27:26.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.
@@ -17945,7 +17909,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/libdesklets/system/Linux/Makefile.in gdesklets-0.36/libdesklets/system/Linux/Makefile.in
--- gdesklets-0.36.orig/libdesklets/system/Linux/Makefile.in 2008-02-17 01:45:55.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/Linux/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/system/Linux/Makefile.in 2008-09-01 21:27:26.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.
@@ -18214,7 +18178,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/libdesklets/system/Makefile.in gdesklets-0.36/libdesklets/system/Makefile.in
--- gdesklets-0.36.orig/libdesklets/system/Makefile.in 2008-02-17 01:45:56.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/system/Makefile.in 2008-09-01 21:27:26.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.
@@ -18674,7 +18638,7 @@
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
++++ gdesklets-0.36/libdesklets/system/NetBSD/Makefile.in 2008-09-01 21:27:26.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.
@@ -18943,7 +18907,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/libdesklets/system/OpenBSD/Makefile.in gdesklets-0.36/libdesklets/system/OpenBSD/Makefile.in
--- gdesklets-0.36.orig/libdesklets/system/OpenBSD/Makefile.in 2008-02-17 01:45:57.000000000 +0800
-+++ gdesklets-0.36/libdesklets/system/OpenBSD/Makefile.in 2008-03-01 01:27:33.000000000 +0800
++++ gdesklets-0.36/libdesklets/system/OpenBSD/Makefile.in 2008-09-01 21:27:26.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.
@@ -19212,7 +19176,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/ltmain.sh gdesklets-0.36/ltmain.sh
--- gdesklets-0.36.orig/ltmain.sh 2006-06-20 02:36:49.000000000 +0800
-+++ gdesklets-0.36/ltmain.sh 2008-02-02 21:28:24.000000000 +0800
++++ gdesklets-0.36/ltmain.sh 2008-04-30 05:33:55.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.
@@ -19230,7 +19194,7 @@
PACKAGE=libtool
-VERSION="1.5.22 Debian 1.5.22-4"
-TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
-+VERSION="1.5.26 Debian 1.5.26-1"
++VERSION="1.5.26 Debian 1.5.26-4"
+TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
-# See if we are running on zsh, and set the options which allow our
@@ -19855,7 +19819,7 @@
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
++++ gdesklets-0.36/main/Makefile.in 2008-09-01 21:27:26.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.
@@ -20124,7 +20088,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Makefile.in gdesklets-0.36/Makefile.in
--- gdesklets-0.36.orig/Makefile.in 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/Makefile.in 2008-03-01 01:27:36.000000000 +0800
++++ gdesklets-0.36/Makefile.in 2008-09-01 21:27:28.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.
@@ -20549,7 +20513,7 @@
install-data-hook:
diff -urN gdesklets-0.36.orig/missing gdesklets-0.36/missing
--- gdesklets-0.36.orig/missing 2008-02-17 01:45:38.000000000 +0800
-+++ gdesklets-0.36/missing 2008-03-01 01:27:29.000000000 +0800
++++ gdesklets-0.36/missing 2008-09-01 21:27:22.000000000 +0800
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
@@ -20734,7 +20698,7 @@
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
++++ gdesklets-0.36/mkinstalldirs 2008-09-01 21:27:28.000000000 +0800
@@ -1,7 +1,7 @@
#! /bin/sh
# mkinstalldirs --- make directory hierarchy
@@ -20756,7 +20720,7 @@
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
++++ gdesklets-0.36/plugin/Makefile.in 2008-09-01 21:27:26.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.
@@ -21023,44 +20987,9 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
-diff -urN gdesklets-0.36.orig/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.
--installcheck:
-+install-exec installcheck:
-
- uninstall:
- linguas="$(USE_LINGUAS)"; \
diff -urN gdesklets-0.36.orig/scripting/Makefile.in gdesklets-0.36/scripting/Makefile.in
--- gdesklets-0.36.orig/scripting/Makefile.in 2008-02-17 01:45:58.000000000 +0800
-+++ gdesklets-0.36/scripting/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/scripting/Makefile.in 2008-09-01 21:27:26.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.
@@ -21329,7 +21258,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/sensor/Makefile.in gdesklets-0.36/sensor/Makefile.in
--- gdesklets-0.36.orig/sensor/Makefile.in 2008-02-17 01:45:58.000000000 +0800
-+++ gdesklets-0.36/sensor/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/sensor/Makefile.in 2008-09-01 21:27:26.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.
@@ -21598,7 +21527,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Sensors/External/Makefile.in gdesklets-0.36/Sensors/External/Makefile.in
--- gdesklets-0.36.orig/Sensors/External/Makefile.in 2008-02-17 01:45:48.000000000 +0800
-+++ gdesklets-0.36/Sensors/External/Makefile.in 2008-03-01 01:27:31.000000000 +0800
++++ gdesklets-0.36/Sensors/External/Makefile.in 2008-09-01 21:27:24.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.
@@ -21867,7 +21796,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Sensors/FontSelector/Makefile.in gdesklets-0.36/Sensors/FontSelector/Makefile.in
--- gdesklets-0.36.orig/Sensors/FontSelector/Makefile.in 2008-02-17 01:45:49.000000000 +0800
-+++ gdesklets-0.36/Sensors/FontSelector/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/Sensors/FontSelector/Makefile.in 2008-09-01 21:27:24.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.
@@ -22136,7 +22065,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/Sensors/Makefile.in gdesklets-0.36/Sensors/Makefile.in
--- gdesklets-0.36.orig/Sensors/Makefile.in 2008-02-17 01:45:49.000000000 +0800
-+++ gdesklets-0.36/Sensors/Makefile.in 2008-03-01 01:27:32.000000000 +0800
++++ gdesklets-0.36/Sensors/Makefile.in 2008-09-01 21:27:24.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.
@@ -22475,7 +22404,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/Makefile.in gdesklets-0.36/shell/Makefile.in
--- gdesklets-0.36.orig/shell/Makefile.in 2008-02-17 01:45:59.000000000 +0800
-+++ gdesklets-0.36/shell/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/Makefile.in 2008-09-01 21:27:27.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.
@@ -22845,7 +22774,7 @@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff -urN gdesklets-0.36.orig/shell/plugins/ControlBrowser/Makefile.in gdesklets-0.36/shell/plugins/ControlBrowser/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/ControlBrowser/Makefile.in 2008-02-17 01:45:59.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlBrowser/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/ControlBrowser/Makefile.in 2008-09-01 21:27:27.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.
@@ -23114,7 +23043,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/ControlCollection/Makefile.in gdesklets-0.36/shell/plugins/ControlCollection/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/ControlCollection/Makefile.in 2008-02-17 01:46:00.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlCollection/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/ControlCollection/Makefile.in 2008-09-01 21:27:27.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.
@@ -23383,7 +23312,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/ControlsView/Makefile.in gdesklets-0.36/shell/plugins/ControlsView/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/ControlsView/Makefile.in 2008-02-17 01:46:00.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ControlsView/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/ControlsView/Makefile.in 2008-09-01 21:27:27.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.
@@ -23652,7 +23581,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/DisplayBrowser/Makefile.in gdesklets-0.36/shell/plugins/DisplayBrowser/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/DisplayBrowser/Makefile.in 2008-02-17 01:46:01.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayBrowser/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/DisplayBrowser/Makefile.in 2008-09-01 21:27:27.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.
@@ -23921,7 +23850,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/DisplayCollection/Makefile.in gdesklets-0.36/shell/plugins/DisplayCollection/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/DisplayCollection/Makefile.in 2008-02-17 01:46:01.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayCollection/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/DisplayCollection/Makefile.in 2008-09-01 21:27:27.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.
@@ -24190,7 +24119,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/DisplayView/Makefile.in gdesklets-0.36/shell/plugins/DisplayView/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/DisplayView/Makefile.in 2008-02-17 01:46:02.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/DisplayView/Makefile.in 2008-03-01 01:27:34.000000000 +0800
++++ gdesklets-0.36/shell/plugins/DisplayView/Makefile.in 2008-09-01 21:27:27.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.
@@ -24459,7 +24388,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/gDeskletsClient/Makefile.in gdesklets-0.36/shell/plugins/gDeskletsClient/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/gDeskletsClient/Makefile.in 2008-02-17 01:46:06.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/gDeskletsClient/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/gDeskletsClient/Makefile.in 2008-09-01 21:27:28.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.
@@ -24728,7 +24657,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/Help/Makefile.in gdesklets-0.36/shell/plugins/Help/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/Help/Makefile.in 2008-02-17 01:46:02.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Help/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/Help/Makefile.in 2008-09-01 21:27:27.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.
@@ -24997,7 +24926,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/Makefile.in gdesklets-0.36/shell/plugins/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/Makefile.in 2008-02-17 01:46:03.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/Makefile.in 2008-09-01 21:27:27.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.
@@ -25336,7 +25265,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/Menu/Makefile.in gdesklets-0.36/shell/plugins/Menu/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/Menu/Makefile.in 2008-02-17 01:46:03.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Menu/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/Menu/Makefile.in 2008-09-01 21:27:27.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.
@@ -25605,7 +25534,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/PackageInstaller/Makefile.in gdesklets-0.36/shell/plugins/PackageInstaller/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/PackageInstaller/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/PackageInstaller/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/PackageInstaller/Makefile.in 2008-09-01 21:27:27.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.
@@ -25874,7 +25803,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/Profiles/Makefile.in gdesklets-0.36/shell/plugins/Profiles/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/Profiles/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Profiles/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/Profiles/Makefile.in 2008-09-01 21:27:28.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.
@@ -26143,7 +26072,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/Shell/Makefile.in gdesklets-0.36/shell/plugins/Shell/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/Shell/Makefile.in 2008-02-17 01:46:04.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/Shell/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/Shell/Makefile.in 2008-09-01 21:27:28.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.
@@ -26412,7 +26341,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/StatusBar/Makefile.in gdesklets-0.36/shell/plugins/StatusBar/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/StatusBar/Makefile.in 2008-02-17 01:46:05.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/StatusBar/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/StatusBar/Makefile.in 2008-09-01 21:27:28.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.
@@ -26681,7 +26610,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/shell/plugins/ViewSwitch/Makefile.in gdesklets-0.36/shell/plugins/ViewSwitch/Makefile.in
--- gdesklets-0.36.orig/shell/plugins/ViewSwitch/Makefile.in 2008-02-17 01:46:05.000000000 +0800
-+++ gdesklets-0.36/shell/plugins/ViewSwitch/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/shell/plugins/ViewSwitch/Makefile.in 2008-09-01 21:27:28.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.
@@ -26950,7 +26879,7 @@
# Otherwise a system limit (for SysV at least) may be exceeded.
diff -urN gdesklets-0.36.orig/utils/Makefile.in gdesklets-0.36/utils/Makefile.in
--- gdesklets-0.36.orig/utils/Makefile.in 2008-02-17 01:46:07.000000000 +0800
-+++ gdesklets-0.36/utils/Makefile.in 2008-03-01 01:27:35.000000000 +0800
++++ gdesklets-0.36/utils/Makefile.in 2008-09-01 21:27:28.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.
Modified: packages/unstable/gdesklets/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gdesklets/debian/rules?rev=16856&op=diff
==============================================================================
--- packages/unstable/gdesklets/debian/rules (original)
+++ packages/unstable/gdesklets/debian/rules Mon Sep 1 14:08:57 2008
@@ -16,16 +16,6 @@
binary-post-install/gdesklets::
dh_pysupport -pgdesklets
install -m 755 debian/pack_sensor.py debian/gdesklets/usr/share/gdesklets/
- rm -f debian/gdesklets/usr/bin/gdesklets
- rm -f debian/gdesklets/usr/share/gdesklets/data/gdesklets.png
- -rm -f debian/gdesklets/usr/share/mime/globs
- -rm -f debian/gdesklets/usr/share/mime/magic
- -rm -f debian/gdesklets/usr/share/mime/aliases
- -rm -f debian/gdesklets/usr/share/mime/subclasses
- -rm -f debian/gdesklets/usr/share/mime/XMLnamespaces
- -rm -f debian/gdesklets/usr/share/applications/mimeinfo.cache
ln -sf ../lib/gdesklets/gdesklets debian/gdesklets/usr/bin/gdesklets
cp debian/migration-tool debian/gdesklets/usr/share/gdesklets/
chmod 755 debian/gdesklets/usr/share/gdesklets/migration-tool
- # NEVER EVER ship the cache (#373600)
- -rm -f debian/gdesklets/usr/share/mime/mime.cache
More information about the pkg-gnome-commits
mailing list