r24273 - in /desktop/unstable/gnome-system-tools/debian: changelog patches/90_relibtoolize.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed May 5 17:45:23 UTC 2010
Author: biebl
Date: Wed May 5 17:45:22 2010
New Revision: 24273
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24273
Log:
* debian/patches/90_relibtoolize.patch
- Re-add update instructions to the patch header and refresh again for the
changes in 61_outdated_docs.patch.
Modified:
desktop/unstable/gnome-system-tools/debian/changelog
desktop/unstable/gnome-system-tools/debian/patches/90_relibtoolize.patch
Modified: desktop/unstable/gnome-system-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/changelog?rev=24273&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/changelog [utf-8] Wed May 5 17:45:22 2010
@@ -2,6 +2,9 @@
* debian/patches/61_outdated_docs.patch
- Don't build and install broken nl documentation for time-admin.
+ * debian/patches/90_relibtoolize.patch
+ - Re-add update instructions to the patch header and refresh again for the
+ changes in 61_outdated_docs.patch.
-- Michael Biebl <biebl at debian.org> Wed, 05 May 2010 19:40:01 +0200
Modified: desktop/unstable/gnome-system-tools/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-system-tools/debian/patches/90_relibtoolize.patch?rev=24273&op=diff
==============================================================================
--- desktop/unstable/gnome-system-tools/debian/patches/90_relibtoolize.patch [utf-8] (original)
+++ desktop/unstable/gnome-system-tools/debian/patches/90_relibtoolize.patch [utf-8] Wed May 5 17:45:22 2010
@@ -1,261 +1,228 @@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/aclocal.m4 gnome-system-tools-2.30.1/aclocal.m4
---- gnome-system-tools-2.30.1.old/aclocal.m4 2010-04-26 22:10:46.000000000 +0200
-+++ gnome-system-tools-2.30.1/aclocal.m4 2010-05-05 17:13:01.477568780 +0200
-@@ -497,8223 +497,6 @@
- fi])
-
-
--dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
--dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
--AC_DEFUN([GNOME_DOC_DEFINES],
--[
--AC_ARG_WITH([help-dir],
-- AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-- [with_help_dir='${datadir}/gnome/help'])
--HELP_DIR="$with_help_dir"
--AC_SUBST(HELP_DIR)
--
--AC_ARG_WITH([omf-dir],
-- AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-- [with_omf_dir='${datadir}/omf'])
--OMF_DIR="$with_omf_dir"
--AC_SUBST(OMF_DIR)
--
--AC_ARG_WITH([help-formats],
-- AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-- [with_help_formats=''])
--DOC_USER_FORMATS="$with_help_formats"
--AC_SUBST(DOC_USER_FORMATS)
--
--AC_ARG_ENABLE([scrollkeeper],
-- [AC_HELP_STRING([--disable-scrollkeeper],
-- [do not make updates to the scrollkeeper database])],,
-- enable_scrollkeeper=yes)
--AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
--
--dnl disable scrollkeeper automatically for distcheck
--DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
--AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
--
--AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
--])
--
--# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
--#
--AC_DEFUN([GNOME_DOC_INIT],
--[AC_REQUIRE([AC_PROG_LN_S])dnl
--
--ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
--
--AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
--PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
--
--if test "$gdu_cv_have_gdu" = "yes"; then
-- AC_MSG_RESULT([yes])
-- ifelse([$2],,[:],[$2])
--else
-- AC_MSG_RESULT([no])
-- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
--fi
--
--GNOME_DOC_DEFINES
--])
--
--
--dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 40 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL], [
--AC_PREREQ([2.50])dnl
--AC_REQUIRE([AM_NLS])dnl
--
--case "$am__api_version" in
-- 1.[01234])
-- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-- ;;
-- *)
-- ;;
--esac
--
--if test -n "$1"; then
-- AC_MSG_CHECKING([for intltool >= $1])
--
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-- INTLTOOL_APPLIED_VERSION=`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 $< [$]@'
-- INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-- INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
-- INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-- INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
--
--_IT_SUBST(INTLTOOL_DESKTOP_RULE)
--_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
--_IT_SUBST(INTLTOOL_KEYS_RULE)
--_IT_SUBST(INTLTOOL_PROP_RULE)
--_IT_SUBST(INTLTOOL_OAF_RULE)
--_IT_SUBST(INTLTOOL_PONG_RULE)
--_IT_SUBST(INTLTOOL_SERVER_RULE)
--_IT_SUBST(INTLTOOL_SHEET_RULE)
--_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
--_IT_SUBST(INTLTOOL_UI_RULE)
--_IT_SUBST(INTLTOOL_XAM_RULE)
--_IT_SUBST(INTLTOOL_KBD_RULE)
--_IT_SUBST(INTLTOOL_XML_RULE)
--_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
--_IT_SUBST(INTLTOOL_CAVES_RULE)
--_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
--_IT_SUBST(INTLTOOL_THEME_RULE)
--_IT_SUBST(INTLTOOL_SERVICE_RULE)
--_IT_SUBST(INTLTOOL_POLICY_RULE)
--
--# Check the gettext tools to make sure they are GNU
--AC_PATH_PROG(XGETTEXT, xgettext)
--AC_PATH_PROG(MSGMERGE, msgmerge)
--AC_PATH_PROG(MSGFMT, msgfmt)
--AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
--if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
--fi
--xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
--mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
--mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
--if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
--fi
--
--AC_PATH_PROG(INTLTOOL_PERL, perl)
--if test -z "$INTLTOOL_PERL"; then
-- AC_MSG_ERROR([perl not found])
--fi
--AC_MSG_CHECKING([for perl >= 5.8.1])
--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
-- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
--else
-- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- AC_MSG_RESULT([$IT_PERL_VERSION])
--fi
--if test "x$2" != "xno-xml"; then
-- AC_MSG_CHECKING([for XML::Parser])
-- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- AC_MSG_RESULT([ok])
-- else
-- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-- fi
--fi
--
--# Substitute ALL_LINGUAS so we can use it in po/Makefile
--AC_SUBST(ALL_LINGUAS)
--
--# Set DATADIRNAME correctly if it is not set yet
--# (copied from glib-gettext.m4)
--if test -z "$DATADIRNAME"; then
-- AC_LINK_IFELSE(
-- [AC_LANG_PROGRAM([[]],
-- [[extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr]])],
-- [DATADIRNAME=share],
-- [case $host in
-- *-*-solaris*)
-- dnl On Solaris, if bind_textdomain_codeset is in libc,
-- dnl GNU format message catalog is always supported,
-- dnl since both are added to the libc all together.
-- dnl Hence, we'd like to go with DATADIRNAME=share
-- dnl in this case.
-- AC_CHECK_FUNC(bind_textdomain_codeset,
-- [DATADIRNAME=share], [DATADIRNAME=lib])
-- ;;
-- *)
-- [DATADIRNAME=lib]
-- ;;
-- esac])
--fi
--AC_SUBST(DATADIRNAME)
--
--IT_PO_SUBDIR([po])
--
--])
--
--
--# IT_PO_SUBDIR(DIRNAME)
--# ---------------------
--# All po subdirs have to be declared with this macro; the subdir "po" is
--# declared by IT_PROG_INTLTOOL.
--#
--AC_DEFUN([IT_PO_SUBDIR],
--[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
--dnl
+cp /usr/share/gnome-doc-utils/gnome-doc-utils.make .
+libtoolize --force --copy
+aclocal -I m4
+automake -acf -Wno-portability
+autoheader
+autoconf
+rm -rf autom4te.cache/ config.h.in~
+Index: b/INSTALL
+===================================================================
+--- a/INSTALL 2010-05-05 19:39:03.854096381 +0200
++++ b/INSTALL 2010-05-05 19:38:55.966090005 +0200
+@@ -4,8 +4,10 @@
+ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+ 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+
+- This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++ Copying and distribution of this file, with or without modification,
++are permitted in any medium without royalty provided the copyright
++notice and this notice are preserved. This file is offered as-is,
++without warranty of any kind.
+
+ Basic Installation
+ ==================
+@@ -13,7 +15,11 @@
+ Briefly, the shell commands `./configure; make; make install' should
+ configure, build, and install this package. The following
+ more-detailed instructions are generic; see the `README' file for
+-instructions specific to this package.
++instructions specific to this package. Some packages provide this
++`INSTALL' file but do not implement all of the features documented
++below. The lack of an optional feature in a given package is not
++necessarily a bug. More recommendations for GNU packages can be found
++in *note Makefile Conventions: (standards)Makefile Conventions.
+
+ The `configure' shell script attempts to guess correct values for
+ various system-dependent variables used during compilation. It uses
+@@ -42,7 +48,7 @@
+ you want to change it or regenerate `configure' using a newer version
+ of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+@@ -53,12 +59,22 @@
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+- the package.
++ the package, generally using the just-built uninstalled binaries.
+
+ 4. Type `make install' to install the programs and any data files and
+- documentation.
++ documentation. When installing into a prefix owned by root, it is
++ recommended that the package be configured and built as a regular
++ user, and only the `make install' phase executed with root
++ privileges.
++
++ 5. Optionally, type `make installcheck' to repeat any self-tests, but
++ this time using the binaries in their final installed location.
++ This target does not install anything. Running this target as a
++ regular user, particularly if the prior `make install' required
++ root privileges, verifies that the installation completed
++ correctly.
+
+- 5. You can remove the program binaries and object files from the
++ 6. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+@@ -67,8 +83,15 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+- 6. Often, you can also type `make uninstall' to remove the installed
+- files again.
++ 7. Often, you can also type `make uninstall' to remove the installed
++ files again. In practice, not all packages have tested that
++ uninstallation works correctly, even though it is required by the
++ GNU Coding Standards.
++
++ 8. Some packages, particularly those that use Automake, provide `make
++ distcheck', which can by used by developers to test that all other
++ targets like `make install' and `make uninstall' work correctly.
++ This target is generally not run by end users.
+
+ Compilers and Options
+ =====================
+@@ -93,7 +116,8 @@
+ own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+ With a non-GNU `make', it is safer to compile the package for one
+ architecture at a time in the source code directory. After you have
+@@ -120,7 +144,8 @@
+ By default, `make install' installs the package's commands under
+ `/usr/local/bin', include files under `/usr/local/include', etc. You
+ can specify an installation prefix other than `/usr/local' by giving
+-`configure' the option `--prefix=PREFIX'.
++`configure' the option `--prefix=PREFIX', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+@@ -131,15 +156,46 @@
+ In addition, if you use an unusual directory layout you can give
+ options like `--bindir=DIR' to specify different values for particular
+ kinds of files. Run `configure --help' for a list of the directories
+-you can set and what kinds of files go in them.
++you can set and what kinds of files go in them. In general, the
++default for these options is expressed in terms of `${prefix}', so that
++specifying just `--prefix' will affect all of the other directory
++specifications that were not explicitly provided.
++
++ The most portable way to affect installation locations is to pass the
++correct locations to `configure'; however, many packages provide one or
++both of the following shortcuts of passing variable assignments to the
++`make install' command line to change installation locations without
++having to reconfigure or recompile.
++
++ The first method involves providing an override variable for each
++affected directory. For example, `make install
++prefix=/alternate/directory' will choose an alternate location for all
++directory configuration variables that were expressed in terms of
++`${prefix}'. Any directories that were specified during `configure',
++but not in terms of `${prefix}', must each be overridden at install
++time for the entire installation to be relocated. The approach of
++makefile variable overrides for each directory variable is required by
++the GNU Coding Standards, and ideally causes no recompilation.
++However, some platforms have known limitations with the semantics of
++shared libraries that end up requiring recompilation when using this
++method, particularly noticeable in packages that use GNU Libtool.
++
++ The second method involves providing the `DESTDIR' variable. For
++example, `make install DESTDIR=/alternate/directory' will prepend
++`/alternate/directory' before all installation names. The approach of
++`DESTDIR' overrides is not required by the GNU Coding Standards, and
++does not work on platforms that have drive letters. On the other hand,
++it does better at avoiding recompilation issues, and works well even
++when some directory options were not specified in terms of `${prefix}'
++at `configure' time.
++
++Optional Features
++=================
+
+ If the package supports it, you can cause programs to be installed
+ with an extra prefix or suffix on their names by giving `configure' the
+ option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+-Optional Features
+-=================
+-
+ Some packages pay attention to `--enable-FEATURE' options to
+ `configure', where FEATURE indicates an optional part of the package.
+ They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+@@ -152,6 +208,13 @@
+ you can use the `configure' options `--x-includes=DIR' and
+ `--x-libraries=DIR' to specify their locations.
+
++ Some packages offer the ability to configure how verbose the
++execution of `make' will be. For these packages, running `./configure
++--enable-silent-rules' sets the default to minimal output, which can be
++overridden with `make V=1'; while running `./configure
++--disable-silent-rules' sets the default to verbose, which can be
++overridden with `make V=0'.
++
+ Particular systems
+ ==================
+
+@@ -288,7 +351,7 @@
+ `configure' can determine that directory automatically.
+
+ `--prefix=DIR'
+- Use DIR as the installation prefix. *Note Installation Names::
++ Use DIR as the installation prefix. *note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in 2010-05-05 19:39:03.494097447 +0200
++++ b/Makefile.in 2010-05-05 19:38:56.058088597 +0200
+@@ -41,7 +41,10 @@
+ AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
+ config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
++ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
++ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
++ $(top_srcdir)/configure.in
+ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+@@ -176,7 +179,6 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
+ GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
+-GST_IW_LIBS = @GST_IW_LIBS@
+ GST_LIBS = @GST_LIBS@
+ GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
+ GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
+Index: b/aclocal.m4
+===================================================================
+--- a/aclocal.m4 2010-05-05 19:39:03.582094694 +0200
++++ b/aclocal.m4 2010-05-05 19:38:50.098092854 +0200
+@@ -705,7 +705,7 @@
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
-dnl The following CONFIG_COMMANDS should be exetuted at the very end
--dnl of config.status.
--AC_CONFIG_COMMANDS_PRE([
-- AC_CONFIG_COMMANDS([$1/stamp-it], [
-- if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-- AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-- fi
-- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-- >"$1/stamp-it.tmp"
-- [sed '/^#/d
-- s/^[[].*] *//
-- /^[ ]*$/d
-- '"s|^| $ac_top_srcdir/|" \
-- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-- ]
-- [sed '/^POTFILES =/,/[^\\]$/ {
-- /^POTFILES =/!d
-- r $1/POTFILES
-- }
-- ' "$1/Makefile.in" >"$1/Makefile"]
-- rm -f "$1/Makefile.tmp"
-- mv "$1/stamp-it.tmp" "$1/stamp-it"
-- ])
--])dnl
--])
--
--# _IT_SUBST(VARIABLE)
--# -------------------
--# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
--#
--AC_DEFUN([_IT_SUBST],
--[
--AC_SUBST([$1])
--m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
--]
--)
--
--# deprecated macros
--AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
--# A hint is needed for aclocal from Automake <= 1.9.4:
--# AC_DEFUN([AC_PROG_INTLTOOL], ...)
--
--
++dnl The following CONFIG_COMMANDS should be executed at the very end
+ dnl of config.status.
+ AC_CONFIG_COMMANDS_PRE([
+ AC_CONFIG_COMMANDS([$1/stamp-it], [
+@@ -748,7972 +748,6 @@
+ # AC_DEFUN([AC_PROG_INTLTOOL], ...)
+
+
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
@@ -8225,20 +8192,268 @@
# nls.m4 serial 3 (gettext-0.15)
dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
-@@ -9936,3 +1719,10 @@
+@@ -9936,3 +1970,8 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
-+m4_include([m4/gnome-doc-utils.m4])
-+m4_include([m4/intltool.m4])
+m4_include([m4/libtool.m4])
+m4_include([m4/ltoptions.m4])
+m4_include([m4/ltsugar.m4])
+m4_include([m4/ltversion.m4])
+m4_include([m4/lt~obsolete.m4])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/config.h.in gnome-system-tools-2.30.1/config.h.in
---- gnome-system-tools-2.30.1.old/config.h.in 2010-04-26 22:11:13.000000000 +0200
-+++ gnome-system-tools-2.30.1/config.h.in 2010-05-05 17:13:02.694570439 +0200
+Index: b/config.guess
+===================================================================
+--- a/config.guess 2010-05-05 19:39:03.746090163 +0200
++++ b/config.guess 2010-05-05 19:38:51.974096332 +0200
+@@ -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, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-06-10'
++timestamp='2009-12-30'
+
+ # 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
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@
+ 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, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
+@@ -333,6 +334,9 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -807,12 +811,12 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -854,6 +858,20 @@
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -876,6 +894,17 @@
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -901,39 +930,18 @@
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep -q ld.so.1
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -942,8 +950,11 @@
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -966,58 +977,6 @@
+ 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
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1247,6 +1206,16 @@
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: b/config.h.in
+===================================================================
+--- a/config.h.in 2010-05-05 19:39:03.634092939 +0200
++++ b/config.h.in 2010-05-05 19:38:56.594094859 +0200
@@ -24,9 +24,6 @@
/* Define if your <locale.h> file defines LC_MESSAGES. */
#undef HAVE_LC_MESSAGES
@@ -8249,9 +8464,180 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/configure gnome-system-tools-2.30.1/configure
---- gnome-system-tools-2.30.1.old/configure 2010-04-26 22:10:55.000000000 +0200
-+++ gnome-system-tools-2.30.1/configure 2010-05-05 17:13:02.334540120 +0200
+Index: b/config.sub
+===================================================================
+--- a/config.sub 2010-05-05 19:39:03.802093382 +0200
++++ b/config.sub 2010-05-05 19:38:51.982107688 +0200
+@@ -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, 2007, 2008, 2009
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-06-11'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,13 +32,16 @@
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 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."
+@@ -149,7 +153,7 @@
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
+@@ -284,6 +288,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -291,13 +296,14 @@
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -340,7 +346,7 @@
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -368,15 +374,17 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -726,6 +734,9 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1076,6 +1087,11 @@
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
++ # This must be matched before tile*.
++ tilegx*)
++ basic_machine=tilegx-unknown
++ os=-linux-gnu
++ ;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+@@ -1247,6 +1263,9 @@
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1268,8 +1287,8 @@
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1290,7 +1309,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1423,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+Index: b/configure
+===================================================================
+--- a/configure 2010-05-05 19:39:06.630093298 +0200
++++ b/configure 2010-05-05 19:38:57.434087603 +0200
@@ -752,9 +752,6 @@
NAUTILUSDIR
NAUTILUS_LIBS
@@ -8450,23 +8836,23 @@
: ${CONFIG_STATUS=./config.status}
ac_write_fail=0
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/Makefile.in gnome-system-tools-2.30.1/doc/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/Makefile.in 2010-04-26 22:10:48.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/Makefile.in 2010-05-05 17:13:03.493538898 +0200
-@@ -36,7 +36,11 @@
+Index: b/doc/Makefile.in
+===================================================================
+--- a/doc/Makefile.in 2010-05-05 19:39:05.850096171 +0200
++++ b/doc/Makefile.in 2010-05-05 19:38:52.238087773 +0200
+@@ -36,7 +36,10 @@
subdir = doc
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -8474,23 +8860,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/network/Makefile.in gnome-system-tools-2.30.1/doc/network/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/network/Makefile.in 2010-04-26 22:10:49.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/network/Makefile.in 2010-05-05 17:13:03.569539755 +0200
-@@ -61,7 +61,11 @@
+Index: b/doc/network/Makefile.in
+===================================================================
+--- a/doc/network/Makefile.in 2010-05-05 19:39:06.142095105 +0200
++++ b/doc/network/Makefile.in 2010-05-05 19:38:52.366087874 +0200
+@@ -61,7 +61,10 @@
$(top_srcdir)/gnome-doc-utils.make ChangeLog
subdir = doc/network
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -122,7 +126,6 @@
+@@ -122,7 +125,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -8498,7 +8884,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -251,6 +254,7 @@
+@@ -251,6 +253,7 @@
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
@@ -8506,7 +8892,7 @@
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
-@@ -284,14 +288,16 @@
+@@ -284,14 +287,16 @@
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -8525,7 +8911,7 @@
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -307,12 +313,17 @@
+@@ -307,12 +312,17 @@
###############################################################################
@@ -8544,7 +8930,7 @@
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-@@ -324,7 +335,7 @@
+@@ -324,7 +334,7 @@
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
@@ -8553,7 +8939,7 @@
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -344,7 +355,8 @@
+@@ -344,7 +354,8 @@
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -8563,7 +8949,7 @@
DOC_MODULE = network-admin
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
-@@ -600,6 +612,10 @@
+@@ -600,6 +611,10 @@
DOC_MODULE ?=
@@ -8574,7 +8960,7 @@
DOC_ENTITIES ?=
DOC_INCLUDES ?=
-@@ -616,6 +632,7 @@
+@@ -616,6 +631,7 @@
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -8582,7 +8968,7 @@
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -645,6 +662,9 @@
+@@ -645,6 +661,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -8592,7 +8978,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -660,33 +680,41 @@
+@@ -660,33 +679,41 @@
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -8642,7 +9028,7 @@
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -698,25 +726,29 @@
+@@ -698,25 +725,29 @@
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
@@ -8673,7 +9059,7 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -739,10 +771,12 @@
+@@ -739,10 +770,12 @@
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
@@ -8690,7 +9076,7 @@
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-@@ -788,9 +822,12 @@
+@@ -788,9 +821,12 @@
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
@@ -8703,7 +9089,7 @@
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -806,15 +843,33 @@
+@@ -806,15 +842,33 @@
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
@@ -8738,7 +9124,7 @@
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -822,19 +877,19 @@
+@@ -822,19 +876,19 @@
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -8763,7 +9149,7 @@
done
install-doc-figs:
-@@ -849,7 +904,7 @@
+@@ -849,7 +903,7 @@
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -8772,7 +9158,7 @@
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
-@@ -869,22 +924,24 @@
+@@ -869,22 +923,24 @@
echo install-html
install-doc-omf:
@@ -8803,7 +9189,7 @@
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -892,24 +949,24 @@
+@@ -892,24 +948,24 @@
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -8836,23 +9222,23 @@
done
dist-hook: doc-dist-hook
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/services/Makefile.in gnome-system-tools-2.30.1/doc/services/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/services/Makefile.in 2010-04-26 22:10:49.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/services/Makefile.in 2010-05-05 17:13:03.645539839 +0200
-@@ -61,7 +61,11 @@
+Index: b/doc/services/Makefile.in
+===================================================================
+--- a/doc/services/Makefile.in 2010-05-05 19:39:06.242092752 +0200
++++ b/doc/services/Makefile.in 2010-05-05 19:38:52.498089333 +0200
+@@ -61,7 +61,10 @@
$(top_srcdir)/gnome-doc-utils.make ChangeLog
subdir = doc/services
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -76,47 +80,7 @@
+@@ -76,47 +79,7 @@
am__v_at_0 = @
SOURCES =
DIST_SOURCES =
@@ -8900,7 +9286,7 @@
ACLOCAL = @ACLOCAL@
ALL_LINGUAS = @ALL_LINGUAS@
AMTAR = @AMTAR@
-@@ -162,7 +126,6 @@
+@@ -162,7 +125,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -8908,7 +9294,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -291,6 +254,7 @@
+@@ -291,6 +253,7 @@
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
@@ -8916,7 +9302,7 @@
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
-@@ -324,14 +288,16 @@
+@@ -324,14 +287,16 @@
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -8935,7 +9321,7 @@
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -347,12 +313,17 @@
+@@ -347,12 +312,17 @@
###############################################################################
@@ -8954,7 +9340,7 @@
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-@@ -364,7 +335,7 @@
+@@ -364,7 +334,7 @@
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
@@ -8963,7 +9349,7 @@
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -384,7 +355,8 @@
+@@ -384,7 +354,8 @@
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -8973,7 +9359,7 @@
DOC_MODULE = services-admin
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
-@@ -392,10 +364,7 @@
+@@ -392,10 +363,7 @@
figures/services-tool.png
DOC_LINGUAS = ca cs de el en_GB es fr oc pl pt_BR sv it zh_CN
@@ -8985,7 +9371,7 @@
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps)
-@@ -434,141 +403,12 @@
+@@ -434,141 +402,12 @@
clean-libtool:
-rm -rf .libs _libs
@@ -9129,7 +9515,7 @@
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -600,51 +440,22 @@
+@@ -600,51 +439,22 @@
|| exit 1; \
fi; \
done
@@ -9188,7 +9574,7 @@
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-@@ -661,93 +472,88 @@
+@@ -661,93 +471,88 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
@@ -9308,7 +9694,7 @@
DOC_H_FILE ?=
-@@ -808,6 +614,10 @@
+@@ -808,6 +613,10 @@
DOC_MODULE ?=
@@ -9319,7 +9705,7 @@
DOC_ENTITIES ?=
DOC_INCLUDES ?=
-@@ -824,6 +634,7 @@
+@@ -824,6 +633,7 @@
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -9327,7 +9713,7 @@
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -853,6 +664,9 @@
+@@ -853,6 +663,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -9337,7 +9723,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -868,33 +682,41 @@
+@@ -868,33 +681,41 @@
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -9387,7 +9773,7 @@
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -906,25 +728,29 @@
+@@ -906,25 +727,29 @@
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
@@ -9418,7 +9804,7 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -947,10 +773,12 @@
+@@ -947,10 +772,12 @@
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
@@ -9435,7 +9821,7 @@
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-@@ -996,9 +824,12 @@
+@@ -996,9 +823,12 @@
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
@@ -9448,7 +9834,7 @@
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -1014,15 +845,33 @@
+@@ -1014,15 +844,33 @@
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
@@ -9483,7 +9869,7 @@
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -1030,19 +879,19 @@
+@@ -1030,19 +878,19 @@
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -9508,7 +9894,7 @@
done
install-doc-figs:
-@@ -1057,7 +906,7 @@
+@@ -1057,7 +905,7 @@
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -9517,7 +9903,7 @@
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
-@@ -1077,22 +926,24 @@
+@@ -1077,22 +925,24 @@
echo install-html
install-doc-omf:
@@ -9548,7 +9934,7 @@
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -1100,24 +951,24 @@
+@@ -1100,24 +950,24 @@
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -9581,23 +9967,23 @@
done
dist-hook: doc-dist-hook
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/services/nl/Makefile.in gnome-system-tools-2.30.1/doc/services/nl/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/services/nl/Makefile.in 2010-04-26 22:10:49.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/services/nl/Makefile.in 2010-05-05 17:13:03.701540110 +0200
-@@ -99,7 +99,11 @@
+Index: b/doc/services/nl/Makefile.in
+===================================================================
+--- a/doc/services/nl/Makefile.in 2010-05-05 19:39:06.334095528 +0200
++++ b/doc/services/nl/Makefile.in 2010-05-05 19:38:52.594088713 +0200
+@@ -99,7 +99,10 @@
$(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
subdir = doc/services/nl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,7 +164,6 @@
+@@ -160,7 +163,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -9605,23 +9991,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/shares/Makefile.in gnome-system-tools-2.30.1/doc/shares/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/shares/Makefile.in 2010-04-26 22:10:49.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/shares/Makefile.in 2010-05-05 17:13:03.777540066 +0200
-@@ -61,7 +61,11 @@
+Index: b/doc/shares/Makefile.in
+===================================================================
+--- a/doc/shares/Makefile.in 2010-05-05 19:39:06.030091734 +0200
++++ b/doc/shares/Makefile.in 2010-05-05 19:38:52.726090436 +0200
+@@ -61,7 +61,10 @@
$(top_srcdir)/gnome-doc-utils.make ChangeLog
subdir = doc/shares
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -122,7 +126,6 @@
+@@ -122,7 +125,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -9629,7 +10015,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -251,6 +254,7 @@
+@@ -251,6 +253,7 @@
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
@@ -9637,7 +10023,7 @@
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
-@@ -284,14 +288,16 @@
+@@ -284,14 +287,16 @@
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -9656,7 +10042,7 @@
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -307,12 +313,17 @@
+@@ -307,12 +312,17 @@
###############################################################################
@@ -9675,7 +10061,7 @@
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-@@ -324,7 +335,7 @@
+@@ -324,7 +334,7 @@
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
@@ -9684,7 +10070,7 @@
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -344,7 +355,8 @@
+@@ -344,7 +354,8 @@
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -9694,7 +10080,7 @@
DOC_MODULE = shares-admin
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
-@@ -600,6 +612,10 @@
+@@ -600,6 +611,10 @@
DOC_MODULE ?=
@@ -9705,7 +10091,7 @@
DOC_ENTITIES ?=
DOC_INCLUDES ?=
-@@ -616,6 +632,7 @@
+@@ -616,6 +631,7 @@
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -9713,7 +10099,7 @@
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -645,6 +662,9 @@
+@@ -645,6 +661,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -9723,7 +10109,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -660,33 +680,41 @@
+@@ -660,33 +679,41 @@
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -9773,7 +10159,7 @@
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -698,25 +726,29 @@
+@@ -698,25 +725,29 @@
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
@@ -9804,7 +10190,7 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -739,10 +771,12 @@
+@@ -739,10 +770,12 @@
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
@@ -9821,7 +10207,7 @@
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-@@ -788,9 +822,12 @@
+@@ -788,9 +821,12 @@
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
@@ -9834,7 +10220,7 @@
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -806,15 +843,33 @@
+@@ -806,15 +842,33 @@
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
@@ -9869,7 +10255,7 @@
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -822,19 +877,19 @@
+@@ -822,19 +876,19 @@
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -9894,7 +10280,7 @@
done
install-doc-figs:
-@@ -849,7 +904,7 @@
+@@ -849,7 +903,7 @@
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -9903,7 +10289,7 @@
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
-@@ -869,22 +924,24 @@
+@@ -869,22 +923,24 @@
echo install-html
install-doc-omf:
@@ -9934,7 +10320,7 @@
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -892,24 +949,24 @@
+@@ -892,24 +948,24 @@
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -9967,23 +10353,71 @@
done
dist-hook: doc-dist-hook
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/time/Makefile.in gnome-system-tools-2.30.1/doc/time/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/time/Makefile.in 2010-04-26 22:10:49.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/time/Makefile.in 2010-05-05 17:13:03.853540090 +0200
-@@ -61,7 +61,11 @@
+Index: b/doc/time/Makefile.in
+===================================================================
+--- a/doc/time/Makefile.in 2010-05-05 19:39:06.418092827 +0200
++++ b/doc/time/Makefile.in 2010-05-05 19:38:52.854088579 +0200
+@@ -61,7 +61,10 @@
$(top_srcdir)/gnome-doc-utils.make ChangeLog
subdir = doc/time
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -162,7 +166,6 @@
+@@ -76,47 +79,7 @@
+ am__v_at_0 = @
+ SOURCES =
+ DIST_SOURCES =
+-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+- html-recursive info-recursive install-data-recursive \
+- install-dvi-recursive install-exec-recursive \
+- install-html-recursive install-info-recursive \
+- install-pdf-recursive install-ps-recursive install-recursive \
+- installcheck-recursive installdirs-recursive pdf-recursive \
+- ps-recursive uninstall-recursive
+-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+- distclean-recursive maintainer-clean-recursive
+-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+- distdir
+-ETAGS = etags
+-CTAGS = ctags
+-DIST_SUBDIRS = $(SUBDIRS)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+-am__relativize = \
+- dir0=`pwd`; \
+- sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+- sed_rest='s,^[^/]*/*,,'; \
+- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+- sed_butlast='s,/*[^/]*$$,,'; \
+- while test -n "$$dir1"; do \
+- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+- if test "$$first" != "."; then \
+- if test "$$first" = ".."; then \
+- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+- else \
+- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+- if test "$$first2" = "$$first"; then \
+- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+- else \
+- dir2="../$$dir2"; \
+- fi; \
+- dir0="$$dir0"/"$$first"; \
+- fi; \
+- fi; \
+- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+- done; \
+- reldir="$$dir2"
+ ACLOCAL = @ACLOCAL@
+ ALL_LINGUAS = @ALL_LINGUAS@
+ AMTAR = @AMTAR@
+@@ -162,7 +125,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -9991,7 +10425,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -291,6 +294,7 @@
+@@ -291,6 +253,7 @@
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
@@ -9999,7 +10433,7 @@
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
-@@ -324,14 +328,16 @@
+@@ -324,14 +287,16 @@
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -10018,7 +10452,7 @@
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -347,12 +353,17 @@
+@@ -347,12 +312,17 @@
###############################################################################
@@ -10037,7 +10471,7 @@
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-@@ -364,7 +375,7 @@
+@@ -364,7 +334,7 @@
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
@@ -10046,7 +10480,7 @@
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -384,7 +395,8 @@
+@@ -384,7 +354,8 @@
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -10056,7 +10490,342 @@
DOC_MODULE = time-admin
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
-@@ -811,6 +823,10 @@
+@@ -395,10 +366,7 @@
+ figures/time-tool-manual.png
+
+ DOC_LINGUAS = ca cs de el en_GB es fr it oc pt_BR ru sv zh_CN
+-
+-# This isn't still ported to gnome-doc-utils
+-SUBDIRS = nl
+-all: all-recursive
++all: all-am
+
+ .SUFFIXES:
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gnome-doc-utils.make $(am__configure_deps)
+@@ -437,141 +405,12 @@
+
+ clean-libtool:
+ -rm -rf .libs _libs
+-
+-# This directory's subdirectories are mostly independent; you can cd
+-# into them and run `make' without going through this Makefile.
+-# To change the values of `make' variables: instead of editing Makefiles,
+-# (1) if the variable is set in `config.status', edit `config.status'
+-# (which will cause the Makefiles to be regenerated when you run `make');
+-# (2) otherwise, pass the desired values on the `make' command line.
+-$(RECURSIVE_TARGETS):
+- @fail= failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
+- dot_seen=no; \
+- target=`echo $@ | sed s/-recursive//`; \
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- echo "Making $$target in $$subdir"; \
+- if test "$$subdir" = "."; then \
+- dot_seen=yes; \
+- local_target="$$target-am"; \
+- else \
+- local_target="$$target"; \
+- fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
+- done; \
+- if test "$$dot_seen" = "no"; then \
+- $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+- fi; test -z "$$fail"
+-
+-$(RECURSIVE_CLEAN_TARGETS):
+- @fail= failcom='exit 1'; \
+- for f in x $$MAKEFLAGS; do \
+- case $$f in \
+- *=* | --[!k]*);; \
+- *k*) failcom='fail=yes';; \
+- esac; \
+- done; \
+- dot_seen=no; \
+- case "$@" in \
+- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+- *) list='$(SUBDIRS)' ;; \
+- esac; \
+- rev=''; for subdir in $$list; do \
+- if test "$$subdir" = "."; then :; else \
+- rev="$$subdir $$rev"; \
+- fi; \
+- done; \
+- rev="$$rev ."; \
+- target=`echo $@ | sed s/-recursive//`; \
+- for subdir in $$rev; do \
+- echo "Making $$target in $$subdir"; \
+- if test "$$subdir" = "."; then \
+- local_target="$$target-am"; \
+- else \
+- local_target="$$target"; \
+- fi; \
+- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+- || eval $$failcom; \
+- done && test -z "$$fail"
+-tags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+- done
+-ctags-recursive:
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+- done
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
+- mkid -fID $$unique
+ tags: TAGS
++TAGS:
+
+-TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- set x; \
+- here=`pwd`; \
+- if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+- include_option=--etags-include; \
+- empty_fix=.; \
+- else \
+- include_option=--include; \
+- empty_fix=; \
+- fi; \
+- list='$(SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- test ! -f $$subdir/TAGS || \
+- set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
+- fi; \
+- done; \
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
+- shift; \
+- if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+- test -n "$$unique" || unique=$$empty_fix; \
+- if test $$# -gt 0; then \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- "$$@" $$unique; \
+- else \
+- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+- $$unique; \
+- fi; \
+- fi
+ ctags: CTAGS
+-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+- $(TAGS_FILES) $(LISP)
+- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+- unique=`for i in $$list; do \
+- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+- done | \
+- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+- END { if (nonempty) { for (i in files) print i; }; }'`; \
+- test -z "$(CTAGS_ARGS)$$unique" \
+- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+- $$unique
+-
+-GTAGS:
+- here=`$(am__cd) $(top_builddir) && pwd` \
+- && $(am__cd) $(top_srcdir) \
+- && gtags -i $(GTAGS_ARGS) "$$here"
++CTAGS:
+
+-distclean-tags:
+- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+ distdir: $(DISTFILES)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+@@ -603,51 +442,22 @@
+ || exit 1; \
+ fi; \
+ done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- test -d "$(distdir)/$$subdir" \
+- || $(MKDIR_P) "$(distdir)/$$subdir" \
+- || exit 1; \
+- fi; \
+- done
+- @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+- if test "$$subdir" = .; then :; else \
+- dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+- $(am__relativize); \
+- new_distdir=$$reldir; \
+- dir1=$$subdir; dir2="$(top_distdir)"; \
+- $(am__relativize); \
+- new_top_distdir=$$reldir; \
+- echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+- echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+- ($(am__cd) $$subdir && \
+- $(MAKE) $(AM_MAKEFLAGS) \
+- top_distdir="$$new_top_distdir" \
+- distdir="$$new_distdir" \
+- am__remove_distdir=: \
+- am__skip_length_check=: \
+- am__skip_mode_fix=: \
+- distdir) \
+- || exit 1; \
+- fi; \
+- done
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$(top_distdir)" distdir="$(distdir)" \
+ dist-hook
+ check-am: all-am
+-check: check-recursive
++check: check-am
+ all-am: Makefile
+-installdirs: installdirs-recursive
+-installdirs-am:
+-install: install-recursive
+-install-exec: install-exec-recursive
+-install-data: install-data-recursive
+-uninstall: uninstall-recursive
++installdirs:
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
+
+ install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+-installcheck: installcheck-recursive
++installcheck: installcheck-am
+ install-strip:
+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+@@ -664,93 +474,88 @@
+ maintainer-clean-generic:
+ @echo "This command is intended for maintainers to use"
+ @echo "it deletes files that may require special tools to rebuild."
+-clean: clean-recursive
++clean: clean-am
+
+ clean-am: clean-generic clean-libtool clean-local mostlyclean-am
+
+-distclean: distclean-recursive
++distclean: distclean-am
+ -rm -f Makefile
+-distclean-am: clean-am distclean-generic distclean-local \
+- distclean-tags
++distclean-am: clean-am distclean-generic distclean-local
+
+-dvi: dvi-recursive
++dvi: dvi-am
+
+ dvi-am:
+
+-html: html-recursive
++html: html-am
+
+ html-am:
+
+-info: info-recursive
++info: info-am
+
+ info-am:
+
+ install-data-am: install-data-local
+
+-install-dvi: install-dvi-recursive
++install-dvi: install-dvi-am
+
+ install-dvi-am:
+
+ install-exec-am:
+
+-install-html: install-html-recursive
++install-html: install-html-am
+
+ install-html-am:
+
+-install-info: install-info-recursive
++install-info: install-info-am
+
+ install-info-am:
+
+ install-man:
+
+-install-pdf: install-pdf-recursive
++install-pdf: install-pdf-am
+
+ install-pdf-am:
+
+-install-ps: install-ps-recursive
++install-ps: install-ps-am
+
+ install-ps-am:
+
+ installcheck-am:
+
+-maintainer-clean: maintainer-clean-recursive
++maintainer-clean: maintainer-clean-am
+ -rm -f Makefile
+ maintainer-clean-am: distclean-am maintainer-clean-generic \
+ maintainer-clean-local
+
+-mostlyclean: mostlyclean-recursive
++mostlyclean: mostlyclean-am
+
+ mostlyclean-am: mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-local
+
+-pdf: pdf-recursive
++pdf: pdf-am
+
+ pdf-am:
+
+-ps: ps-recursive
++ps: ps-am
+
+ ps-am:
+
+ uninstall-am: uninstall-local
+
+-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+- install-am install-strip tags-recursive
++.MAKE: install-am install-strip
+
+-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+- all all-am check check-am clean clean-generic clean-libtool \
+- clean-local ctags ctags-recursive dist-hook distclean \
+- distclean-generic distclean-libtool distclean-local \
+- distclean-tags distdir dvi dvi-am html html-am info info-am \
+- install install-am install-data install-data-am \
+- install-data-local install-dvi install-dvi-am install-exec \
+- install-exec-am install-html install-html-am install-info \
+- install-info-am install-man install-pdf install-pdf-am \
+- install-ps install-ps-am install-strip installcheck \
+- installcheck-am installdirs installdirs-am maintainer-clean \
++.PHONY: all all-am check check-am clean clean-generic clean-libtool \
++ clean-local dist-hook distclean distclean-generic \
++ distclean-libtool distclean-local distdir dvi dvi-am html \
++ html-am info info-am install install-am install-data \
++ install-data-am install-data-local install-dvi install-dvi-am \
++ install-exec install-exec-am install-html install-html-am \
++ install-info install-info-am install-man install-pdf \
++ install-pdf-am install-ps install-ps-am install-strip \
++ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic maintainer-clean-local mostlyclean \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-local pdf \
+- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
+- uninstall-local
++ pdf-am ps ps-am uninstall uninstall-am uninstall-local
+
+
+ DOC_H_FILE ?=
+@@ -811,6 +616,10 @@
DOC_MODULE ?=
@@ -10067,7 +10836,7 @@
DOC_ENTITIES ?=
DOC_INCLUDES ?=
-@@ -827,6 +843,7 @@
+@@ -827,6 +636,7 @@
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -10075,7 +10844,7 @@
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -856,6 +873,9 @@
+@@ -856,6 +666,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -10085,7 +10854,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -871,33 +891,41 @@
+@@ -871,33 +684,41 @@
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -10103,15 +10872,15 @@
(cd $(dir $@) && \
- $(_xml2po) -e -u $(notdir $@) $$docs); \
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
++ fi
++
+$(_DOC_MOFILES): %.mo: %.po
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+ mkdir "$(dir $@)"; \
-+ fi
+ fi
+ msgfmt -o $@ $<
-+
+
# FIXME: fix the dependancy
# FIXME: hook xml2po up
-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
@@ -10135,7 +10904,7 @@
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -909,25 +937,29 @@
+@@ -909,25 +730,29 @@
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
@@ -10166,7 +10935,7 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -950,10 +982,12 @@
+@@ -950,10 +775,12 @@
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
@@ -10183,7 +10952,7 @@
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-@@ -999,9 +1033,12 @@
+@@ -999,9 +826,12 @@
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
@@ -10196,7 +10965,7 @@
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -1017,15 +1054,33 @@
+@@ -1017,15 +847,33 @@
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
@@ -10231,7 +11000,7 @@
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -1033,19 +1088,19 @@
+@@ -1033,19 +881,19 @@
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -10256,7 +11025,7 @@
done
install-doc-figs:
-@@ -1060,7 +1115,7 @@
+@@ -1060,7 +908,7 @@
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -10265,7 +11034,7 @@
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
-@@ -1080,22 +1135,24 @@
+@@ -1080,22 +928,24 @@
echo install-html
install-doc-omf:
@@ -10296,7 +11065,7 @@
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -1103,24 +1160,24 @@
+@@ -1103,24 +953,24 @@
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -10329,23 +11098,23 @@
done
dist-hook: doc-dist-hook
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/time/nl/Makefile.in gnome-system-tools-2.30.1/doc/time/nl/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/time/nl/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/time/nl/Makefile.in 2010-05-05 17:13:03.909539672 +0200
-@@ -99,7 +99,11 @@
+Index: b/doc/time/nl/Makefile.in
+===================================================================
+--- a/doc/time/nl/Makefile.in 2010-05-05 19:39:06.530093690 +0200
++++ b/doc/time/nl/Makefile.in 2010-05-05 19:38:52.950087686 +0200
+@@ -99,7 +99,10 @@
$(top_srcdir)/omf.make $(top_srcdir)/xmldocs.make
subdir = doc/time/nl
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,7 +164,6 @@
+@@ -160,7 +163,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -10353,23 +11122,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/doc/users/Makefile.in gnome-system-tools-2.30.1/doc/users/Makefile.in
---- gnome-system-tools-2.30.1.old/doc/users/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/doc/users/Makefile.in 2010-05-05 17:13:03.985539976 +0200
-@@ -61,7 +61,11 @@
+Index: b/doc/users/Makefile.in
+===================================================================
+--- a/doc/users/Makefile.in 2010-05-05 19:39:05.902094140 +0200
++++ b/doc/users/Makefile.in 2010-05-05 19:38:53.086088532 +0200
+@@ -61,7 +61,10 @@
$(top_srcdir)/gnome-doc-utils.make ChangeLog
subdir = doc/users
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -122,7 +126,6 @@
+@@ -122,7 +125,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -10377,7 +11146,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -251,6 +254,7 @@
+@@ -251,6 +253,7 @@
$(DOC_LINGUAS))
_DOC_ABS_SRCDIR = @abs_srcdir@
@@ -10385,7 +11154,7 @@
@ENABLE_SK_TRUE at _ENABLE_SK = true
################################################################################
-@@ -284,14 +288,16 @@
+@@ -284,14 +287,16 @@
################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
@@ -10404,7 +11173,7 @@
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -307,12 +313,17 @@
+@@ -307,12 +312,17 @@
###############################################################################
@@ -10423,7 +11192,7 @@
_DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-@@ -324,7 +335,7 @@
+@@ -324,7 +334,7 @@
$(lc)/$(notdir $(doc)) ))
_DOC_LC_DOCS = \
@@ -10432,7 +11201,7 @@
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -344,7 +355,8 @@
+@@ -344,7 +354,8 @@
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -10442,7 +11211,7 @@
DOC_MODULE = users-admin
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
-@@ -602,6 +614,10 @@
+@@ -602,6 +613,10 @@
DOC_MODULE ?=
@@ -10453,7 +11222,7 @@
DOC_ENTITIES ?=
DOC_INCLUDES ?=
-@@ -618,6 +634,7 @@
+@@ -618,6 +633,7 @@
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
@@ -10461,7 +11230,7 @@
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -647,6 +664,9 @@
+@@ -647,6 +663,9 @@
.PHONY: po
po: $(_DOC_POFILES)
@@ -10471,7 +11240,7 @@
$(_DOC_POFILES):
@if ! test -d $(dir $@); then \
echo "mkdir $(dir $@)"; \
-@@ -662,33 +682,41 @@
+@@ -662,33 +681,41 @@
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -10521,7 +11290,7 @@
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -700,25 +728,29 @@
+@@ -700,25 +727,29 @@
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
@@ -10552,7 +11321,7 @@
@for lc in C $(_DOC_REAL_LINGUAS); do \
for dir in `find $$lc -depth -type d`; do \
if ! test $$dir -ef $(srcdir)/$$dir; then \
-@@ -741,10 +773,12 @@
+@@ -741,10 +772,12 @@
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
@@ -10569,7 +11338,7 @@
$(if $(_DOC_OMF_IN),dist-doc-omf)
# $(if $(_DOC_DSK_IN),dist-doc-dsk)
-@@ -790,9 +824,12 @@
+@@ -790,9 +823,12 @@
echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
$(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
@@ -10582,7 +11351,7 @@
$(if $(_DOC_OMF_IN),check-doc-omf)
check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -808,15 +845,33 @@
+@@ -808,15 +844,33 @@
xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
done
@@ -10617,7 +11386,7 @@
$(if $(_DOC_HTML_ALL),install-doc-html) \
$(if $(_DOC_C_FIGURES),install-doc-figs) \
$(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -824,19 +879,19 @@
+@@ -824,19 +878,19 @@
install-doc-docs:
@for lc in C $(_DOC_REAL_LINGUAS); do \
@@ -10642,7 +11411,7 @@
done
install-doc-figs:
-@@ -851,7 +906,7 @@
+@@ -851,7 +905,7 @@
figsymlink=true; \
fi; \
figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
@@ -10651,7 +11420,7 @@
if ! test -d "$$figdir"; then \
echo "$(mkinstalldirs) $$figdir"; \
$(mkinstalldirs) "$$figdir"; \
-@@ -871,22 +926,24 @@
+@@ -871,22 +925,24 @@
echo install-html
install-doc-omf:
@@ -10682,7 +11451,7 @@
$(if $(_DOC_HTML_ALL),uninstall-doc-html) \
$(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
$(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -894,24 +951,24 @@
+@@ -894,24 +950,24 @@
uninstall-doc-docs:
@list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
@@ -10715,9 +11484,10 @@
done
dist-hook: doc-dist-hook
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/gnome-doc-utils.make gnome-system-tools-2.30.1/gnome-doc-utils.make
---- gnome-system-tools-2.30.1.old/gnome-doc-utils.make 2010-04-24 10:21:59.000000000 +0200
-+++ gnome-system-tools-2.30.1/gnome-doc-utils.make 2010-05-05 17:12:57.710567796 +0200
+Index: b/gnome-doc-utils.make
+===================================================================
+--- a/gnome-doc-utils.make 2010-05-05 19:39:03.906091278 +0200
++++ b/gnome-doc-utils.make 2010-05-05 19:38:41.914822258 +0200
@@ -92,6 +92,14 @@
## The name of the document being built
DOC_MODULE ?=
@@ -11088,23 +11858,23 @@
+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
done
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/16x16/apps/Makefile.in gnome-system-tools-2.30.1/icons/16x16/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/16x16/apps/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/16x16/apps/Makefile.in 2010-05-05 17:13:04.145539210 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/16x16/apps
+Index: b/icons/16x16/Makefile.in
+===================================================================
+--- a/icons/16x16/Makefile.in 2010-05-05 19:39:05.406094089 +0200
++++ b/icons/16x16/Makefile.in 2010-05-05 19:38:53.182096846 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/16x16
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11112,23 +11882,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/16x16/Makefile.in gnome-system-tools-2.30.1/icons/16x16/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/16x16/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/16x16/Makefile.in 2010-05-05 17:13:04.037541486 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/16x16
+Index: b/icons/16x16/apps/Makefile.in
+===================================================================
+--- a/icons/16x16/apps/Makefile.in 2010-05-05 19:39:05.462100668 +0200
++++ b/icons/16x16/apps/Makefile.in 2010-05-05 19:38:53.342088446 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/16x16/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11136,23 +11906,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/22x22/apps/Makefile.in gnome-system-tools-2.30.1/icons/22x22/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/22x22/apps/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/22x22/apps/Makefile.in 2010-05-05 17:13:04.253539808 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/22x22/apps
+Index: b/icons/22x22/Makefile.in
+===================================================================
+--- a/icons/22x22/Makefile.in 2010-05-05 19:39:04.906094924 +0200
++++ b/icons/22x22/Makefile.in 2010-05-05 19:38:53.430087372 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/22x22
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11160,23 +11930,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/22x22/Makefile.in gnome-system-tools-2.30.1/icons/22x22/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/22x22/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/22x22/Makefile.in 2010-05-05 17:13:04.197539811 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/22x22
+Index: b/icons/22x22/apps/Makefile.in
+===================================================================
+--- a/icons/22x22/apps/Makefile.in 2010-05-05 19:39:04.958090098 +0200
++++ b/icons/22x22/apps/Makefile.in 2010-05-05 19:38:53.526087314 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/22x22/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11184,23 +11954,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/24x24/apps/Makefile.in gnome-system-tools-2.30.1/icons/24x24/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/24x24/apps/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/24x24/apps/Makefile.in 2010-05-05 17:13:04.357539202 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/24x24/apps
+Index: b/icons/24x24/Makefile.in
+===================================================================
+--- a/icons/24x24/Makefile.in 2010-05-05 19:39:05.514093326 +0200
++++ b/icons/24x24/Makefile.in 2010-05-05 19:38:53.618088417 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/24x24
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11208,23 +11978,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/24x24/Makefile.in gnome-system-tools-2.30.1/icons/24x24/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/24x24/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/24x24/Makefile.in 2010-05-05 17:13:04.305540273 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/24x24
+Index: b/icons/24x24/apps/Makefile.in
+===================================================================
+--- a/icons/24x24/apps/Makefile.in 2010-05-05 19:39:05.570094035 +0200
++++ b/icons/24x24/apps/Makefile.in 2010-05-05 19:38:53.710087840 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/24x24/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11232,23 +12002,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/32x32/apps/Makefile.in gnome-system-tools-2.30.1/icons/32x32/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/32x32/apps/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/32x32/apps/Makefile.in 2010-05-05 17:13:04.473539917 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/32x32/apps
+Index: b/icons/32x32/Makefile.in
+===================================================================
+--- a/icons/32x32/Makefile.in 2010-05-05 19:39:05.022096018 +0200
++++ b/icons/32x32/Makefile.in 2010-05-05 19:38:53.810094982 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/32x32
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11256,23 +12026,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/32x32/Makefile.in gnome-system-tools-2.30.1/icons/32x32/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/32x32/Makefile.in 2010-04-26 22:10:50.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/32x32/Makefile.in 2010-05-05 17:13:04.417540060 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/32x32
+Index: b/icons/32x32/apps/Makefile.in
+===================================================================
+--- a/icons/32x32/apps/Makefile.in 2010-05-05 19:39:05.082089415 +0200
++++ b/icons/32x32/apps/Makefile.in 2010-05-05 19:38:53.906087666 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/32x32/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11280,23 +12050,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/48x48/apps/Makefile.in gnome-system-tools-2.30.1/icons/48x48/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/48x48/apps/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/48x48/apps/Makefile.in 2010-05-05 17:13:04.577539933 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/48x48/apps
+Index: b/icons/48x48/Makefile.in
+===================================================================
+--- a/icons/48x48/Makefile.in 2010-05-05 19:39:05.138094313 +0200
++++ b/icons/48x48/Makefile.in 2010-05-05 19:38:53.998089333 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/48x48
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11304,23 +12074,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/48x48/devices/Makefile.in gnome-system-tools-2.30.1/icons/48x48/devices/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/48x48/devices/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/48x48/devices/Makefile.in 2010-05-05 17:13:04.629539273 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/48x48/devices
+Index: b/icons/48x48/apps/Makefile.in
+===================================================================
+--- a/icons/48x48/apps/Makefile.in 2010-05-05 19:39:05.190096465 +0200
++++ b/icons/48x48/apps/Makefile.in 2010-05-05 19:38:54.098087546 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/48x48/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11328,23 +12098,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/48x48/Makefile.in gnome-system-tools-2.30.1/icons/48x48/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/48x48/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/48x48/Makefile.in 2010-05-05 17:13:04.525540101 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/48x48
+Index: b/icons/48x48/devices/Makefile.in
+===================================================================
+--- a/icons/48x48/devices/Makefile.in 2010-05-05 19:39:05.246093816 +0200
++++ b/icons/48x48/devices/Makefile.in 2010-05-05 19:38:54.214096730 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/48x48/devices
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11352,23 +12122,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/Makefile.in gnome-system-tools-2.30.1/icons/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/Makefile.in 2010-05-05 17:13:04.685539892 +0200
-@@ -36,7 +36,11 @@
+Index: b/icons/Makefile.in
+===================================================================
+--- a/icons/Makefile.in 2010-05-05 19:39:04.854094440 +0200
++++ b/icons/Makefile.in 2010-05-05 19:38:54.306090562 +0200
+@@ -36,7 +36,10 @@
subdir = icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11376,23 +12146,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/scalable/apps/Makefile.in gnome-system-tools-2.30.1/icons/scalable/apps/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/scalable/apps/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/scalable/apps/Makefile.in 2010-05-05 17:13:04.789539287 +0200
-@@ -37,7 +37,11 @@
- subdir = icons/scalable/apps
+Index: b/icons/scalable/Makefile.in
+===================================================================
+--- a/icons/scalable/Makefile.in 2010-05-05 19:39:05.302094520 +0200
++++ b/icons/scalable/Makefile.in 2010-05-05 19:38:54.402087156 +0200
+@@ -36,7 +36,10 @@
+ subdir = icons/scalable
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11400,23 +12170,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/icons/scalable/Makefile.in gnome-system-tools-2.30.1/icons/scalable/Makefile.in
---- gnome-system-tools-2.30.1.old/icons/scalable/Makefile.in 2010-04-26 22:10:51.000000000 +0200
-+++ gnome-system-tools-2.30.1/icons/scalable/Makefile.in 2010-05-05 17:13:04.737540497 +0200
-@@ -36,7 +36,11 @@
- subdir = icons/scalable
+Index: b/icons/scalable/apps/Makefile.in
+===================================================================
+--- a/icons/scalable/apps/Makefile.in 2010-05-05 19:39:05.354094444 +0200
++++ b/icons/scalable/apps/Makefile.in 2010-05-05 19:38:54.494087985 +0200
+@@ -37,7 +37,10 @@
+ subdir = icons/scalable/apps
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11424,23 +12194,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/interfaces/Makefile.in gnome-system-tools-2.30.1/interfaces/Makefile.in
---- gnome-system-tools-2.30.1.old/interfaces/Makefile.in 2010-04-26 22:10:52.000000000 +0200
-+++ gnome-system-tools-2.30.1/interfaces/Makefile.in 2010-05-05 17:13:04.845539422 +0200
-@@ -42,7 +42,11 @@
+Index: b/interfaces/Makefile.in
+===================================================================
+--- a/interfaces/Makefile.in 2010-05-05 19:39:04.786095273 +0200
++++ b/interfaces/Makefile.in 2010-05-05 19:38:54.590091555 +0200
+@@ -42,7 +42,10 @@
$(top_srcdir)/DirsMakefile ChangeLog
subdir = interfaces
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -126,7 +130,6 @@
+@@ -126,7 +129,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -11448,9 +12218,10 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/ltmain.sh gnome-system-tools-2.30.1/ltmain.sh
---- gnome-system-tools-2.30.1.old/ltmain.sh 2010-04-24 10:21:59.000000000 +0200
-+++ gnome-system-tools-2.30.1/ltmain.sh 2010-05-05 17:12:57.021542456 +0200
+Index: b/ltmain.sh
+===================================================================
+--- a/ltmain.sh 2010-05-05 19:39:03.694096950 +0200
++++ b/ltmain.sh 2010-05-05 19:38:42.354095541 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -11469,289 +12240,10 @@
TIMESTAMP=""
package_revision=1.3017
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/gnome-doc-utils.m4 gnome-system-tools-2.30.1/m4/gnome-doc-utils.m4
---- gnome-system-tools-2.30.1.old/m4/gnome-doc-utils.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/gnome-doc-utils.m4 2010-05-05 17:12:57.722549696 +0200
-@@ -0,0 +1,56 @@
-+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
-+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
-+AC_DEFUN([GNOME_DOC_DEFINES],
-+[
-+AC_ARG_WITH([help-dir],
-+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
-+ [with_help_dir='${datadir}/gnome/help'])
-+HELP_DIR="$with_help_dir"
-+AC_SUBST(HELP_DIR)
-+
-+AC_ARG_WITH([omf-dir],
-+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),,
-+ [with_omf_dir='${datadir}/omf'])
-+OMF_DIR="$with_omf_dir"
-+AC_SUBST(OMF_DIR)
-+
-+AC_ARG_WITH([help-formats],
-+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),,
-+ [with_help_formats=''])
-+DOC_USER_FORMATS="$with_help_formats"
-+AC_SUBST(DOC_USER_FORMATS)
-+
-+AC_ARG_ENABLE([scrollkeeper],
-+ [AC_HELP_STRING([--disable-scrollkeeper],
-+ [do not make updates to the scrollkeeper database])],,
-+ enable_scrollkeeper=yes)
-+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
-+
-+dnl disable scrollkeeper automatically for distcheck
-+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-+
-+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-+])
-+
-+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-+#
-+AC_DEFUN([GNOME_DOC_INIT],
-+[AC_REQUIRE([AC_PROG_LN_S])dnl
-+
-+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-+
-+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
-+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
-+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-+
-+if test "$gdu_cv_have_gdu" = "yes"; then
-+ AC_MSG_RESULT([yes])
-+ ifelse([$2],,[:],[$2])
-+else
-+ AC_MSG_RESULT([no])
-+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
-+fi
-+
-+GNOME_DOC_DEFINES
-+])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/intltool.m4 gnome-system-tools-2.30.1/m4/intltool.m4
---- gnome-system-tools-2.30.1.old/m4/intltool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/intltool.m4 2010-05-05 17:12:57.638641895 +0200
-@@ -0,0 +1,216 @@
-+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-+## Copyright (C) 2001 Eazel, Inc.
-+## Author: Maciej Stachowiak <mjs at noisehavoc.org>
-+## Kenneth Christiansen <kenneth at gnu.org>
-+##
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful, but
-+## WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+## General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+##
-+## As a special exception to the GNU General Public License, if you
-+## distribute this file as part of a program that contains a
-+## configuration script generated by Autoconf, you may include it under
-+## the same distribution terms that you use for the rest of that program.
-+
-+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 40 IT_PROG_INTLTOOL
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
-+
-+case "$am__api_version" in
-+ 1.[01234])
-+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+ ;;
-+ *)
-+ ;;
-+esac
-+
-+if test -n "$1"; then
-+ AC_MSG_CHECKING([for intltool >= $1])
-+
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`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 $< [$]@'
-+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@'
-+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+
-+_IT_SUBST(INTLTOOL_DESKTOP_RULE)
-+_IT_SUBST(INTLTOOL_DIRECTORY_RULE)
-+_IT_SUBST(INTLTOOL_KEYS_RULE)
-+_IT_SUBST(INTLTOOL_PROP_RULE)
-+_IT_SUBST(INTLTOOL_OAF_RULE)
-+_IT_SUBST(INTLTOOL_PONG_RULE)
-+_IT_SUBST(INTLTOOL_SERVER_RULE)
-+_IT_SUBST(INTLTOOL_SHEET_RULE)
-+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+_IT_SUBST(INTLTOOL_UI_RULE)
-+_IT_SUBST(INTLTOOL_XAM_RULE)
-+_IT_SUBST(INTLTOOL_KBD_RULE)
-+_IT_SUBST(INTLTOOL_XML_RULE)
-+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
-+_IT_SUBST(INTLTOOL_CAVES_RULE)
-+_IT_SUBST(INTLTOOL_SCHEMAS_RULE)
-+_IT_SUBST(INTLTOOL_THEME_RULE)
-+_IT_SUBST(INTLTOOL_SERVICE_RULE)
-+_IT_SUBST(INTLTOOL_POLICY_RULE)
-+
-+# Check the gettext tools to make sure they are GNU
-+AC_PATH_PROG(XGETTEXT, xgettext)
-+AC_PATH_PROG(MSGMERGE, msgmerge)
-+AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
-+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
-+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
-+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
-+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
-+fi
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+ AC_MSG_ERROR([perl not found])
-+fi
-+AC_MSG_CHECKING([for perl >= 5.8.1])
-+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
-+if test $? -ne 0; then
-+ AC_MSG_ERROR([perl 5.8.1 is required for intltool])
-+else
-+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-+ AC_MSG_RESULT([$IT_PERL_VERSION])
-+fi
-+if test "x$2" != "xno-xml"; then
-+ AC_MSG_CHECKING([for XML::Parser])
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ AC_MSG_RESULT([ok])
-+ else
-+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+ fi
-+fi
-+
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-+
-+# Set DATADIRNAME correctly if it is not set yet
-+# (copied from glib-gettext.m4)
-+if test -z "$DATADIRNAME"; then
-+ AC_LINK_IFELSE(
-+ [AC_LANG_PROGRAM([[]],
-+ [[extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr]])],
-+ [DATADIRNAME=share],
-+ [case $host in
-+ *-*-solaris*)
-+ dnl On Solaris, if bind_textdomain_codeset is in libc,
-+ dnl GNU format message catalog is always supported,
-+ dnl since both are added to the libc all together.
-+ dnl Hence, we'd like to go with DATADIRNAME=share
-+ dnl in this case.
-+ AC_CHECK_FUNC(bind_textdomain_codeset,
-+ [DATADIRNAME=share], [DATADIRNAME=lib])
-+ ;;
-+ *)
-+ [DATADIRNAME=lib]
-+ ;;
-+ esac])
-+fi
-+AC_SUBST(DATADIRNAME)
-+
-+IT_PO_SUBDIR([po])
-+
-+])
-+
-+
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be executed at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+ AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
-+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+ fi
-+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+ >"$1/stamp-it.tmp"
-+ [sed '/^#/d
-+ s/^[[].*] *//
-+ /^[ ]*$/d
-+ '"s|^| $ac_top_srcdir/|" \
-+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+ ]
-+ [sed '/^POTFILES =/,/[^\\]$/ {
-+ /^POTFILES =/!d
-+ r $1/POTFILES
-+ }
-+ ' "$1/Makefile.in" >"$1/Makefile"]
-+ rm -f "$1/Makefile.tmp"
-+ mv "$1/stamp-it.tmp" "$1/stamp-it"
-+ ])
-+])dnl
-+])
-+
-+# _IT_SUBST(VARIABLE)
-+# -------------------
-+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
-+#
-+AC_DEFUN([_IT_SUBST],
-+[
-+AC_SUBST([$1])
-+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
-+]
-+)
-+
-+# deprecated macros
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-+
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/libtool.m4 gnome-system-tools-2.30.1/m4/libtool.m4
---- gnome-system-tools-2.30.1.old/m4/libtool.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/libtool.m4 2010-05-05 17:12:57.137543292 +0200
+Index: b/m4/libtool.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/m4/libtool.m4 2010-05-05 19:38:42.426091870 +0200
@@ -0,0 +1,7377 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
@@ -19130,9 +19622,539 @@
+ ;;
+ esac
+])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/lt~obsolete.m4 gnome-system-tools-2.30.1/m4/lt~obsolete.m4
---- gnome-system-tools-2.30.1.old/m4/lt~obsolete.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/lt~obsolete.m4 2010-05-05 17:12:57.461541044 +0200
+Index: b/m4/ltoptions.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/m4/ltoptions.m4 2010-05-05 19:38:42.490093044 +0200
+@@ -0,0 +1,368 @@
++# Helper functions for option handling. -*- Autoconf -*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# serial 6 ltoptions.m4
++
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
++
++
++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
++# ------------------------------------------
++m4_define([_LT_MANGLE_OPTION],
++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
++
++
++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
++# ---------------------------------------
++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
++# matching handler defined, dispatch to it. Other OPTION-NAMEs are
++# saved as a flag.
++m4_define([_LT_SET_OPTION],
++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
++ _LT_MANGLE_DEFUN([$1], [$2]),
++ [m4_warning([Unknown $1 option `$2'])])[]dnl
++])
++
++
++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
++# ------------------------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++m4_define([_LT_IF_OPTION],
++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
++
++
++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
++# -------------------------------------------------------
++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
++# are set.
++m4_define([_LT_UNLESS_OPTIONS],
++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
++ [m4_define([$0_found])])])[]dnl
++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
++])[]dnl
++])
++
++
++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
++# ----------------------------------------
++# OPTION-LIST is a space-separated list of Libtool options associated
++# with MACRO-NAME. If any OPTION has a matching handler declared with
++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
++# the unknown option and exit.
++m4_defun([_LT_SET_OPTIONS],
++[# Set options
++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
++ [_LT_SET_OPTION([$1], _LT_Option)])
++
++m4_if([$1],[LT_INIT],[
++ dnl
++ dnl Simply set some default values (i.e off) if boolean options were not
++ dnl specified:
++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
++ ])
++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
++ ])
++ dnl
++ dnl If no reference was made to various pairs of opposing options, then
++ dnl we run the default mode handler for the pair. For example, if neither
++ dnl `shared' nor `disable-shared' was passed, we enable building of shared
++ dnl archives by default:
++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
++ [_LT_ENABLE_FAST_INSTALL])
++ ])
++])# _LT_SET_OPTIONS
++
++
++## --------------------------------- ##
++## Macros to handle LT_INIT options. ##
++## --------------------------------- ##
++
++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
++# -----------------------------------------
++m4_define([_LT_MANGLE_DEFUN],
++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
++
++
++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
++# -----------------------------------------------
++m4_define([LT_OPTION_DEFINE],
++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
++])# LT_OPTION_DEFINE
++
++
++# dlopen
++# ------
++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
++])
++
++AU_DEFUN([AC_LIBTOOL_DLOPEN],
++[_LT_SET_OPTION([LT_INIT], [dlopen])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `dlopen' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
++
++
++# win32-dll
++# ---------
++# Declare package support for building win32 dll's.
++LT_OPTION_DEFINE([LT_INIT], [win32-dll],
++[enable_win32_dll=yes
++
++case $host in
++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
++ AC_CHECK_TOOL(AS, as, false)
++ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++ AC_CHECK_TOOL(OBJDUMP, objdump, false)
++ ;;
++esac
++
++test -z "$AS" && AS=as
++_LT_DECL([], [AS], [0], [Assembler program])dnl
++
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
++
++test -z "$OBJDUMP" && OBJDUMP=objdump
++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
++])# win32-dll
++
++AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++_LT_SET_OPTION([LT_INIT], [win32-dll])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `win32-dll' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
++
++
++# _LT_ENABLE_SHARED([DEFAULT])
++# ----------------------------
++# implement the --enable-shared flag, and supports the `shared' and
++# `disable-shared' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_SHARED],
++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([shared],
++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_shared=yes ;;
++ no) enable_shared=no ;;
++ *)
++ enable_shared=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_shared=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
++
++ _LT_DECL([build_libtool_libs], [enable_shared], [0],
++ [Whether or not to build shared libraries])
++])# _LT_ENABLE_SHARED
++
++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
++
++# Old names:
++AC_DEFUN([AC_ENABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
++])
++
++AC_DEFUN([AC_DISABLE_SHARED],
++[_LT_SET_OPTION([LT_INIT], [disable-shared])
++])
++
++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_SHARED], [])
++dnl AC_DEFUN([AM_DISABLE_SHARED], [])
++
++
++
++# _LT_ENABLE_STATIC([DEFAULT])
++# ----------------------------
++# implement the --enable-static flag, and support the `static' and
++# `disable-static' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_STATIC],
++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([static],
++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_static=yes ;;
++ no) enable_static=no ;;
++ *)
++ enable_static=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_static=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
++
++ _LT_DECL([build_old_libs], [enable_static], [0],
++ [Whether or not to build static libraries])
++])# _LT_ENABLE_STATIC
++
++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
++
++# Old names:
++AC_DEFUN([AC_ENABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
++])
++
++AC_DEFUN([AC_DISABLE_STATIC],
++[_LT_SET_OPTION([LT_INIT], [disable-static])
++])
++
++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AM_ENABLE_STATIC], [])
++dnl AC_DEFUN([AM_DISABLE_STATIC], [])
++
++
++
++# _LT_ENABLE_FAST_INSTALL([DEFAULT])
++# ----------------------------------
++# implement the --enable-fast-install flag, and support the `fast-install'
++# and `disable-fast-install' LT_INIT options.
++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
++m4_define([_LT_ENABLE_FAST_INSTALL],
++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
++AC_ARG_ENABLE([fast-install],
++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++ [p=${PACKAGE-default}
++ case $enableval in
++ yes) enable_fast_install=yes ;;
++ no) enable_fast_install=no ;;
++ *)
++ enable_fast_install=no
++ # Look at the argument we got. We use all the common list separators.
++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++ for pkg in $enableval; do
++ IFS="$lt_save_ifs"
++ if test "X$pkg" = "X$p"; then
++ enable_fast_install=yes
++ fi
++ done
++ IFS="$lt_save_ifs"
++ ;;
++ esac],
++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
++
++_LT_DECL([fast_install], [enable_fast_install], [0],
++ [Whether or not to optimize for fast installation])dnl
++])# _LT_ENABLE_FAST_INSTALL
++
++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
++
++# Old names:
++AU_DEFUN([AC_ENABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `fast-install' option into LT_INIT's first parameter.])
++])
++
++AU_DEFUN([AC_DISABLE_FAST_INSTALL],
++[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you put
++the `disable-fast-install' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
++
++
++# _LT_WITH_PIC([MODE])
++# --------------------
++# implement the --with-pic flag, and support the `pic-only' and `no-pic'
++# LT_INIT options.
++# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
++m4_define([_LT_WITH_PIC],
++[AC_ARG_WITH([pic],
++ [AS_HELP_STRING([--with-pic],
++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++ [pic_mode="$withval"],
++ [pic_mode=default])
++
++test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
++
++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
++])# _LT_WITH_PIC
++
++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
++
++# Old name:
++AU_DEFUN([AC_LIBTOOL_PICMODE],
++[_LT_SET_OPTION([LT_INIT], [pic-only])
++AC_DIAGNOSE([obsolete],
++[$0: Remove this warning and the call to _LT_SET_OPTION when you
++put the `pic-only' option into LT_INIT's first parameter.])
++])
++
++dnl aclocal-1.4 backwards compatibility:
++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
++
++## ----------------- ##
++## LTDL_INIT Options ##
++## ----------------- ##
++
++m4_define([_LTDL_MODE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
++ [m4_define([_LTDL_MODE], [nonrecursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [recursive],
++ [m4_define([_LTDL_MODE], [recursive])])
++LT_OPTION_DEFINE([LTDL_INIT], [subproject],
++ [m4_define([_LTDL_MODE], [subproject])])
++
++m4_define([_LTDL_TYPE], [])
++LT_OPTION_DEFINE([LTDL_INIT], [installable],
++ [m4_define([_LTDL_TYPE], [installable])])
++LT_OPTION_DEFINE([LTDL_INIT], [convenience],
++ [m4_define([_LTDL_TYPE], [convenience])])
+Index: b/m4/ltsugar.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/m4/ltsugar.m4 2010-05-05 19:38:42.554095612 +0200
+@@ -0,0 +1,123 @@
++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
++#
++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
++# Written by Gary V. Vaughan, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# serial 6 ltsugar.m4
++
++# This is to help aclocal find these macros, as it can't see m4_define.
++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
++
++
++# lt_join(SEP, ARG1, [ARG2...])
++# -----------------------------
++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
++# associated separator.
++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
++# versions in m4sugar had bugs.
++m4_define([lt_join],
++[m4_if([$#], [1], [],
++ [$#], [2], [[$2]],
++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
++m4_define([_lt_join],
++[m4_if([$#$2], [2], [],
++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
++
++
++# lt_car(LIST)
++# lt_cdr(LIST)
++# ------------
++# Manipulate m4 lists.
++# These macros are necessary as long as will still need to support
++# Autoconf-2.59 which quotes differently.
++m4_define([lt_car], [[$1]])
++m4_define([lt_cdr],
++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
++ [$#], 1, [],
++ [m4_dquote(m4_shift($@))])])
++m4_define([lt_unquote], $1)
++
++
++# lt_append(MACRO-NAME, STRING, [SEPARATOR])
++# ------------------------------------------
++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
++# Note that neither SEPARATOR nor STRING are expanded; they are appended
++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
++# No SEPARATOR is output if MACRO-NAME was previously undefined (different
++# than defined and empty).
++#
++# This macro is needed until we can rely on Autoconf 2.62, since earlier
++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
++m4_define([lt_append],
++[m4_define([$1],
++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
++
++
++
++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
++# ----------------------------------------------------------
++# Produce a SEP delimited list of all paired combinations of elements of
++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
++# has the form PREFIXmINFIXSUFFIXn.
++# Needed until we can rely on m4_combine added in Autoconf 2.62.
++m4_define([lt_combine],
++[m4_if(m4_eval([$# > 3]), [1],
++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
++[[m4_foreach([_Lt_prefix], [$2],
++ [m4_foreach([_Lt_suffix],
++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
++
++
++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
++# -----------------------------------------------------------------------
++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
++m4_define([lt_if_append_uniq],
++[m4_ifdef([$1],
++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
++ [lt_append([$1], [$2], [$3])$4],
++ [$5])],
++ [lt_append([$1], [$2], [$3])$4])])
++
++
++# lt_dict_add(DICT, KEY, VALUE)
++# -----------------------------
++m4_define([lt_dict_add],
++[m4_define([$1($2)], [$3])])
++
++
++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
++# --------------------------------------------
++m4_define([lt_dict_add_subkey],
++[m4_define([$1($2:$3)], [$4])])
++
++
++# lt_dict_fetch(DICT, KEY, [SUBKEY])
++# ----------------------------------
++m4_define([lt_dict_fetch],
++[m4_ifval([$3],
++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
++
++
++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
++# -----------------------------------------------------------------
++m4_define([lt_if_dict_fetch],
++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
++ [$5],
++ [$6])])
++
++
++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
++# --------------------------------------------------------------
++m4_define([lt_dict_filter],
++[m4_if([$5], [], [],
++ [lt_join(m4_quote(m4_default([$4], [[, ]])),
++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
++])
+Index: b/m4/ltversion.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/m4/ltversion.m4 2010-05-05 19:38:42.622092263 +0200
+@@ -0,0 +1,23 @@
++# ltversion.m4 -- version numbers -*- Autoconf -*-
++#
++# Copyright (C) 2004 Free Software Foundation, Inc.
++# Written by Scott James Remnant, 2004
++#
++# This file is free software; the Free Software Foundation gives
++# unlimited permission to copy and/or distribute it, with or without
++# modifications, as long as this notice is preserved.
++
++# Generated from ltversion.in.
++
++# serial 3017 ltversion.m4
++# This file is part of GNU Libtool
++
++m4_define([LT_PACKAGE_VERSION], [2.2.6b])
++m4_define([LT_PACKAGE_REVISION], [1.3017])
++
++AC_DEFUN([LTVERSION_VERSION],
++[macro_version='2.2.6b'
++macro_revision='1.3017'
++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
++_LT_DECL(, macro_revision, 0)
++])
+Index: b/m4/lt~obsolete.m4
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ b/m4/lt~obsolete.m4 2010-05-05 19:38:42.686095665 +0200
@@ -0,0 +1,92 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
+#
@@ -19226,549 +20248,23 @@
+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/ltoptions.m4 gnome-system-tools-2.30.1/m4/ltoptions.m4
---- gnome-system-tools-2.30.1.old/m4/ltoptions.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/ltoptions.m4 2010-05-05 17:12:57.197542324 +0200
-@@ -0,0 +1,368 @@
-+# Helper functions for option handling. -*- Autoconf -*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltoptions.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
-+
-+
-+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
-+# ------------------------------------------
-+m4_define([_LT_MANGLE_OPTION],
-+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
-+
-+
-+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
-+# ---------------------------------------
-+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
-+# matching handler defined, dispatch to it. Other OPTION-NAMEs are
-+# saved as a flag.
-+m4_define([_LT_SET_OPTION],
-+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
-+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
-+ _LT_MANGLE_DEFUN([$1], [$2]),
-+ [m4_warning([Unknown $1 option `$2'])])[]dnl
-+])
-+
-+
-+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
-+# ------------------------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+m4_define([_LT_IF_OPTION],
-+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
-+
-+
-+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
-+# -------------------------------------------------------
-+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
-+# are set.
-+m4_define([_LT_UNLESS_OPTIONS],
-+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
-+ [m4_define([$0_found])])])[]dnl
-+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
-+])[]dnl
-+])
-+
-+
-+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
-+# ----------------------------------------
-+# OPTION-LIST is a space-separated list of Libtool options associated
-+# with MACRO-NAME. If any OPTION has a matching handler declared with
-+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
-+# the unknown option and exit.
-+m4_defun([_LT_SET_OPTIONS],
-+[# Set options
-+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
-+ [_LT_SET_OPTION([$1], _LT_Option)])
-+
-+m4_if([$1],[LT_INIT],[
-+ dnl
-+ dnl Simply set some default values (i.e off) if boolean options were not
-+ dnl specified:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
-+ ])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
-+ ])
-+ dnl
-+ dnl If no reference was made to various pairs of opposing options, then
-+ dnl we run the default mode handler for the pair. For example, if neither
-+ dnl `shared' nor `disable-shared' was passed, we enable building of shared
-+ dnl archives by default:
-+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
-+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
-+ [_LT_ENABLE_FAST_INSTALL])
-+ ])
-+])# _LT_SET_OPTIONS
-+
-+
-+## --------------------------------- ##
-+## Macros to handle LT_INIT options. ##
-+## --------------------------------- ##
-+
-+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
-+# -----------------------------------------
-+m4_define([_LT_MANGLE_DEFUN],
-+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
-+
-+
-+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
-+# -----------------------------------------------
-+m4_define([LT_OPTION_DEFINE],
-+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
-+])# LT_OPTION_DEFINE
-+
-+
-+# dlopen
-+# ------
-+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
-+])
-+
-+AU_DEFUN([AC_LIBTOOL_DLOPEN],
-+[_LT_SET_OPTION([LT_INIT], [dlopen])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `dlopen' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
-+
-+
-+# win32-dll
-+# ---------
-+# Declare package support for building win32 dll's.
-+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
-+[enable_win32_dll=yes
-+
-+case $host in
-+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
-+ AC_CHECK_TOOL(AS, as, false)
-+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+ AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+ ;;
-+esac
-+
-+test -z "$AS" && AS=as
-+_LT_DECL([], [AS], [0], [Assembler program])dnl
-+
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
-+
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
-+])# win32-dll
-+
-+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+_LT_SET_OPTION([LT_INIT], [win32-dll])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `win32-dll' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
-+
-+
-+# _LT_ENABLE_SHARED([DEFAULT])
-+# ----------------------------
-+# implement the --enable-shared flag, and supports the `shared' and
-+# `disable-shared' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_SHARED],
-+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([shared],
-+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_shared=yes ;;
-+ no) enable_shared=no ;;
-+ *)
-+ enable_shared=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_shared=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
-+
-+ _LT_DECL([build_libtool_libs], [enable_shared], [0],
-+ [Whether or not to build shared libraries])
-+])# _LT_ENABLE_SHARED
-+
-+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
-+])
-+
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[_LT_SET_OPTION([LT_INIT], [disable-shared])
-+])
-+
-+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
-+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
-+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
-+
-+
-+
-+# _LT_ENABLE_STATIC([DEFAULT])
-+# ----------------------------
-+# implement the --enable-static flag, and support the `static' and
-+# `disable-static' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_STATIC],
-+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([static],
-+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_static=yes ;;
-+ no) enable_static=no ;;
-+ *)
-+ enable_static=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_static=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
-+
-+ _LT_DECL([build_old_libs], [enable_static], [0],
-+ [Whether or not to build static libraries])
-+])# _LT_ENABLE_STATIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
-+
-+# Old names:
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
-+])
-+
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[_LT_SET_OPTION([LT_INIT], [disable-static])
-+])
-+
-+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
-+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
-+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
-+
-+
-+
-+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
-+# ----------------------------------
-+# implement the --enable-fast-install flag, and support the `fast-install'
-+# and `disable-fast-install' LT_INIT options.
-+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
-+m4_define([_LT_ENABLE_FAST_INSTALL],
-+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
-+AC_ARG_ENABLE([fast-install],
-+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+ [p=${PACKAGE-default}
-+ case $enableval in
-+ yes) enable_fast_install=yes ;;
-+ no) enable_fast_install=no ;;
-+ *)
-+ enable_fast_install=no
-+ # Look at the argument we got. We use all the common list separators.
-+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+ for pkg in $enableval; do
-+ IFS="$lt_save_ifs"
-+ if test "X$pkg" = "X$p"; then
-+ enable_fast_install=yes
-+ fi
-+ done
-+ IFS="$lt_save_ifs"
-+ ;;
-+ esac],
-+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
-+
-+_LT_DECL([fast_install], [enable_fast_install], [0],
-+ [Whether or not to optimize for fast installation])dnl
-+])# _LT_ENABLE_FAST_INSTALL
-+
-+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
-+
-+# Old names:
-+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-+the `disable-fast-install' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
-+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
-+
-+
-+# _LT_WITH_PIC([MODE])
-+# --------------------
-+# implement the --with-pic flag, and support the `pic-only' and `no-pic'
-+# LT_INIT options.
-+# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
-+m4_define([_LT_WITH_PIC],
-+[AC_ARG_WITH([pic],
-+ [AS_HELP_STRING([--with-pic],
-+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+ [pic_mode="$withval"],
-+ [pic_mode=default])
-+
-+test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
-+
-+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
-+])# _LT_WITH_PIC
-+
-+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
-+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
-+
-+# Old name:
-+AU_DEFUN([AC_LIBTOOL_PICMODE],
-+[_LT_SET_OPTION([LT_INIT], [pic-only])
-+AC_DIAGNOSE([obsolete],
-+[$0: Remove this warning and the call to _LT_SET_OPTION when you
-+put the `pic-only' option into LT_INIT's first parameter.])
-+])
-+
-+dnl aclocal-1.4 backwards compatibility:
-+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
-+
-+## ----------------- ##
-+## LTDL_INIT Options ##
-+## ----------------- ##
-+
-+m4_define([_LTDL_MODE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
-+ [m4_define([_LTDL_MODE], [nonrecursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
-+ [m4_define([_LTDL_MODE], [recursive])])
-+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
-+ [m4_define([_LTDL_MODE], [subproject])])
-+
-+m4_define([_LTDL_TYPE], [])
-+LT_OPTION_DEFINE([LTDL_INIT], [installable],
-+ [m4_define([_LTDL_TYPE], [installable])])
-+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
-+ [m4_define([_LTDL_TYPE], [convenience])])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/ltsugar.m4 gnome-system-tools-2.30.1/m4/ltsugar.m4
---- gnome-system-tools-2.30.1.old/m4/ltsugar.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/ltsugar.m4 2010-05-05 17:12:57.305557104 +0200
-@@ -0,0 +1,123 @@
-+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
-+#
-+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
-+# Written by Gary V. Vaughan, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# serial 6 ltsugar.m4
-+
-+# This is to help aclocal find these macros, as it can't see m4_define.
-+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
-+
-+
-+# lt_join(SEP, ARG1, [ARG2...])
-+# -----------------------------
-+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
-+# associated separator.
-+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
-+# versions in m4sugar had bugs.
-+m4_define([lt_join],
-+[m4_if([$#], [1], [],
-+ [$#], [2], [[$2]],
-+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
-+m4_define([_lt_join],
-+[m4_if([$#$2], [2], [],
-+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
-+
-+
-+# lt_car(LIST)
-+# lt_cdr(LIST)
-+# ------------
-+# Manipulate m4 lists.
-+# These macros are necessary as long as will still need to support
-+# Autoconf-2.59 which quotes differently.
-+m4_define([lt_car], [[$1]])
-+m4_define([lt_cdr],
-+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
-+ [$#], 1, [],
-+ [m4_dquote(m4_shift($@))])])
-+m4_define([lt_unquote], $1)
-+
-+
-+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
-+# ------------------------------------------
-+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
-+# Note that neither SEPARATOR nor STRING are expanded; they are appended
-+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
-+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
-+# than defined and empty).
-+#
-+# This macro is needed until we can rely on Autoconf 2.62, since earlier
-+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
-+m4_define([lt_append],
-+[m4_define([$1],
-+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
-+
-+
-+
-+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
-+# ----------------------------------------------------------
-+# Produce a SEP delimited list of all paired combinations of elements of
-+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list
-+# has the form PREFIXmINFIXSUFFIXn.
-+# Needed until we can rely on m4_combine added in Autoconf 2.62.
-+m4_define([lt_combine],
-+[m4_if(m4_eval([$# > 3]), [1],
-+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
-+[[m4_foreach([_Lt_prefix], [$2],
-+ [m4_foreach([_Lt_suffix],
-+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
-+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
-+
-+
-+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
-+# -----------------------------------------------------------------------
-+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
-+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
-+m4_define([lt_if_append_uniq],
-+[m4_ifdef([$1],
-+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
-+ [lt_append([$1], [$2], [$3])$4],
-+ [$5])],
-+ [lt_append([$1], [$2], [$3])$4])])
-+
-+
-+# lt_dict_add(DICT, KEY, VALUE)
-+# -----------------------------
-+m4_define([lt_dict_add],
-+[m4_define([$1($2)], [$3])])
-+
-+
-+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
-+# --------------------------------------------
-+m4_define([lt_dict_add_subkey],
-+[m4_define([$1($2:$3)], [$4])])
-+
-+
-+# lt_dict_fetch(DICT, KEY, [SUBKEY])
-+# ----------------------------------
-+m4_define([lt_dict_fetch],
-+[m4_ifval([$3],
-+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
-+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
-+
-+
-+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
-+# -----------------------------------------------------------------
-+m4_define([lt_if_dict_fetch],
-+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
-+ [$5],
-+ [$6])])
-+
-+
-+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
-+# --------------------------------------------------------------
-+m4_define([lt_dict_filter],
-+[m4_if([$5], [], [],
-+ [lt_join(m4_quote(m4_default([$4], [[, ]])),
-+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
-+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
-+])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/m4/ltversion.m4 gnome-system-tools-2.30.1/m4/ltversion.m4
---- gnome-system-tools-2.30.1.old/m4/ltversion.m4 1970-01-01 01:00:00.000000000 +0100
-+++ gnome-system-tools-2.30.1/m4/ltversion.m4 2010-05-05 17:12:57.413553518 +0200
-@@ -0,0 +1,23 @@
-+# ltversion.m4 -- version numbers -*- Autoconf -*-
-+#
-+# Copyright (C) 2004 Free Software Foundation, Inc.
-+# Written by Scott James Remnant, 2004
-+#
-+# This file is free software; the Free Software Foundation gives
-+# unlimited permission to copy and/or distribute it, with or without
-+# modifications, as long as this notice is preserved.
-+
-+# Generated from ltversion.in.
-+
-+# serial 3017 ltversion.m4
-+# This file is part of GNU Libtool
-+
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
-+
-+AC_DEFUN([LTVERSION_VERSION],
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
-+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
-+_LT_DECL(, macro_revision, 0)
-+])
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/Makefile.in gnome-system-tools-2.30.1/Makefile.in
---- gnome-system-tools-2.30.1.old/Makefile.in 2010-04-26 22:10:54.000000000 +0200
-+++ gnome-system-tools-2.30.1/Makefile.in 2010-05-05 17:13:05.705540128 +0200
-@@ -41,7 +41,11 @@
- AUTHORS COPYING ChangeLog INSTALL NEWS TODO config.guess \
- config.sub depcomp install-sh ltmain.sh missing mkinstalldirs
+Index: b/pixmaps/Makefile.in
+===================================================================
+--- a/pixmaps/Makefile.in 2010-05-05 19:39:06.686095400 +0200
++++ b/pixmaps/Makefile.in 2010-05-05 19:38:54.682089583 +0200
+@@ -37,7 +37,10 @@
+ subdir = pixmaps
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -176,7 +180,6 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+@@ -121,7 +124,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -19776,23 +20272,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/pixmaps/Makefile.in gnome-system-tools-2.30.1/pixmaps/Makefile.in
---- gnome-system-tools-2.30.1.old/pixmaps/Makefile.in 2010-04-26 22:10:52.000000000 +0200
-+++ gnome-system-tools-2.30.1/pixmaps/Makefile.in 2010-05-05 17:13:04.897540240 +0200
-@@ -37,7 +37,11 @@
- subdir = pixmaps
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ChangeLog
+Index: b/src/Makefile.in
+===================================================================
+--- a/src/Makefile.in 2010-05-05 19:39:03.958093716 +0200
++++ b/src/Makefile.in 2010-05-05 19:38:54.774087047 +0200
+@@ -36,7 +36,10 @@
+ subdir = src
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -121,7 +125,6 @@
+@@ -137,7 +140,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -19800,53 +20296,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/po/Makefile.in.in gnome-system-tools-2.30.1/po/Makefile.in.in
---- gnome-system-tools-2.30.1.old/po/Makefile.in.in 2010-04-24 10:21:59.000000000 +0200
-+++ gnome-system-tools-2.30.1/po/Makefile.in.in 2010-05-05 17:12:57.594555850 +0200
-@@ -21,7 +21,7 @@
- PACKAGE = @PACKAGE@
- VERSION = @VERSION@
-
--SHELL = /bin/sh
-+SHELL = @SHELL@
-
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
-@@ -56,7 +56,7 @@
-
- PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; else echo "$(ALL_LINGUAS)"; fi)
-
--USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep ^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep \^$$lang$$ $(srcdir)/LINGUAS 2>/dev/null`" -o -n "`echo $$ALINGUAS|tr ' ' '\n'|grep \^$$lang$$`"; then printf "$$lang "; fi; done; fi)
-
- USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)" -o -n "$(LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
-
-@@ -129,7 +129,7 @@
- done
-
- # Empty stubs to satisfy archaic automake needs
--dvi info tags TAGS ID:
-+dvi info ctags tags CTAGS TAGS ID:
-
- # Define this as empty until I found a useful application.
- install-exec installcheck:
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/common/Makefile.in gnome-system-tools-2.30.1/src/common/Makefile.in
---- gnome-system-tools-2.30.1.old/src/common/Makefile.in 2010-04-26 22:10:52.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/common/Makefile.in 2010-05-05 17:13:05.105539229 +0200
-@@ -42,7 +42,11 @@
+Index: b/src/common/Makefile.in
+===================================================================
+--- a/src/common/Makefile.in 2010-05-05 19:39:04.122091985 +0200
++++ b/src/common/Makefile.in 2010-05-05 19:38:55.006093145 +0200
+@@ -42,7 +42,10 @@
$(top_srcdir)/DirsMakefile ChangeLog
subdir = src/common
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -139,7 +143,6 @@
+@@ -139,7 +142,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -19854,47 +20320,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/Makefile.in gnome-system-tools-2.30.1/src/Makefile.in
---- gnome-system-tools-2.30.1.old/src/Makefile.in 2010-04-26 22:10:52.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/Makefile.in 2010-05-05 17:13:04.949539031 +0200
-@@ -36,7 +36,11 @@
- subdir = src
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+Index: b/src/network/Makefile.in
+===================================================================
+--- a/src/network/Makefile.in 2010-05-05 19:39:04.338091556 +0200
++++ b/src/network/Makefile.in 2010-05-05 19:38:55.138089845 +0200
+@@ -45,7 +45,10 @@
+ bin_PROGRAMS = network-admin$(EXEEXT)
+ subdir = src/network
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -137,7 +141,6 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
- GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
--GST_IW_LIBS = @GST_IW_LIBS@
- GST_LIBS = @GST_LIBS@
- GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
- GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/network/Makefile.in gnome-system-tools-2.30.1/src/network/Makefile.in
---- gnome-system-tools-2.30.1.old/src/network/Makefile.in 2010-04-26 22:10:52.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/network/Makefile.in 2010-05-05 17:13:05.181539313 +0200
-@@ -45,7 +45,11 @@
- bin_PROGRAMS = network-admin$(EXEEXT)
- subdir = src/network
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-+ $(top_srcdir)/configure.in
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -54,18 +58,9 @@
+@@ -54,18 +57,9 @@
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"
PROGRAMS = $(bin_PROGRAMS)
@@ -19916,7 +20358,7 @@
network_admin_OBJECTS = $(am_network_admin_OBJECTS)
am__DEPENDENCIES_1 =
AM_V_lt = $(am__v_lt_$(V))
-@@ -98,7 +93,7 @@
+@@ -98,7 +92,7 @@
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(network_admin_SOURCES)
@@ -19925,7 +20367,7 @@
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-@@ -169,7 +164,6 @@
+@@ -169,7 +163,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -19933,7 +20375,7 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-@@ -307,19 +301,13 @@
+@@ -307,19 +300,13 @@
toolname = network
CLEANFILES = $(GST_TOOL_CLEANFILES)
EXTRA_DIST = $(GST_TOOL_EXTRA_DIST)
@@ -19954,7 +20396,7 @@
hosts.c hosts.h \
main.c
-@@ -415,15 +403,9 @@
+@@ -415,15 +402,9 @@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/address-list.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/callbacks.Po at am__quote@
@@ -19970,23 +20412,23 @@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/services/Makefile.in gnome-system-tools-2.30.1/src/services/Makefile.in
---- gnome-system-tools-2.30.1.old/src/services/Makefile.in 2010-04-26 22:10:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/services/Makefile.in 2010-05-05 17:13:05.257541293 +0200
-@@ -45,7 +45,11 @@
+Index: b/src/services/Makefile.in
+===================================================================
+--- a/src/services/Makefile.in 2010-05-05 19:39:04.426089924 +0200
++++ b/src/services/Makefile.in 2010-05-05 19:38:55.266091616 +0200
+@@ -45,7 +45,10 @@
bin_PROGRAMS = services-admin$(EXEEXT)
subdir = src/services
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -160,7 +164,6 @@
+@@ -160,7 +163,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -19994,23 +20436,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/shares/Makefile.in gnome-system-tools-2.30.1/src/shares/Makefile.in
---- gnome-system-tools-2.30.1.old/src/shares/Makefile.in 2010-04-26 22:10:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/shares/Makefile.in 2010-05-05 17:13:05.329539342 +0200
-@@ -45,7 +45,11 @@
+Index: b/src/shares/Makefile.in
+===================================================================
+--- a/src/shares/Makefile.in 2010-05-05 19:39:04.198093004 +0200
++++ b/src/shares/Makefile.in 2010-05-05 19:38:55.414085892 +0200
+@@ -45,7 +45,10 @@
bin_PROGRAMS = shares-admin$(EXEEXT)
subdir = src/shares
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -199,7 +203,6 @@
+@@ -199,7 +202,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -20018,23 +20460,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/shares/nautilus/Makefile.in gnome-system-tools-2.30.1/src/shares/nautilus/Makefile.in
---- gnome-system-tools-2.30.1.old/src/shares/nautilus/Makefile.in 2010-04-26 22:10:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/shares/nautilus/Makefile.in 2010-05-05 17:13:05.401539490 +0200
-@@ -37,7 +37,11 @@
+Index: b/src/shares/nautilus/Makefile.in
+===================================================================
+--- a/src/shares/nautilus/Makefile.in 2010-05-05 19:39:04.258095336 +0200
++++ b/src/shares/nautilus/Makefile.in 2010-05-05 19:38:55.538088284 +0200
+@@ -37,7 +37,10 @@
subdir = src/shares/nautilus
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -156,7 +160,6 @@
+@@ -156,7 +159,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -20042,23 +20484,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/time/e-map/Makefile.in gnome-system-tools-2.30.1/src/time/e-map/Makefile.in
---- gnome-system-tools-2.30.1.old/src/time/e-map/Makefile.in 2010-04-26 22:10:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/time/e-map/Makefile.in 2010-05-05 17:13:05.545539428 +0200
-@@ -42,7 +42,11 @@
- $(srcdir)/Makefile.in ChangeLog
- subdir = src/time/e-map
+Index: b/src/time/Makefile.in
+===================================================================
+--- a/src/time/Makefile.in 2010-05-05 19:39:04.502093744 +0200
++++ b/src/time/Makefile.in 2010-05-05 19:38:55.674088285 +0200
+@@ -45,7 +45,10 @@
+ bin_PROGRAMS = time-admin$(EXEEXT)
+ subdir = src/time
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -138,7 +142,6 @@
+@@ -197,7 +200,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -20066,23 +20508,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/time/Makefile.in gnome-system-tools-2.30.1/src/time/Makefile.in
---- gnome-system-tools-2.30.1.old/src/time/Makefile.in 2010-04-26 22:10:53.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/time/Makefile.in 2010-05-05 17:13:05.473540195 +0200
-@@ -45,7 +45,11 @@
- bin_PROGRAMS = time-admin$(EXEEXT)
- subdir = src/time
+Index: b/src/time/e-map/Makefile.in
+===================================================================
+--- a/src/time/e-map/Makefile.in 2010-05-05 19:39:04.566093797 +0200
++++ b/src/time/e-map/Makefile.in 2010-05-05 19:38:55.794088755 +0200
+@@ -42,7 +42,10 @@
+ $(srcdir)/Makefile.in ChangeLog
+ subdir = src/time/e-map
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -197,7 +201,6 @@
+@@ -138,7 +141,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
@@ -20090,23 +20532,23 @@
GST_LIBS = @GST_LIBS@
GST_TOOL_CFLAGS = @GST_TOOL_CFLAGS@
GST_TOOL_CLEANFILES = @GST_TOOL_CLEANFILES@
-diff '-x*config.guess' '-x*config.sub' -Naur gnome-system-tools-2.30.1.old/src/users/Makefile.in gnome-system-tools-2.30.1/src/users/Makefile.in
---- gnome-system-tools-2.30.1.old/src/users/Makefile.in 2010-04-26 22:10:54.000000000 +0200
-+++ gnome-system-tools-2.30.1/src/users/Makefile.in 2010-05-05 17:13:05.625539462 +0200
-@@ -45,7 +45,11 @@
+Index: b/src/users/Makefile.in
+===================================================================
+--- a/src/users/Makefile.in 2010-05-05 19:39:04.018095776 +0200
++++ b/src/users/Makefile.in 2010-05-05 19:38:55.934089838 +0200
+@@ -45,7 +45,10 @@
bin_PROGRAMS = users-admin$(EXEEXT)
subdir = src/users
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/libtool.m4 \
++am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+ $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -203,7 +207,6 @@
+@@ -203,7 +206,6 @@
GST_CFLAGS = @GST_CFLAGS@
GST_DEPENDS_CFLAGS = @GST_DEPENDS_CFLAGS@
GST_DEPENDS_LIBS = @GST_DEPENDS_LIBS@
More information about the pkg-gnome-commits
mailing list