r26916 - in /desktop/unstable/gnome-vfs/debian: changelog control control.in patches/90_relibtoolize.patch patches/99_ltmain_as-needed.patch patches/series rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Mar 16 15:50:02 UTC 2011
Author: biebl
Date: Wed Mar 16 15:50:01 2011
New Revision: 26916
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26916
Log:
Revert the switch to dh-autoreconf
The cdbs integration seems to be broken.
Added:
desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch
Modified:
desktop/unstable/gnome-vfs/debian/changelog
desktop/unstable/gnome-vfs/debian/control
desktop/unstable/gnome-vfs/debian/control.in
desktop/unstable/gnome-vfs/debian/patches/series
desktop/unstable/gnome-vfs/debian/rules
Modified: desktop/unstable/gnome-vfs/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/changelog?rev=26916&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/changelog [utf-8] Wed Mar 16 15:50:01 2011
@@ -7,12 +7,6 @@
- Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk from debian/rules.
* Fix debian/watch.
* Bump Standards-Version to 3.9.1. No further changes.
- * Use dh-autoreconf
- - Add Build-Depends on dh-autoreconf.
- - Add /usr/share/cdbs/1/rules/autoreconf.mk to debian/rules.
- - Remove --as-needed from debian/rules.
- - Drop debian/patches/90_relibtoolize.patch and
- debian/patches/99_ltmain_as-needed.patch.
* Refresh debian/patches/24_home_dir_fakeroot.patch.
* Link libgnomevfs against libgcrypt. Closes: #554667
- Update GnuTLS configure check to also check for libgcrypt using
Modified: desktop/unstable/gnome-vfs/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/control?rev=26916&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/control [utf-8] Wed Mar 16 15:50:01 2011
@@ -9,7 +9,6 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>, Otavio Salvador <otavio at debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: cdbs,
- dh-autoreconf,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
libgconf2-dev (>= 2.8.0),
Modified: desktop/unstable/gnome-vfs/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/control.in?rev=26916&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/control.in [utf-8] Wed Mar 16 15:50:01 2011
@@ -4,7 +4,6 @@
Maintainer: Josselin Mouette <joss at debian.org>
Uploaders: @GNOME_TEAM@
Build-Depends: cdbs,
- dh-autoreconf,
gtk-doc-tools (>= 1.0),
libglib2.0-dev (>= 2.9.3),
libgconf2-dev (>= 2.8.0),
Added: desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch?rev=26916&op=file
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch (added)
+++ desktop/unstable/gnome-vfs/debian/patches/90_relibtoolize.patch [utf-8] Wed Mar 16 15:50:01 2011
@@ -1,0 +1,7055 @@
+cp /usr/share/gtk-doc/data/gtk-doc.make .
+autoreconf -fiv
+rm -rf autom4te.cache config.h.in~
+
+Index: gnome-vfs-2.24.4/INSTALL
+===================================================================
+--- gnome-vfs-2.24.4.orig/INSTALL 2011-03-16 16:48:06.309009688 +0100
++++ gnome-vfs-2.24.4/INSTALL 2011-03-16 16:47:42.065009687 +0100
+@@ -1,13 +1,25 @@
+-Copyright 1994, 1995, 1996, 1999, 2000, 2001, 2002 Free Software
+-Foundation, Inc.
++Installation Instructions
++*************************
+
+- This file is free documentation; the Free Software Foundation gives
+-unlimited permission to copy, distribute and modify it.
++Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
++2006, 2007, 2008, 2009 Free Software Foundation, Inc.
++
++ 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
+ ==================
+
+- These are generic installation instructions.
++ Briefly, the shell commands `./configure; make; make install' should
++configure, build, and install this package. The following
++more-detailed instructions are generic; see the `README' file for
++instructions specific to this package. 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
+@@ -20,9 +32,9 @@
+
+ It can also use an optional file (typically called `config.cache'
+ and enabled with `--cache-file=config.cache' or simply `-C') that saves
+-the results of its tests to speed up reconfiguring. (Caching is
++the results of its tests to speed up reconfiguring. Caching is
+ disabled by default to prevent problems with accidental use of stale
+-cache files.)
++cache files.
+
+ If you need to do unusual things to compile the package, please try
+ to figure out how `configure' could check whether to do them, and mail
+@@ -32,30 +44,37 @@
+ may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+-`configure' by a program called `autoconf'. You only need
+-`configure.ac' if you want to change it or regenerate `configure' using
+-a newer version of `autoconf'.
++`configure' by a program called `autoconf'. You need `configure.ac' if
++you want to change it or regenerate `configure' using a newer version
++of `autoconf'.
+
+-The simplest way to compile this package is:
++ The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+- `./configure' to configure the package for your system. If you're
+- using `csh' on an old version of System V, you might need to type
+- `sh ./configure' instead to prevent `csh' from trying to execute
+- `configure' itself.
++ `./configure' to configure the package for your system.
+
+- Running `configure' takes awhile. While running, it prints some
+- messages telling which features it is checking for.
++ Running `configure' might take a while. While running, it prints
++ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 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
+@@ -64,6 +83,16 @@
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
++ 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
+ =====================
+
+@@ -75,7 +104,7 @@
+ by setting variables in the command line or in the environment. Here
+ is an example:
+
+- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
++ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+@@ -84,44 +113,89 @@
+
+ You can compile the package for more than one kind of computer at the
+ same time, by placing the object files for each architecture in their
+-own directory. To do this, you must use a version of `make' that
+-supports the `VPATH' variable, such as GNU `make'. `cd' to the
++own directory. To do this, you can use GNU `make'. `cd' to the
+ directory where you want the object files and executables to go and run
+ the `configure' script. `configure' automatically checks for the
+-source code in the directory that `configure' is in and in `..'.
++source code in the directory that `configure' is in and in `..'. This
++is known as a "VPATH" build.
+
+- If you have to use a `make' that does not support the `VPATH'
+-variable, you have to compile the package for one architecture at a
+-time in the source code directory. After you have installed the
+-package for one architecture, use `make distclean' before reconfiguring
+-for another architecture.
++ With a non-GNU `make', it is safer to compile the package for one
++architecture at a time in the source code directory. After you have
++installed the package for one architecture, use `make distclean' before
++reconfiguring for another architecture.
++
++ On MacOS X 10.5 and later systems, you can create libraries and
++executables that work on multiple system types--known as "fat" or
++"universal" binaries--by specifying multiple `-arch' options to the
++compiler but only a single `-arch' option to the preprocessor. Like
++this:
++
++ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
++ CPP="gcc -E" CXXCPP="g++ -E"
++
++ This is not guaranteed to produce working output in all cases, you
++may have to build one architecture at a time and combine the results
++using the `lipo' tool if you have problems.
+
+ Installation Names
+ ==================
+
+- By default, `make install' will install the package's files in
+-`/usr/local/bin', `/usr/local/man', etc. You can specify an
+-installation prefix other than `/usr/local' by giving `configure' the
+-option `--prefix=PATH'.
++ 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', where PREFIX must be an
++absolute file name.
+
+ You can specify separate installation prefixes for
+ architecture-specific files and architecture-independent files. If you
+-give `configure' the option `--exec-prefix=PATH', the package will use
+-PATH as the prefix for installing programs and libraries.
+-Documentation and other data files will still use the regular prefix.
++pass the option `--exec-prefix=PREFIX' to `configure', the package uses
++PREFIX as the prefix for installing programs and libraries.
++Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+-options like `--bindir=PATH' to specify different values for particular
++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
+@@ -134,6 +208,45 @@
+ 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
++==================
++
++ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
++CC is not installed, it is recommended to use the following options in
++order to use an ANSI C compiler:
++
++ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
++
++and if that doesn't work, install pre-built binaries of GCC for HP-UX.
++
++ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
++parse its `<wchar.h>' header file. The option `-nodtk' can be used as
++a workaround. If GNU CC is not installed, it is therefore recommended
++to try
++
++ ./configure CC="cc"
++
++and if that doesn't work, try
++
++ ./configure CC="cc -nodtk"
++
++ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
++directory contains several dysfunctional programs; working variants of
++these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
++in your `PATH', put it _after_ `/usr/bin'.
++
++ On Haiku, software installed for all users goes in `/boot/common',
++not `/usr/local'. It is recommended to use the following options:
++
++ ./configure --prefix=/boot/common
++
+ Specifying the System Type
+ ==========================
+
+@@ -149,14 +262,15 @@
+
+ where SYSTEM can have one of these forms:
+
+- OS KERNEL-OS
++ OS
++ KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+ `config.sub' isn't included in this package, then this package doesn't
+ need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+-use the `--target=TYPE' option to select the type of system they will
++use the option `--target=TYPE' to select the type of system they will
+ produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+@@ -186,9 +300,14 @@
+
+ ./configure CC=/usr/local2/bin/gcc
+
+-will cause the specified gcc to be used as the C compiler (unless it is
++causes the specified `gcc' to be used as the C compiler (unless it is
+ overridden in the site shell script).
+
++Unfortunately, this technique does not work for `CONFIG_SHELL' due to
++an Autoconf bug. Until the bug is fixed you can use this workaround:
++
++ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
++
+ `configure' Invocation
+ ======================
+
+@@ -197,7 +316,14 @@
+
+ `--help'
+ `-h'
+- Print a summary of the options to `configure', and exit.
++ Print a summary of all of the options to `configure', and exit.
++
++`--help=short'
++`--help=recursive'
++ Print a summary of the options unique to this package's
++ `configure', and exit. The `short' variant lists options used
++ only in the top level, while the `recursive' variant lists options
++ also present in any nested packages.
+
+ `--version'
+ `-V'
+@@ -224,6 +350,16 @@
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
++`--prefix=DIR'
++ Use DIR as the installation prefix. *note Installation Names::
++ for more details, including other options available for fine-tuning
++ the installation locations.
++
++`--no-create'
++`-n'
++ Run the configure checks, but stop before creating any output
++ files.
++
+ `configure' also accepts some other, not widely useful, options. Run
+ `configure --help' for more details.
+
+Index: gnome-vfs-2.24.4/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/Makefile.in 2011-03-16 16:48:04.849009688 +0100
++++ gnome-vfs-2.24.4/Makefile.in 2011-03-16 16:47:42.149009687 +0100
+@@ -206,6 +206,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -220,7 +223,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -283,6 +285,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/aclocal.m4
+===================================================================
+--- gnome-vfs-2.24.4.orig/aclocal.m4 2011-03-16 16:48:05.549009688 +0100
++++ gnome-vfs-2.24.4/aclocal.m4 2011-03-16 16:47:34.977009687 +0100
+@@ -19,987 +19,1041 @@
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+
+-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++dnl AM_GCONF_SOURCE_2
++dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
++dnl (i.e. pass to gconftool-2
++dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
++dnl you should install foo.schemas files
++dnl
+
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-# (This private macro should not be called outside this file.)
+-AC_DEFUN([AM_AUTOMAKE_VERSION],
+-[am__api_version='1.11'
+-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+-dnl require some minimum version. Point them to the right macro.
+-m4_if([$1], [1.11.1], [],
+- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+-])
++AC_DEFUN([AM_GCONF_SOURCE_2],
++[
++ if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
++ GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
++ else
++ GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
++ fi
+
+-# _AM_AUTOCONF_VERSION(VERSION)
+-# -----------------------------
+-# aclocal traces this macro to find the Autoconf version.
+-# This is a private macro too. Using m4_define simplifies
+-# the logic in aclocal, which can simply ignore this definition.
+-m4_define([_AM_AUTOCONF_VERSION], [])
++ AC_ARG_WITH([gconf-source],
++ AC_HELP_STRING([--with-gconf-source=sourceaddress],
++ [Config database for installing schema files.]),
++ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
+-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+-m4_ifndef([AC_AUTOCONF_VERSION],
+- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
++ AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
++ AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
++ if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
++ GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
++ fi
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ AC_ARG_WITH([gconf-schema-file-dir],
++ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
++ [Directory for installing schema files.]),
++ [GCONF_SCHEMA_FILE_DIR="$withval"],)
+
+-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
+-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++ AC_SUBST(GCONF_SCHEMA_FILE_DIR)
++ AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++
++ AC_ARG_ENABLE(schemas-install,
++ AC_HELP_STRING([--disable-schemas-install],
++ [Disable the schemas installation]),
++ [case ${enableval} in
++ yes|no) ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
++ esac])
++ AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++])
++
++# Copyright (C) 1995-2002 Free Software Foundation, Inc.
++# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+ #
+-# Of course, Automake must honor this variable whenever it calls a
+-# tool from the auxiliary directory. The problem is that $srcdir (and
+-# therefore $ac_aux_dir as well) can be either absolute or relative,
+-# depending on how configure is run. This is pretty annoying, since
+-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+-# source directory, any form will work fine, but in subdirectories a
+-# relative path needs to be adjusted first.
++# This file is free software, distributed under the terms of the GNU
++# General Public License. As a special exception to the GNU General
++# Public License, this file may be distributed as part of a program
++# that contains a configuration script generated by Autoconf, under
++# the same distribution terms as the rest of that program.
+ #
+-# $ac_aux_dir/missing
+-# fails when called from a subdirectory if $ac_aux_dir is relative
+-# $top_srcdir/$ac_aux_dir/missing
+-# fails if $ac_aux_dir is absolute,
+-# fails when called from a subdirectory in a VPATH build with
+-# a relative $ac_aux_dir
++# This file can be copied and used freely without restrictions. It can
++# be used in projects which are not available under the GNU Public License
++# but which still want to provide support for the GNU gettext functionality.
+ #
+-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+-# are both prefixed by $srcdir. In an in-source build this is usually
+-# harmless because $srcdir is `.', but things will broke when you
+-# start a VPATH build or use an absolute $srcdir.
++# Macro to add for using GNU gettext.
++# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+ #
+-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
+-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+-# and then we would define $MISSING as
+-# MISSING="\${SHELL} $am_aux_dir/missing"
+-# This will work as long as MISSING is not called from configure, because
+-# unfortunately $(top_srcdir) has no meaning in configure.
+-# However there are other variables, like CC, which are often used in
+-# configure, and could therefore not use this "fixed" $ac_aux_dir.
++# Modified to never use included libintl.
++# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+ #
+-# Another solution, used here, is to always expand $ac_aux_dir to an
+-# absolute PATH. The drawback is that using absolute paths prevent a
+-# configured tree to be moved without reconfiguration.
+-
+-AC_DEFUN([AM_AUX_DIR_EXPAND],
+-[dnl Rely on autoconf to set up CDPATH properly.
+-AC_PREREQ([2.50])dnl
+-# expand $ac_aux_dir to an absolute path
+-am_aux_dir=`cd $ac_aux_dir && pwd`
+-])
+-
+-# AM_CONDITIONAL -*- Autoconf -*-
+-
+-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+-# Free Software Foundation, Inc.
++# Major rework to remove unused code
++# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+ #
+-# 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.
++# Added better handling of ALL_LINGUAS from GNU gettext version
++# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
++#
++# Modified to require ngettext
++# Matthias Clasen <mclasen at redhat.com> 08/06/2004
++#
++# We need this here as well, since someone might use autoconf-2.5x
++# to configure GLib then an older version to configure a package
++# using AM_GLIB_GNU_GETTEXT
++AC_PREREQ(2.53)
+
+-# serial 9
++dnl
++dnl We go to great lengths to make sure that aclocal won't
++dnl try to pull in the installed version of these macros
++dnl when running aclocal in the glib directory.
++dnl
++m4_copy([AC_DEFUN],[glib_DEFUN])
++m4_copy([AC_REQUIRE],[glib_REQUIRE])
++dnl
++dnl At the end, if we're not within glib, we'll define the public
++dnl definitions in terms of our private definitions.
++dnl
+
+-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+-# -------------------------------------
+-# Define a conditional.
+-AC_DEFUN([AM_CONDITIONAL],
+-[AC_PREREQ(2.52)dnl
+- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
+- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+-AC_SUBST([$1_TRUE])dnl
+-AC_SUBST([$1_FALSE])dnl
+-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+-m4_define([_AM_COND_VALUE_$1], [$2])dnl
+-if $2; then
+- $1_TRUE=
+- $1_FALSE='#'
++# GLIB_LC_MESSAGES
++#--------------------
++glib_DEFUN([GLIB_LC_MESSAGES],
++ [AC_CHECK_HEADERS([locale.h])
++ if test $ac_cv_header_locale_h = yes; then
++ AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
++ [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
++ am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
++ if test $am_cv_val_LC_MESSAGES = yes; then
++ AC_DEFINE(HAVE_LC_MESSAGES, 1,
++ [Define if your <locale.h> file defines LC_MESSAGES.])
++ fi
++ fi])
++
++# GLIB_PATH_PROG_WITH_TEST
++#----------------------------
++dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
++dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
++glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
++[# Extract the first word of "$2", so it can be a program name with args.
++set dummy $2; ac_word=[$]2
++AC_MSG_CHECKING([for $ac_word])
++AC_CACHE_VAL(ac_cv_path_$1,
++[case "[$]$1" in
++ /*)
++ ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
++ for ac_dir in ifelse([$5], , $PATH, [$5]); do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ if [$3]; then
++ ac_cv_path_$1="$ac_dir/$ac_word"
++ break
++ fi
++ fi
++ done
++ IFS="$ac_save_ifs"
++dnl If no 4th arg is given, leave the cache variable unset,
++dnl so AC_PATH_PROGS will keep looking.
++ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
++])dnl
++ ;;
++esac])dnl
++$1="$ac_cv_path_$1"
++if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
++ AC_MSG_RESULT([$]$1)
+ else
+- $1_TRUE='#'
+- $1_FALSE=
++ AC_MSG_RESULT(no)
+ fi
+-AC_CONFIG_COMMANDS_PRE(
+-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+- AC_MSG_ERROR([[conditional "$1" was never defined.
+-Usually this means the macro was only invoked conditionally.]])
+-fi])])
+-
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# serial 10
++AC_SUBST($1)dnl
++])
+
+-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+-# written in clear, in which case automake, when reading aclocal.m4,
+-# will think it sees a *use*, and therefore will trigger all it's
+-# C support machinery. Also note that it means that autoscan, seeing
+-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
++# GLIB_WITH_NLS
++#-----------------
++glib_DEFUN([GLIB_WITH_NLS],
++ dnl NLS is obligatory
++ [USE_NLS=yes
++ AC_SUBST(USE_NLS)
+
++ gt_cv_have_gettext=no
+
+-# _AM_DEPENDENCIES(NAME)
+-# ----------------------
+-# See how the compiler implements dependency checking.
+-# NAME is "CC", "CXX", "GCJ", or "OBJC".
+-# We try a few techniques and use that to set a single cache variable.
+-#
+-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+-# dependency, and given that the user is not expected to run this macro,
+-# just rely on AC_PROG_CC.
+-AC_DEFUN([_AM_DEPENDENCIES],
+-[AC_REQUIRE([AM_SET_DEPDIR])dnl
+-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+-AC_REQUIRE([AM_DEP_TRACK])dnl
+-
+-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
+- [$1], CXX, [depcc="$CXX" am_compiler_list=],
+- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+- [$1], UPC, [depcc="$UPC" am_compiler_list=],
+- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
+- [depcc="$$1" am_compiler_list=])
+-
+-AC_CACHE_CHECK([dependency style of $depcc],
+- [am_cv_$1_dependencies_compiler_type],
+-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+- # We make a subdir and do the tests there. Otherwise we can end up
+- # making bogus files that we don't know about and never remove. For
+- # instance it was reported that on HP-UX the gcc test will end up
+- # making a dummy file named `D' -- because `-MD' means `put the output
+- # in D'.
+- mkdir conftest.dir
+- # Copy depcomp to subdir because otherwise we won't find it if we're
+- # using a relative directory.
+- cp "$am_depcomp" conftest.dir
+- cd conftest.dir
+- # We will build objects and dependencies in a subdirectory because
+- # it helps to detect inapplicable dependency modes. For instance
+- # both Tru64's cc and ICC support -MD to output dependencies as a
+- # side effect of compilation, but ICC will put the dependencies in
+- # the current directory while Tru64 will put them in the object
+- # directory.
+- mkdir sub
+-
+- am_cv_$1_dependencies_compiler_type=none
+- if test "$am_compiler_list" = ""; then
+- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+- fi
+- am__universal=false
+- m4_case([$1], [CC],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac],
+- [CXX],
+- [case " $depcc " in #(
+- *\ -arch\ *\ -arch\ *) am__universal=true ;;
+- esac])
++ CATOBJEXT=NONE
++ XGETTEXT=:
++ INTLLIBS=
+
+- for depmode in $am_compiler_list; do
+- # Setup a source with many dependencies, because some compilers
+- # like to wrap large dependency lists on column 80 (with \), and
+- # we should not choose a depcomp mode which is confused by this.
+- #
+- # We need to recreate these files for each test, as the compiler may
+- # overwrite some of them when testing with obscure command lines.
+- # This happens at least with the AIX C compiler.
+- : > sub/conftest.c
+- for i in 1 2 3 4 5 6; do
+- echo '#include "conftst'$i'.h"' >> sub/conftest.c
+- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+- # Solaris 8's {/usr,}/bin/sh.
+- touch sub/conftst$i.h
+- done
+- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++ AC_CHECK_HEADER(libintl.h,
++ [gt_cv_func_dgettext_libintl="no"
++ libintl_extra_libs=""
+
+- # We check with `-c' and `-o' for the sake of the "dashmstdout"
+- # mode. It turns out that the SunPro C++ compiler does not properly
+- # handle `-M -o', and we need to detect this. Also, some Intel
+- # versions had trouble with output in subdirs
+- am__obj=sub/conftest.${OBJEXT-o}
+- am__minus_obj="-o $am__obj"
+- case $depmode in
+- gcc)
+- # This depmode causes a compiler race in universal mode.
+- test "$am__universal" = false || continue
+- ;;
+- nosideeffect)
+- # after this tag, mechanisms are not by side-effect, so they'll
+- # only be used when explicitly requested
+- if test "x$enable_dependency_tracking" = xyes; then
+- continue
+- else
+- break
++ #
++ # First check in libc
++ #
++ AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !ngettext ("","", 1)],
++ gt_cv_func_ngettext_libc=yes,
++ gt_cv_func_ngettext_libc=no)
++ ])
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
++ [AC_TRY_LINK([
++#include <libintl.h>
++],
++ [return !dgettext ("","")],
++ gt_cv_func_dgettext_libc=yes,
++ gt_cv_func_dgettext_libc=no)
++ ])
+ fi
+- ;;
+- msvisualcpp | msvcmsys)
+- # This compiler won't grok `-c -o', but also, the minuso test has
+- # not run yet. These depmodes are late enough in the game, and
+- # so weak that their functioning should not be impacted.
+- am__obj=conftest.${OBJEXT-o}
+- am__minus_obj=
+- ;;
+- none) break ;;
+- esac
+- if depmode=$depmode \
+- source=sub/conftest.c object=$am__obj \
+- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
+- >/dev/null 2>conftest.err &&
+- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
+- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+- # icc doesn't choke on unknown options, it will just issue warnings
+- # or remarks (even with -Werror). So we grep stderr for any message
+- # that says an option was ignored or not supported.
+- # When given -MP, icc 7.0 and 7.1 complain thusly:
+- # icc: Command line warning: ignoring option '-M'; no argument required
+- # The diagnosis changed in icc 8.0:
+- # icc: Command line remark: option '-MP' not supported
+- if (grep 'ignoring option' conftest.err ||
+- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+- am_cv_$1_dependencies_compiler_type=$depmode
+- break
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
+ fi
+- fi
+- done
+-
+- cd ..
+- rm -rf conftest.dir
+-else
+- am_cv_$1_dependencies_compiler_type=none
+-fi
+-])
+-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+-AM_CONDITIONAL([am__fastdep$1], [
+- test "x$enable_dependency_tracking" != xno \
+- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
+-])
+-
+-
+-# AM_SET_DEPDIR
+-# -------------
+-# Choose a directory name for dependency files.
+-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+-AC_DEFUN([AM_SET_DEPDIR],
+-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
+-])
+
++ #
++ # If we don't have everything we want, check in libintl
++ #
++ if test "$gt_cv_func_dgettext_libc" != "yes" \
++ || test "$gt_cv_func_ngettext_libc" != "yes" \
++ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
++
++ AC_CHECK_LIB(intl, bindtextdomain,
++ [AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dgettext,
++ gt_cv_func_dgettext_libintl=yes)])])
+
+-# AM_DEP_TRACK
+-# ------------
+-AC_DEFUN([AM_DEP_TRACK],
+-[AC_ARG_ENABLE(dependency-tracking,
+-[ --disable-dependency-tracking speeds up one-time build
+- --enable-dependency-tracking do not reject slow dependency extractors])
+-if test "x$enable_dependency_tracking" != xno; then
+- am_depcomp="$ac_aux_dir/depcomp"
+- AMDEPBACKSLASH='\'
+-fi
+-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+-AC_SUBST([AMDEPBACKSLASH])dnl
+-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+-])
++ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
++ AC_MSG_CHECKING([if -liconv is needed to use gettext])
++ AC_MSG_RESULT([])
++ AC_CHECK_LIB(intl, ngettext,
++ [AC_CHECK_LIB(intl, dcgettext,
++ [gt_cv_func_dgettext_libintl=yes
++ libintl_extra_libs=-liconv],
++ :,-liconv)],
++ :,-liconv)
++ fi
+
+-# Generate code to set up dependency tracking. -*- Autoconf -*-
++ #
++ # If we found libintl, then check in it for bind_textdomain_codeset();
++ # we'll prefer libc if neither have bind_textdomain_codeset(),
++ # and both have dgettext and ngettext
++ #
++ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS -lintl $libintl_extra_libs"
++ unset ac_cv_func_bind_textdomain_codeset
++ AC_CHECK_FUNCS(bind_textdomain_codeset)
++ LIBS="$glib_save_LIBS"
+
+-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
++ gt_cv_func_dgettext_libc=no
++ else
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ && test "$gt_cv_func_ngettext_libc" = "yes"; then
++ gt_cv_func_dgettext_libintl=no
++ fi
++ fi
++ fi
++ fi
+
+-#serial 5
++ if test "$gt_cv_func_dgettext_libc" = "yes" \
++ || test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ gt_cv_have_gettext=yes
++ fi
++
++ if test "$gt_cv_func_dgettext_libintl" = "yes"; then
++ INTLLIBS="-lintl $libintl_extra_libs"
++ fi
++
++ if test "$gt_cv_have_gettext" = "yes"; then
++ AC_DEFINE(HAVE_GETTEXT,1,
++ [Define if the GNU gettext() function is already present or preinstalled.])
++ GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
++ AC_CHECK_FUNCS(dcgettext)
++ MSGFMT_OPTS=
++ AC_MSG_CHECKING([if msgfmt accepts -c])
++ GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
++msgid ""
++msgstr ""
++"Content-Type: text/plain; charset=UTF-8\n"
++"Project-Id-Version: test 1.0\n"
++"PO-Revision-Date: 2007-02-15 12:01+0100\n"
++"Last-Translator: test <foo at bar.xx>\n"
++"Language-Team: C <LL at li.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Transfer-Encoding: 8bit\n"
++], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
++ AC_SUBST(MSGFMT_OPTS)
++ AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
++ GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
++ [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
++ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++ return _nl_msg_cat_cntr],
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [case $host in
++ *-*-solaris*)
++ dnl On Solaris, if bind_textdomain_codeset is in libc,
++ dnl GNU format message catalog is always supported,
++ dnl since both are added to the libc all together.
++ dnl Hence, we'd like to go with DATADIRNAME=share and
++ dnl and CATOBJEXT=.gmo in this case.
++ AC_CHECK_FUNC(bind_textdomain_codeset,
++ [CATOBJEXT=.gmo
++ DATADIRNAME=share],
++ [CATOBJEXT=.mo
++ DATADIRNAME=lib])
++ ;;
++ *)
++ CATOBJEXT=.mo
++ DATADIRNAME=lib
++ ;;
++ esac])
++ LIBS="$glib_save_LIBS"
++ INSTOBJEXT=.mo
++ else
++ gt_cv_have_gettext=no
++ fi
++ fi
++ ])
+
+-# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-# ------------------------------
+-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[{
+- # Autoconf 2.62 quotes --file arguments for eval, but not when files
+- # are listed without --file. Let's play safe and only enable the eval
+- # if we detect the quoting.
+- case $CONFIG_FILES in
+- *\'*) eval set x "$CONFIG_FILES" ;;
+- *) set x $CONFIG_FILES ;;
+- esac
+- shift
+- for mf
+- do
+- # Strip MF so we end up with the name of the file.
+- mf=`echo "$mf" | sed -e 's/:.*$//'`
+- # Check whether this is an Automake generated Makefile or not.
+- # We used to match only the files named `Makefile.in', but
+- # some people rename them; so instead we look at the file content.
+- # Grep'ing the first line is not enough: some people post-process
+- # each Makefile.in and add a new line on top of each file to say so.
+- # Grep'ing the whole file is not good either: AIX grep has a line
+- # limit of 2048, but all sed's we know have understand at least 4000.
+- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
+- dirpart=`AS_DIRNAME("$mf")`
+- else
+- continue
++ if test "$gt_cv_have_gettext" = "yes" ; then
++ AC_DEFINE(ENABLE_NLS, 1,
++ [always defined to indicate that i18n is enabled])
+ fi
+- # Extract the definition of DEPDIR, am__include, and am__quote
+- # from the Makefile without running `make'.
+- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
+- test -z "$DEPDIR" && continue
+- am__include=`sed -n 's/^am__include = //p' < "$mf"`
+- test -z "am__include" && continue
+- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
+- # When using ansi2knr, U may be empty or an underscore; expand it
+- U=`sed -n 's/^U = //p' < "$mf"`
+- # Find all dependency output files, they are included files with
+- # $(DEPDIR) in their names. We invoke sed twice because it is the
+- # simplest approach to changing $(DEPDIR) to its actual value in the
+- # expansion.
+- for file in `sed -n "
+- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
+- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+- # Make sure the directory exists.
+- test -f "$dirpart/$file" && continue
+- fdir=`AS_DIRNAME(["$file"])`
+- AS_MKDIR_P([$dirpart/$fdir])
+- # echo "creating $dirpart/$file"
+- echo '# dummy' > "$dirpart/$file"
+- done
+- done
+-}
+-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+-
+
+-# AM_OUTPUT_DEPENDENCY_COMMANDS
+-# -----------------------------
+-# This macro should only be invoked once -- use via AC_REQUIRE.
+-#
+-# This code is only required when automatic dependency tracking
+-# is enabled. FIXME. This creates each `.P' file that we will
+-# need in order to bootstrap the dependency handling code.
+-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+-[AC_CONFIG_COMMANDS([depfiles],
+- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+-])
++ dnl Test whether we really found GNU xgettext.
++ if test "$XGETTEXT" != ":"; then
++ dnl If it is not GNU xgettext we define it as : so that the
++ dnl Makefiles still can work.
++ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
++ : ;
++ else
++ AC_MSG_RESULT(
++ [found xgettext program is not GNU xgettext; ignore it])
++ XGETTEXT=":"
++ fi
++ fi
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ # We need to process the po/ directory.
++ POSUB=po
+
+-# serial 8
++ AC_OUTPUT_COMMANDS(
++ [case "$CONFIG_FILES" in *po/Makefile.in*)
++ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
++ esac])
+
+-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
+-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++ dnl These rules are solely for the distribution goal. While doing this
++ dnl we only have to keep exactly one list of the available catalogs
++ dnl in configure.ac.
++ for lang in $ALL_LINGUAS; do
++ GMOFILES="$GMOFILES $lang.gmo"
++ POFILES="$POFILES $lang.po"
++ done
+
+-# Do all the work for Automake. -*- Autoconf -*-
++ dnl Make all variables we use known to autoconf.
++ AC_SUBST(CATALOGS)
++ AC_SUBST(CATOBJEXT)
++ AC_SUBST(DATADIRNAME)
++ AC_SUBST(GMOFILES)
++ AC_SUBST(INSTOBJEXT)
++ AC_SUBST(INTLLIBS)
++ AC_SUBST(PO_IN_DATADIR_TRUE)
++ AC_SUBST(PO_IN_DATADIR_FALSE)
++ AC_SUBST(POFILES)
++ AC_SUBST(POSUB)
++ ])
+
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# AM_GLIB_GNU_GETTEXT
++# -------------------
++# Do checks necessary for use of gettext. If a suitable implementation
++# of gettext is found in either in libintl or in the C library,
++# it will set INTLLIBS to the libraries needed for use of gettext
++# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
++# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
++# on various variables needed by the Makefile.in.in installed by
++# glib-gettextize.
++dnl
++glib_DEFUN([GLIB_GNU_GETTEXT],
++ [AC_REQUIRE([AC_PROG_CC])dnl
++ AC_REQUIRE([AC_HEADER_STDC])dnl
++
++ GLIB_LC_MESSAGES
++ GLIB_WITH_NLS
+
+-# serial 16
++ if test "$gt_cv_have_gettext" = "yes"; then
++ if test "x$ALL_LINGUAS" = "x"; then
++ LINGUAS=
++ else
++ AC_MSG_CHECKING(for catalogs to be installed)
++ NEW_LINGUAS=
++ for presentlang in $ALL_LINGUAS; do
++ useit=no
++ if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
++ desiredlanguages="$LINGUAS"
++ else
++ desiredlanguages="$ALL_LINGUAS"
++ fi
++ for desiredlang in $desiredlanguages; do
++ # Use the presentlang catalog if desiredlang is
++ # a. equal to presentlang, or
++ # b. a variant of presentlang (because in this case,
++ # presentlang can be used as a fallback for messages
++ # which are not translated in the desiredlang catalog).
++ case "$desiredlang" in
++ "$presentlang"*) useit=yes;;
++ esac
++ done
++ if test $useit = yes; then
++ NEW_LINGUAS="$NEW_LINGUAS $presentlang"
++ fi
++ done
++ LINGUAS=$NEW_LINGUAS
++ AC_MSG_RESULT($LINGUAS)
++ fi
+
+-# This macro actually does too much. Some checks are only needed if
+-# your package does certain things. But this isn't really a big deal.
++ dnl Construct list of names of catalog files to be constructed.
++ if test -n "$LINGUAS"; then
++ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
++ fi
++ fi
+
+-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+-# AM_INIT_AUTOMAKE([OPTIONS])
+-# -----------------------------------------------
+-# The call with PACKAGE and VERSION arguments is the old style
+-# call (pre autoconf-2.50), which is being phased out. PACKAGE
+-# and VERSION should now be passed to AC_INIT and removed from
+-# the call to AM_INIT_AUTOMAKE.
+-# We support both call styles for the transition. After
+-# the next Automake release, Autoconf can make the AC_INIT
+-# arguments mandatory, and then we can depend on a new Autoconf
+-# release and drop the old call support.
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_PREREQ([2.62])dnl
+-dnl Autoconf wants to disallow AM_ names. We explicitly allow
+-dnl the ones we care about.
+-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])dnl
+-if test "`cd $srcdir && pwd`" != "`pwd`"; then
+- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+- # is not polluted with repeated "-I."
+- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+- # test to see if srcdir already configured
+- if test -f $srcdir/config.status; then
+- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+- fi
+-fi
++ dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
++ dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
++ dnl Try to locate is.
++ MKINSTALLDIRS=
++ if test -n "$ac_aux_dir"; then
++ MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
++ fi
++ if test -z "$MKINSTALLDIRS"; then
++ MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
++ fi
++ AC_SUBST(MKINSTALLDIRS)
+
+-# test whether we have cygpath
+-if test -z "$CYGPATH_W"; then
+- if (cygpath --version) >/dev/null 2>/dev/null; then
+- CYGPATH_W='cygpath -w'
+- else
+- CYGPATH_W=echo
+- fi
+-fi
+-AC_SUBST([CYGPATH_W])
++ dnl Generate list of files to be processed by xgettext which will
++ dnl be included in po/Makefile.
++ test -d po || mkdir po
++ if test "x$srcdir" != "x."; then
++ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
++ posrcprefix="$srcdir/"
++ else
++ posrcprefix="../$srcdir/"
++ fi
++ else
++ posrcprefix="../"
++ fi
++ rm -f po/POTFILES
++ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
++ < $srcdir/po/POTFILES.in > po/POTFILES
++ ])
+
+-# Define the identity of the package.
+-dnl Distinguish between old-style and new-style calls.
+-m4_ifval([$2],
+-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+- AC_SUBST([PACKAGE], [$1])dnl
+- AC_SUBST([VERSION], [$2])],
+-[_AM_SET_OPTIONS([$1])dnl
+-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
+- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
++# -------------------------------
++# Define VARIABLE to the location where catalog files will
++# be installed by po/Makefile.
++glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
++[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
++glib_save_prefix="$prefix"
++glib_save_exec_prefix="$exec_prefix"
++glib_save_datarootdir="$datarootdir"
++test "x$prefix" = xNONE && prefix=$ac_default_prefix
++test "x$exec_prefix" = xNONE && exec_prefix=$prefix
++datarootdir=`eval echo "${datarootdir}"`
++if test "x$CATOBJEXT" = "x.mo" ; then
++ localedir=`eval echo "${libdir}/locale"`
++else
++ localedir=`eval echo "${datadir}/locale"`
++fi
++prefix="$glib_save_prefix"
++exec_prefix="$glib_save_exec_prefix"
++datarootdir="$glib_save_datarootdir"
++AC_DEFINE_UNQUOTED($1, "$localedir",
++ [Define the location where the catalogs will be installed])
++])
+
+-_AM_IF_OPTION([no-define],,
+-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++dnl
++dnl Now the definitions that aclocal will find
++dnl
++ifdef(glib_configure_ac,[],[
++AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
++AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
++])dnl
+
+-# Some tools Automake needs.
+-AC_REQUIRE([AM_SANITY_CHECK])dnl
+-AC_REQUIRE([AC_ARG_PROGRAM])dnl
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+-AM_MISSING_PROG(AUTOCONF, autoconf)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+-AM_MISSING_PROG(AUTOHEADER, autoheader)
+-AM_MISSING_PROG(MAKEINFO, makeinfo)
+-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
+-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
+-# We need awk for the "check" target. The system "awk" is bad on
+-# some platforms.
+-AC_REQUIRE([AC_PROG_AWK])dnl
+-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
+- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
+- [_AM_PROG_TAR([v7])])])
+-_AM_IF_OPTION([no-dependencies],,
+-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+- [_AM_DEPENDENCIES(CC)],
+- [define([AC_PROG_CC],
+- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+- [_AM_DEPENDENCIES(CXX)],
+- [define([AC_PROG_CXX],
+- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+- [_AM_DEPENDENCIES(OBJC)],
+- [define([AC_PROG_OBJC],
+- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
+-])
+-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
+-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
+-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
+-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
+-AC_CONFIG_COMMANDS_PRE(dnl
+-[m4_provide_if([_AM_COMPILER_EXEEXT],
+- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+-])
++# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
++#
++# Create a temporary file with TEST-FILE as its contents and pass the
++# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
++# 0 and perform ACTION-IF-FAIL for any other exit status.
++AC_DEFUN([GLIB_RUN_PROG],
++[cat >conftest.foo <<_ACEOF
++$2
++_ACEOF
++if AC_RUN_LOG([$1 conftest.foo]); then
++ m4_ifval([$3], [$3], [:])
++m4_ifvaln([$4], [else $4])dnl
++echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
++sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
++fi])
+
+-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
+-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
+-dnl mangled by Autoconf and run in a shell conditional statement.
+-m4_define([_AC_COMPILER_EXEEXT],
+-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
++# gnome-common.m4
++#
+
+-# When config.status generates a header, we must update the stamp-h file.
+-# This file resides in the same directory as the config header
+-# that is generated. The stamp files are numbered to have different names.
++dnl GNOME_COMMON_INIT
+
+-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
+-# loop where config.status creates the headers, so we can generate
+-# our stamp files there.
+-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
+-[# Compute $1's index in $config_headers.
+-_am_arg=$1
+-_am_stamp_count=1
+-for _am_header in $config_headers :; do
+- case $_am_header in
+- $_am_arg | $_am_arg:* )
+- break ;;
+- * )
+- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
+- esac
+-done
+-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
++AC_DEFUN([GNOME_COMMON_INIT],
++[
++ dnl this macro should come after AC_CONFIG_MACRO_DIR
++ AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
+-# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ dnl ensure that when the Automake generated makefile calls aclocal,
++ dnl it honours the $ACLOCAL_FLAGS environment variable
++ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
++ if test -n "$ac_macro_dir"; then
++ ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
++ fi
+
+-# AM_PROG_INSTALL_SH
+-# ------------------
+-# Define $install_sh.
+-AC_DEFUN([AM_PROG_INSTALL_SH],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-if test x"${install_sh}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
+- *)
+- install_sh="\${SHELL} $am_aux_dir/install-sh"
+- esac
+-fi
+-AC_SUBST(install_sh)])
++ AC_SUBST([ACLOCAL_AMFLAGS])
++])
+
+-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([GNOME_DEBUG_CHECK],
++[
++ AC_ARG_ENABLE([debug],
++ AC_HELP_STRING([--enable-debug],
++ [turn on debugging]),,
++ [enable_debug=no])
+
+-# serial 2
++ if test x$enable_debug = xyes ; then
++ AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
++ [Enable additional debugging at the expense of performance and size])
++ fi
++])
+
+-# Check whether the underlying file-system supports filenames
+-# with a leading dot. For instance MS-DOS doesn't.
+-AC_DEFUN([AM_SET_LEADING_DOT],
+-[rm -rf .tst 2>/dev/null
+-mkdir .tst 2>/dev/null
+-if test -d .tst; then
+- am__leading_dot=.
+-else
+- am__leading_dot=_
+-fi
+-rmdir .tst 2>/dev/null
+-AC_SUBST([am__leading_dot])])
++dnl GNOME_MAINTAINER_MODE_DEFINES ()
++dnl define DISABLE_DEPRECATED
++dnl
++AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
++[
++ AC_REQUIRE([AM_MAINTAINER_MODE])
+
+-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
+-# From Jim Meyering
++ DISABLE_DEPRECATED=""
++ if test $USE_MAINTAINER_MODE = yes; then
++ DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
++ for DOMAIN in $DOMAINS; do
++ DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
++ done
++ fi
+
+-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ AC_SUBST(DISABLE_DEPRECATED)
++])
+
+-# serial 5
++dnl GNOME_COMPILE_WARNINGS
++dnl Turn on many useful compiler warnings
++dnl For now, only works on GCC
++AC_DEFUN([GNOME_COMPILE_WARNINGS],[
++ dnl ******************************
++ dnl More compiler warnings
++ dnl ******************************
+
+-# AM_MAINTAINER_MODE([DEFAULT-MODE])
+-# ----------------------------------
+-# Control maintainer-specific portions of Makefiles.
+-# Default is to disable them, unless `enable' is passed literally.
+-# For symmetry, `disable' may be passed as well. Anyway, the user
+-# can override the default with the --enable/--disable switch.
+-AC_DEFUN([AM_MAINTAINER_MODE],
+-[m4_case(m4_default([$1], [disable]),
+- [enable], [m4_define([am_maintainer_other], [disable])],
+- [disable], [m4_define([am_maintainer_other], [enable])],
+- [m4_define([am_maintainer_other], [enable])
+- m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
+-AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
+- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
+- AC_ARG_ENABLE([maintainer-mode],
+-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
+- (and sometimes confusing) to the casual installer],
+- [USE_MAINTAINER_MODE=$enableval],
+- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
+- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
+- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
+- MAINT=$MAINTAINER_MODE_TRUE
+- AC_SUBST([MAINT])dnl
+-]
+-)
++ AC_ARG_ENABLE(compile-warnings,
++ AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
++ [Turn on compiler warnings]),,
++ [enable_compile_warnings="m4_default([$1],[yes])"])
+
+-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++ warnCFLAGS=
++ if test "x$GCC" != xyes; then
++ enable_compile_warnings=no
++ fi
+
+-# Check to see how 'make' treats includes. -*- Autoconf -*-
++ warning_flags=
++ realsave_CFLAGS="$CFLAGS"
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ case "$enable_compile_warnings" in
++ no)
++ warning_flags=
++ ;;
++ minimum)
++ warning_flags="-Wall"
++ ;;
++ yes)
++ warning_flags="-Wall -Wmissing-prototypes"
++ ;;
++ maximum|error)
++ warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
++ CFLAGS="$warning_flags $CFLAGS"
++ for option in -Wno-sign-compare; do
++ SAVE_CFLAGS="$CFLAGS"
++ CFLAGS="$CFLAGS $option"
++ AC_MSG_CHECKING([whether gcc understands $option])
++ AC_TRY_COMPILE([], [],
++ has_option=yes,
++ has_option=no,)
++ CFLAGS="$SAVE_CFLAGS"
++ AC_MSG_RESULT($has_option)
++ if test $has_option = yes; then
++ warning_flags="$warning_flags $option"
++ fi
++ unset has_option
++ unset SAVE_CFLAGS
++ done
++ unset option
++ if test "$enable_compile_warnings" = "error" ; then
++ warning_flags="$warning_flags -Werror"
++ fi
++ ;;
++ *)
++ AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
++ ;;
++ esac
++ CFLAGS="$realsave_CFLAGS"
++ AC_MSG_CHECKING(what warning flags to pass to the C compiler)
++ AC_MSG_RESULT($warning_flags)
+
+-# serial 4
++ AC_ARG_ENABLE(iso-c,
++ AC_HELP_STRING([--enable-iso-c],
++ [Try to warn if code is not ISO C ]),,
++ [enable_iso_c=no])
+
+-# AM_MAKE_INCLUDE()
+-# -----------------
+-# Check to see how make treats includes.
+-AC_DEFUN([AM_MAKE_INCLUDE],
+-[am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+- @echo this is the am__doit target
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-AC_MSG_CHECKING([for style of include used by $am_make])
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# Ignore all kinds of additional output from `make'.
+-case `$am_make -s -f confmf 2> /dev/null` in #(
+-*the\ am__doit\ target*)
+- am__include=include
+- am__quote=
+- _am_result=GNU
+- ;;
+-esac
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+- echo '.include "confinc"' > confmf
+- case `$am_make -s -f confmf 2> /dev/null` in #(
+- *the\ am__doit\ target*)
+- am__include=.include
+- am__quote="\""
+- _am_result=BSD
+- ;;
+- esac
+-fi
+-AC_SUBST([am__include])
+-AC_SUBST([am__quote])
+-AC_MSG_RESULT([$_am_result])
+-rm -f confinc confmf
++ AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
++ complCFLAGS=
++ if test "x$enable_iso_c" != "xno"; then
++ if test "x$GCC" = "xyes"; then
++ case " $CFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -ansi" ;;
++ esac
++ case " $CFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCFLAGS="$complCFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCFLAGS)
++
++ WARN_CFLAGS="$warning_flags $complCFLAGS"
++ AC_SUBST(WARN_CFLAGS)
+ ])
+
+-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
++dnl For C++, do basically the same thing.
+
+-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++AC_DEFUN([GNOME_CXX_WARNINGS],[
++ AC_ARG_ENABLE(cxx-warnings,
++ AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
++ [Turn on compiler warnings.]),,
++ [enable_cxx_warnings="m4_default([$1],[minimum])"])
+
+-# serial 6
++ AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
++ warnCXXFLAGS=
++ if test "x$GXX" != xyes; then
++ enable_cxx_warnings=no
++ fi
++ if test "x$enable_cxx_warnings" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-Wall[\ \ ]*) ;;
++ *) warnCXXFLAGS="-Wall -Wno-unused" ;;
++ esac
+
+-# AM_MISSING_PROG(NAME, PROGRAM)
+-# ------------------------------
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_REQUIRE([AM_MISSING_HAS_RUN])
+-$1=${$1-"${am_missing_run}$2"}
+-AC_SUBST($1)])
++ ## -W is not all that useful. And it cannot be controlled
++ ## with individual -Wno-xxx flags, unlike -Wall
++ if test "x$enable_cxx_warnings" = "xyes"; then
++ warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
++ fi
++ fi
++ fi
++ AC_MSG_RESULT($warnCXXFLAGS)
+
++ AC_ARG_ENABLE(iso-cxx,
++ AC_HELP_STRING([--enable-iso-cxx],
++ [Try to warn if code is not ISO C++ ]),,
++ [enable_iso_cxx=no])
+
+-# AM_MISSING_HAS_RUN
+-# ------------------
+-# Define MISSING if not defined so far and test if it supports --run.
+-# If it does, set am_missing_run to use it, otherwise, to nothing.
+-AC_DEFUN([AM_MISSING_HAS_RUN],
+-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+-AC_REQUIRE_AUX_FILE([missing])dnl
+-if test x"${MISSING+set}" != xset; then
+- case $am_aux_dir in
+- *\ * | *\ *)
+- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
+- *)
+- MISSING="\${SHELL} $am_aux_dir/missing" ;;
+- esac
+-fi
+-# Use eval to expand $SHELL
+-if eval "$MISSING --run true"; then
+- am_missing_run="$MISSING --run "
+-else
+- am_missing_run=
+- AC_MSG_WARN([`missing' script is too old or missing])
+-fi
+-])
++ AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
++ complCXXFLAGS=
++ if test "x$enable_iso_cxx" != "xno"; then
++ if test "x$GXX" = "xyes"; then
++ case " $CXXFLAGS " in
++ *[\ \ ]-ansi[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
++ esac
+
+-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ case " $CXXFLAGS " in
++ *[\ \ ]-pedantic[\ \ ]*) ;;
++ *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
++ esac
++ fi
++ fi
++ AC_MSG_RESULT($complCXXFLAGS)
+
+-# AM_PROG_MKDIR_P
+-# ---------------
+-# Check for `mkdir -p'.
+-AC_DEFUN([AM_PROG_MKDIR_P],
+-[AC_PREREQ([2.60])dnl
+-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
+-dnl while keeping a definition of mkdir_p for backward compatibility.
+-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+-dnl Makefile.ins that do not define MKDIR_P, so we do our own
+-dnl adjustment using top_builddir (which is defined more often than
+-dnl MKDIR_P).
+-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+-case $mkdir_p in
+- [[\\/$]]* | ?:[[\\/]]*) ;;
+- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+-esac
++ WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
++ AC_SUBST(WARN_CXXFLAGS)
+ ])
+
+-# Helper functions for option handling. -*- Autoconf -*-
++dnl -*- mode: autoconf -*-
+
+-# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# serial 1
+
+-# serial 4
++dnl Usage:
++dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
++AC_DEFUN([GTK_DOC_CHECK],
++[
++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
+
+-# _AM_MANGLE_OPTION(NAME)
+-# -----------------------
+-AC_DEFUN([_AM_MANGLE_OPTION],
+-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++ dnl check for tools we added during development
++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
+
+-# _AM_SET_OPTION(NAME)
+-# ------------------------------
+-# Set option NAME. Presently that only means defining a flag for this option.
+-AC_DEFUN([_AM_SET_OPTION],
+-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++ dnl for overriding the documentation installation directory
++ AC_ARG_WITH([html-dir],
++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
++ [with_html_dir='${datadir}/gtk-doc/html'])
++ HTML_DIR="$with_html_dir"
++ AC_SUBST([HTML_DIR])
+
+-# _AM_SET_OPTIONS(OPTIONS)
+-# ----------------------------------
+-# OPTIONS is a space-separated list of Automake options.
+-AC_DEFUN([_AM_SET_OPTIONS],
+-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++ dnl enable/disable documentation building
++ AC_ARG_ENABLE([gtk-doc],
++ AS_HELP_STRING([--enable-gtk-doc],
++ [use gtk-doc to build documentation [[default=no]]]),,
++ [enable_gtk_doc=no])
+
+-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+-# -------------------------------------------
+-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+-AC_DEFUN([_AM_IF_OPTION],
+-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++ if test x$enable_gtk_doc = xyes; then
++ ifelse([$1],[],
++ [PKG_CHECK_EXISTS([gtk-doc],,
++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
++ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
++ fi
+
+-# Check to make sure that the build environment is sane. -*- Autoconf -*-
++ AC_MSG_CHECKING([whether to build gtk-doc documentation])
++ AC_MSG_RESULT($enable_gtk_doc)
+
+-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
+-# Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ dnl enable/disable output formats
++ AC_ARG_ENABLE([gtk-doc-html],
++ AS_HELP_STRING([--enable-gtk-doc-html],
++ [build documentation in html format [[default=yes]]]),,
++ [enable_gtk_doc_html=yes])
++ AC_ARG_ENABLE([gtk-doc-pdf],
++ AS_HELP_STRING([--enable-gtk-doc-pdf],
++ [build documentation in pdf format [[default=no]]]),,
++ [enable_gtk_doc_pdf=no])
+
+-# serial 5
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
+
+-# AM_SANITY_CHECK
+-# ---------------
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftest.file
+-# Reject unsafe characters in $srcdir or the absolute working directory
+-# name. Accept space and tab only in the latter.
+-am_lf='
+-'
+-case `pwd` in
+- *[[\\\"\#\$\&\'\`$am_lf]]*)
+- AC_MSG_ERROR([unsafe absolute working directory name]);;
+-esac
+-case $srcdir in
+- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
+- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
+-esac
+
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments. Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
+- if test "$[*]" = "X"; then
+- # -L didn't work.
+- set X `ls -t "$srcdir/configure" conftest.file`
+- fi
+- rm -f conftest.file
+- if test "$[*]" != "X $srcdir/configure conftest.file" \
+- && test "$[*]" != "X conftest.file $srcdir/configure"; then
++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
++])
+
+- # If neither matched, then we have a broken ls. This can happen
+- # if, for instance, CONFIG_SHELL is bash and it inherits a
+- # broken ls alias from the environment. This has actually
+- # happened. Such a system could not be considered "sane".
+- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
+-alias in your environment])
+- fi
+
+- test "$[2]" = conftest.file
+- )
+-then
+- # Ok.
+- :
+-else
+- AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
++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_MSG_RESULT(yes)])
+
+-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
+-
+-# AM_PROG_INSTALL_STRIP
+-# ---------------------
+-# One issue with vendor `install' (even GNU) is that you can't
+-# specify the program used to strip binaries. This is especially
+-# annoying in cross-compiling environments, where the build's strip
+-# is unlikely to handle the host's binaries.
+-# Fortunately install-sh will honor a STRIPPROG variable, so we
+-# always use install-sh in `make install-strip', and initialize
+-# STRIPPROG with the value of the STRIP variable (set by the user).
+-AC_DEFUN([AM_PROG_INSTALL_STRIP],
+-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+-# Installed binaries are usually stripped using `strip' when the user
+-# run `make install-strip'. However `strip' might not be the right
+-# tool to use in cross-compilation environments, therefore Automake
+-# will honor the `STRIP' environment variable to overrule this program.
+-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+-if test "$cross_compiling" != no; then
+- AC_CHECK_TOOL([STRIP], [strip], :)
++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
+-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+-AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++ 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 $< [$]@'
+
+-# serial 2
++_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)
+
+-# _AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
+-# This macro is traced by Automake.
+-AC_DEFUN([_AM_SUBST_NOTMAKE])
++# 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
+
+-# AM_SUBST_NOTMAKE(VARIABLE)
+-# ---------------------------
+-# Public sister of _AM_SUBST_NOTMAKE.
+-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
++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
+
+-# Check how to create a tarball. -*- Autoconf -*-
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++AC_SUBST(ALL_LINGUAS)
+
+-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+-#
+-# This file is free software; the Free Software Foundation
+-# gives unlimited permission to copy and/or distribute it,
+-# with or without modifications, as long as this notice is preserved.
++# Set 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)
+
+-# serial 2
++IT_PO_SUBDIR([po])
+
+-# _AM_PROG_TAR(FORMAT)
+-# --------------------
+-# Check how to create a tarball in format FORMAT.
+-# FORMAT should be one of `v7', `ustar', or `pax'.
+-#
+-# Substitute a variable $(am__tar) that is a command
+-# writing to stdout a FORMAT-tarball containing the directory
+-# $tardir.
+-# tardir=directory && $(am__tar) > result.tar
++])
++
++
++# IT_PO_SUBDIR(DIRNAME)
++# ---------------------
++# All po subdirs have to be declared with this macro; the subdir "po" is
++# declared by IT_PROG_INTLTOOL.
+ #
+-# Substitute a variable $(am__untar) that extract such
+-# a tarball read from stdin.
+-# $(am__untar) < result.tar
+-AC_DEFUN([_AM_PROG_TAR],
+-[# Always define AMTAR for backward compatibility.
+-AM_MISSING_PROG([AMTAR], [tar])
+-m4_if([$1], [v7],
+- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+- [m4_case([$1], [ustar],, [pax],,
+- [m4_fatal([Unknown tar format])])
+-AC_MSG_CHECKING([how to create a $1 tar archive])
+-# Loop over all known methods to create a tar archive until one works.
+-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
+-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
+-# Do not fold the above two line into one, because Tru64 sh and
+-# Solaris sh will not grok spaces in the rhs of `-'.
+-for _am_tool in $_am_tools
+-do
+- case $_am_tool in
+- gnutar)
+- for _am_tar in tar gnutar gtar;
+- do
+- AM_RUN_LOG([$_am_tar --version]) && break
+- done
+- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
+- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
+- am__untar="$_am_tar -xf -"
+- ;;
+- plaintar)
+- # Must skip GNU tar: if it does not support --format= it doesn't create
+- # ustar tarball either.
+- (tar --version) >/dev/null 2>&1 && continue
+- am__tar='tar chf - "$$tardir"'
+- am__tar_='tar chf - "$tardir"'
+- am__untar='tar xf -'
+- ;;
+- pax)
+- am__tar='pax -L -x $1 -w "$$tardir"'
+- am__tar_='pax -L -x $1 -w "$tardir"'
+- am__untar='pax -r'
+- ;;
+- cpio)
+- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
+- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
+- am__untar='cpio -i -H $1 -d'
+- ;;
+- none)
+- am__tar=false
+- am__tar_=false
+- am__untar=false
+- ;;
+- esac
++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
++])
+
+- # If the value was cached, stop now. We just wanted to have am__tar
+- # and am__untar set.
+- test -n "${am_cv_prog_tar_$1}" && break
++# _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])])
++]
++)
+
+- # tar/untar a dummy directory, and stop if the command works
+- rm -rf conftest.dir
+- mkdir conftest.dir
+- echo GrepMe > conftest.dir/file
+- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
+- rm -rf conftest.dir
+- if test -s conftest.tar; then
+- AM_RUN_LOG([$am__untar <conftest.tar])
+- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++# 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 Autoconf macros for libgcrypt
++dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc.
++dnl
++dnl This file is free software; as a special exception the author gives
++dnl unlimited permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++dnl This file is distributed in the hope that it will be useful, but
++dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
++dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
++
++
++dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION,
++dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]])
++dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS.
++dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed
++dnl with the API version to also check the API compatibility. Example:
++dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed
++dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using
++dnl this features allows to prevent build against newer versions of libgcrypt
++dnl with a changed API.
++dnl
++AC_DEFUN([AM_PATH_LIBGCRYPT],
++[ AC_ARG_WITH(libgcrypt-prefix,
++ AC_HELP_STRING([--with-libgcrypt-prefix=PFX],
++ [prefix where LIBGCRYPT is installed (optional)]),
++ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
++ if test x$libgcrypt_config_prefix != x ; then
++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
++ fi
+ fi
+-done
+-rm -rf conftest.dir
+
+-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
+-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
+-AC_SUBST([am__tar])
+-AC_SUBST([am__untar])
+-]) # _AM_PROG_TAR
++ AC_PATH_PROG(LIBGCRYPT_CONFIG, libgcrypt-config, no)
++ tmp=ifelse([$1], ,1:1.2.0,$1)
++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
++ else
++ req_libgcrypt_api=0
++ min_libgcrypt_version="$tmp"
++ fi
++
++ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version)
++ ok=no
++ if test "$LIBGCRYPT_CONFIG" != "no" ; then
++ req_major=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
++ req_minor=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
++ req_micro=`echo $min_libgcrypt_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
++ major=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
++ minor=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
++ micro=`echo $libgcrypt_config_version | \
++ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
++ if test "$major" -gt "$req_major"; then
++ ok=yes
++ else
++ if test "$major" -eq "$req_major"; then
++ if test "$minor" -gt "$req_minor"; then
++ ok=yes
++ else
++ if test "$minor" -eq "$req_minor"; then
++ if test "$micro" -ge "$req_micro"; then
++ ok=yes
++ fi
++ fi
++ fi
++ fi
++ fi
++ fi
++ if test $ok = yes; then
++ AC_MSG_RESULT([yes ($libgcrypt_config_version)])
++ else
++ AC_MSG_RESULT(no)
++ fi
++ if test $ok = yes; then
++ # If we have a recent libgcrypt, we should also check that the
++ # API is compatible
++ if test "$req_libgcrypt_api" -gt 0 ; then
++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
++ if test "$tmp" -gt 0 ; then
++ AC_MSG_CHECKING([LIBGCRYPT API version])
++ if test "$req_libgcrypt_api" -eq "$tmp" ; then
++ AC_MSG_RESULT([okay])
++ else
++ ok=no
++ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp])
++ fi
++ fi
++ fi
++ fi
++ if test $ok = yes; then
++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++ ifelse([$2], , :, [$2])
++ else
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++ ifelse([$3], , :, [$3])
++ fi
++ AC_SUBST(LIBGCRYPT_CFLAGS)
++ AC_SUBST(LIBGCRYPT_LIBS)
++])
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ #
+@@ -1681,6 +1735,7 @@
+
+ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ _LT_COPYING
+@@ -3441,7 +3496,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -3481,6 +3536,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -4068,11 +4135,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -4689,7 +4756,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4753,7 +4820,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ *qnx* | *nto*)
+ # QNX uses GNU C++, but need to define -shared option too, otherwise
+@@ -4973,7 +5040,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5178,6 +5245,9 @@
+ cygwin* | mingw* | cegcc*)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+@@ -5242,6 +5312,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ esac
+
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+@@ -5263,6 +5336,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -5354,7 +5428,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -5424,7 +5498,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -5599,6 +5673,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ _LT_TAGVAR(link_all_deplibs, $1)=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5837,7 +5912,7 @@
+ _LT_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -6833,7 +6908,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -8946,8 +9021,9 @@
+ m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
+ m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+
+-# nls.m4 serial 3 (gettext-0.15)
+-dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
++# nls.m4 serial 5 (gettext-0.18)
++dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
++dnl Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -8965,17 +9041,17 @@
+ dnl Ulrich Drepper <drepper at cygnus.com>, 1995-2000.
+ dnl Bruno Haible <haible at clisp.cons.org>, 2000-2003.
+
+-AC_PREREQ(2.50)
++AC_PREREQ([2.50])
+
+ AC_DEFUN([AM_NLS],
+ [
+ AC_MSG_CHECKING([whether NLS is requested])
+ dnl Default is enabled NLS
+- AC_ARG_ENABLE(nls,
++ AC_ARG_ENABLE([nls],
+ [ --disable-nls do not use Native Language Support],
+ USE_NLS=$enableval, USE_NLS=yes)
+- AC_MSG_RESULT($USE_NLS)
+- AC_SUBST(USE_NLS)
++ AC_MSG_RESULT([$USE_NLS])
++ AC_SUBST([USE_NLS])
+ ])
+
+ # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
+@@ -9136,936 +9212,986 @@
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+
+-dnl AM_GCONF_SOURCE_2
+-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
+-dnl (i.e. pass to gconftool-2
+-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
+-dnl you should install foo.schemas files
+-dnl
+-
+-AC_DEFUN([AM_GCONF_SOURCE_2],
+-[
+- if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
+- GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+- else
+- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
+- fi
+-
+- AC_ARG_WITH([gconf-source],
+- AC_HELP_STRING([--with-gconf-source=sourceaddress],
+- [Config database for installing schema files.]),
+- [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+-
+- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+-
+- if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+- fi
+-
+- AC_ARG_WITH([gconf-schema-file-dir],
+- AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
+- [Directory for installing schema files.]),
+- [GCONF_SCHEMA_FILE_DIR="$withval"],)
+-
+- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
+- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
++# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- AC_ARG_ENABLE(schemas-install,
+- AC_HELP_STRING([--disable-schemas-install],
+- [Disable the schemas installation]),
+- [case ${enableval} in
+- yes|no) ;;
+- *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
+- esac])
+- AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++# (This private macro should not be called outside this file.)
++AC_DEFUN([AM_AUTOMAKE_VERSION],
++[am__api_version='1.11'
++dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
++dnl require some minimum version. Point them to the right macro.
++m4_if([$1], [1.11.1], [],
++ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+ ])
+
+-# Copyright (C) 1995-2002 Free Software Foundation, Inc.
+-# Copyright (C) 2001-2003,2004 Red Hat, Inc.
+-#
+-# This file is free software, distributed under the terms of the GNU
+-# General Public License. As a special exception to the GNU General
+-# Public License, this file may be distributed as part of a program
+-# that contains a configuration script generated by Autoconf, under
+-# the same distribution terms as the rest of that program.
+-#
+-# This file can be copied and used freely without restrictions. It can
+-# be used in projects which are not available under the GNU Public License
+-# but which still want to provide support for the GNU gettext functionality.
+-#
+-# Macro to add for using GNU gettext.
+-# Ulrich Drepper <drepper at cygnus.com>, 1995, 1996
+-#
+-# Modified to never use included libintl.
+-# Owen Taylor <otaylor at redhat.com>, 12/15/1998
+-#
+-# Major rework to remove unused code
+-# Owen Taylor <otaylor at redhat.com>, 12/11/2002
+-#
+-# Added better handling of ALL_LINGUAS from GNU gettext version
+-# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002
+-#
+-# Modified to require ngettext
+-# Matthias Clasen <mclasen at redhat.com> 08/06/2004
+-#
+-# We need this here as well, since someone might use autoconf-2.5x
+-# to configure GLib then an older version to configure a package
+-# using AM_GLIB_GNU_GETTEXT
+-AC_PREREQ(2.53)
+-
+-dnl
+-dnl We go to great lengths to make sure that aclocal won't
+-dnl try to pull in the installed version of these macros
+-dnl when running aclocal in the glib directory.
+-dnl
+-m4_copy([AC_DEFUN],[glib_DEFUN])
+-m4_copy([AC_REQUIRE],[glib_REQUIRE])
+-dnl
+-dnl At the end, if we're not within glib, we'll define the public
+-dnl definitions in terms of our private definitions.
+-dnl
++# _AM_AUTOCONF_VERSION(VERSION)
++# -----------------------------
++# aclocal traces this macro to find the Autoconf version.
++# This is a private macro too. Using m4_define simplifies
++# the logic in aclocal, which can simply ignore this definition.
++m4_define([_AM_AUTOCONF_VERSION], [])
+
+-# GLIB_LC_MESSAGES
+-#--------------------
+-glib_DEFUN([GLIB_LC_MESSAGES],
+- [AC_CHECK_HEADERS([locale.h])
+- if test $ac_cv_header_locale_h = yes; then
+- AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+- [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+- am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
+- if test $am_cv_val_LC_MESSAGES = yes; then
+- AC_DEFINE(HAVE_LC_MESSAGES, 1,
+- [Define if your <locale.h> file defines LC_MESSAGES.])
+- fi
+- fi])
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
++# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
++AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
++[AM_AUTOMAKE_VERSION([1.11.1])dnl
++m4_ifndef([AC_AUTOCONF_VERSION],
++ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
++_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
+
+-# GLIB_PATH_PROG_WITH_TEST
+-#----------------------------
+-dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+-dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
+-glib_DEFUN([GLIB_PATH_PROG_WITH_TEST],
+-[# Extract the first word of "$2", so it can be a program name with args.
+-set dummy $2; ac_word=[$]2
+-AC_MSG_CHECKING([for $ac_word])
+-AC_CACHE_VAL(ac_cv_path_$1,
+-[case "[$]$1" in
+- /*)
+- ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
+- ;;
+- *)
+- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+- for ac_dir in ifelse([$5], , $PATH, [$5]); do
+- test -z "$ac_dir" && ac_dir=.
+- if test -f $ac_dir/$ac_word; then
+- if [$3]; then
+- ac_cv_path_$1="$ac_dir/$ac_word"
+- break
+- fi
+- fi
+- done
+- IFS="$ac_save_ifs"
+-dnl If no 4th arg is given, leave the cache variable unset,
+-dnl so AC_PATH_PROGS will keep looking.
+-ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
+-])dnl
+- ;;
+-esac])dnl
+-$1="$ac_cv_path_$1"
+-if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
+- AC_MSG_RESULT([$]$1)
+-else
+- AC_MSG_RESULT(no)
+-fi
+-AC_SUBST($1)dnl
+-])
++# AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+-# GLIB_WITH_NLS
+-#-----------------
+-glib_DEFUN([GLIB_WITH_NLS],
+- dnl NLS is obligatory
+- [USE_NLS=yes
+- AC_SUBST(USE_NLS)
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- gt_cv_have_gettext=no
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory. The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run. This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++# fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++# fails if $ac_aux_dir is absolute,
++# fails when called from a subdirectory in a VPATH build with
++# a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir. In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
++# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++# MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH. The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
+
+- CATOBJEXT=NONE
+- XGETTEXT=:
+- INTLLIBS=
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
+
+- AC_CHECK_HEADER(libintl.h,
+- [gt_cv_func_dgettext_libintl="no"
+- libintl_extra_libs=""
++# AM_CONDITIONAL -*- Autoconf -*-
+
+- #
+- # First check in libc
+- #
+- AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc,
+- [AC_TRY_LINK([
+-#include <libintl.h>
+-],
+- [return !ngettext ("","", 1)],
+- gt_cv_func_ngettext_libc=yes,
+- gt_cv_func_ngettext_libc=no)
+- ])
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc,
+- [AC_TRY_LINK([
+-#include <libintl.h>
+-],
+- [return !dgettext ("","")],
+- gt_cv_func_dgettext_libc=yes,
+- gt_cv_func_dgettext_libc=no)
+- ])
+- fi
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- AC_CHECK_FUNCS(bind_textdomain_codeset)
+- fi
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- #
+- # If we don't have everything we want, check in libintl
+- #
+- if test "$gt_cv_func_dgettext_libc" != "yes" \
+- || test "$gt_cv_func_ngettext_libc" != "yes" \
+- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+-
+- AC_CHECK_LIB(intl, bindtextdomain,
+- [AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dgettext,
+- gt_cv_func_dgettext_libintl=yes)])])
++# serial 9
+
+- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- AC_MSG_CHECKING([if -liconv is needed to use gettext])
+- AC_MSG_RESULT([])
+- AC_CHECK_LIB(intl, ngettext,
+- [AC_CHECK_LIB(intl, dcgettext,
+- [gt_cv_func_dgettext_libintl=yes
+- libintl_extra_libs=-liconv],
+- :,-liconv)],
+- :,-liconv)
+- fi
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
++ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])dnl
++AC_SUBST([$1_FALSE])dnl
++_AM_SUBST_NOTMAKE([$1_TRUE])dnl
++_AM_SUBST_NOTMAKE([$1_FALSE])dnl
++m4_define([_AM_COND_VALUE_$1], [$2])dnl
++if $2; then
++ $1_TRUE=
++ $1_FALSE='#'
++else
++ $1_TRUE='#'
++ $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++ AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
+
+- #
+- # If we found libintl, then check in it for bind_textdomain_codeset();
+- # we'll prefer libc if neither have bind_textdomain_codeset(),
+- # and both have dgettext and ngettext
+- #
+- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS -lintl $libintl_extra_libs"
+- unset ac_cv_func_bind_textdomain_codeset
+- AC_CHECK_FUNCS(bind_textdomain_codeset)
+- LIBS="$glib_save_LIBS"
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then
+- gt_cv_func_dgettext_libc=no
+- else
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- && test "$gt_cv_func_ngettext_libc" = "yes"; then
+- gt_cv_func_dgettext_libintl=no
+- fi
+- fi
+- fi
+- fi
++# serial 10
+
+- if test "$gt_cv_func_dgettext_libc" = "yes" \
+- || test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- gt_cv_have_gettext=yes
+- fi
+-
+- if test "$gt_cv_func_dgettext_libintl" = "yes"; then
+- INTLLIBS="-lintl $libintl_extra_libs"
+- fi
+-
+- if test "$gt_cv_have_gettext" = "yes"; then
+- AC_DEFINE(HAVE_GETTEXT,1,
+- [Define if the GNU gettext() function is already present or preinstalled.])
+- GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
+- if test "$MSGFMT" != "no"; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS $INTLLIBS"
+- AC_CHECK_FUNCS(dcgettext)
+- MSGFMT_OPTS=
+- AC_MSG_CHECKING([if msgfmt accepts -c])
+- GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[
+-msgid ""
+-msgstr ""
+-"Content-Type: text/plain; charset=UTF-8\n"
+-"Project-Id-Version: test 1.0\n"
+-"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+-"Last-Translator: test <foo at bar.xx>\n"
+-"Language-Team: C <LL at li.org>\n"
+-"MIME-Version: 1.0\n"
+-"Content-Transfer-Encoding: 8bit\n"
+-], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+- AC_SUBST(MSGFMT_OPTS)
+- AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
+- GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
+- [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
+- AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr],
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [case $host in
+- *-*-solaris*)
+- dnl On Solaris, if bind_textdomain_codeset is in libc,
+- dnl GNU format message catalog is always supported,
+- dnl since both are added to the libc all together.
+- dnl Hence, we'd like to go with DATADIRNAME=share and
+- dnl and CATOBJEXT=.gmo in this case.
+- AC_CHECK_FUNC(bind_textdomain_codeset,
+- [CATOBJEXT=.gmo
+- DATADIRNAME=share],
+- [CATOBJEXT=.mo
+- DATADIRNAME=lib])
+- ;;
+- *)
+- CATOBJEXT=.mo
+- DATADIRNAME=lib
+- ;;
+- esac])
+- LIBS="$glib_save_LIBS"
+- INSTOBJEXT=.mo
+- else
+- gt_cv_have_gettext=no
+- fi
+- fi
+- ])
++# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
++# written in clear, in which case automake, when reading aclocal.m4,
++# will think it sees a *use*, and therefore will trigger all it's
++# C support machinery. Also note that it means that autoscan, seeing
++# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+- if test "$gt_cv_have_gettext" = "yes" ; then
+- AC_DEFINE(ENABLE_NLS, 1,
+- [always defined to indicate that i18n is enabled])
+- fi
+
+- dnl Test whether we really found GNU xgettext.
+- if test "$XGETTEXT" != ":"; then
+- dnl If it is not GNU xgettext we define it as : so that the
+- dnl Makefiles still can work.
+- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+- : ;
+- else
+- AC_MSG_RESULT(
+- [found xgettext program is not GNU xgettext; ignore it])
+- XGETTEXT=":"
+- fi
+- fi
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
+
+- # We need to process the po/ directory.
+- POSUB=po
++ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
++ [$1], CXX, [depcc="$CXX" am_compiler_list=],
++ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++ [$1], UPC, [depcc="$UPC" am_compiler_list=],
++ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
++ [depcc="$$1" am_compiler_list=])
+
+- AC_OUTPUT_COMMANDS(
+- [case "$CONFIG_FILES" in *po/Makefile.in*)
+- sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+- esac])
++AC_CACHE_CHECK([dependency style of $depcc],
++ [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++ # We make a subdir and do the tests there. Otherwise we can end up
++ # making bogus files that we don't know about and never remove. For
++ # instance it was reported that on HP-UX the gcc test will end up
++ # making a dummy file named `D' -- because `-MD' means `put the output
++ # in D'.
++ mkdir conftest.dir
++ # Copy depcomp to subdir because otherwise we won't find it if we're
++ # using a relative directory.
++ cp "$am_depcomp" conftest.dir
++ cd conftest.dir
++ # We will build objects and dependencies in a subdirectory because
++ # it helps to detect inapplicable dependency modes. For instance
++ # both Tru64's cc and ICC support -MD to output dependencies as a
++ # side effect of compilation, but ICC will put the dependencies in
++ # the current directory while Tru64 will put them in the object
++ # directory.
++ mkdir sub
+
+- dnl These rules are solely for the distribution goal. While doing this
+- dnl we only have to keep exactly one list of the available catalogs
+- dnl in configure.ac.
+- for lang in $ALL_LINGUAS; do
+- GMOFILES="$GMOFILES $lang.gmo"
+- POFILES="$POFILES $lang.po"
+- done
++ am_cv_$1_dependencies_compiler_type=none
++ if test "$am_compiler_list" = ""; then
++ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
++ fi
++ am__universal=false
++ m4_case([$1], [CC],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac],
++ [CXX],
++ [case " $depcc " in #(
++ *\ -arch\ *\ -arch\ *) am__universal=true ;;
++ esac])
+
+- dnl Make all variables we use known to autoconf.
+- AC_SUBST(CATALOGS)
+- AC_SUBST(CATOBJEXT)
+- AC_SUBST(DATADIRNAME)
+- AC_SUBST(GMOFILES)
+- AC_SUBST(INSTOBJEXT)
+- AC_SUBST(INTLLIBS)
+- AC_SUBST(PO_IN_DATADIR_TRUE)
+- AC_SUBST(PO_IN_DATADIR_FALSE)
+- AC_SUBST(POFILES)
+- AC_SUBST(POSUB)
+- ])
++ for depmode in $am_compiler_list; do
++ # Setup a source with many dependencies, because some compilers
++ # like to wrap large dependency lists on column 80 (with \), and
++ # we should not choose a depcomp mode which is confused by this.
++ #
++ # We need to recreate these files for each test, as the compiler may
++ # overwrite some of them when testing with obscure command lines.
++ # This happens at least with the AIX C compiler.
++ : > sub/conftest.c
++ for i in 1 2 3 4 5 6; do
++ echo '#include "conftst'$i'.h"' >> sub/conftest.c
++ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++ # Solaris 8's {/usr,}/bin/sh.
++ touch sub/conftst$i.h
++ done
++ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+-# AM_GLIB_GNU_GETTEXT
+-# -------------------
+-# Do checks necessary for use of gettext. If a suitable implementation
+-# of gettext is found in either in libintl or in the C library,
+-# it will set INTLLIBS to the libraries needed for use of gettext
+-# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable
+-# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST()
+-# on various variables needed by the Makefile.in.in installed by
+-# glib-gettextize.
+-dnl
+-glib_DEFUN([GLIB_GNU_GETTEXT],
+- [AC_REQUIRE([AC_PROG_CC])dnl
+- AC_REQUIRE([AC_HEADER_STDC])dnl
+-
+- GLIB_LC_MESSAGES
+- GLIB_WITH_NLS
++ # We check with `-c' and `-o' for the sake of the "dashmstdout"
++ # mode. It turns out that the SunPro C++ compiler does not properly
++ # handle `-M -o', and we need to detect this. Also, some Intel
++ # versions had trouble with output in subdirs
++ am__obj=sub/conftest.${OBJEXT-o}
++ am__minus_obj="-o $am__obj"
++ case $depmode in
++ gcc)
++ # This depmode causes a compiler race in universal mode.
++ test "$am__universal" = false || continue
++ ;;
++ nosideeffect)
++ # after this tag, mechanisms are not by side-effect, so they'll
++ # only be used when explicitly requested
++ if test "x$enable_dependency_tracking" = xyes; then
++ continue
++ else
++ break
++ fi
++ ;;
++ msvisualcpp | msvcmsys)
++ # This compiler won't grok `-c -o', but also, the minuso test has
++ # not run yet. These depmodes are late enough in the game, and
++ # so weak that their functioning should not be impacted.
++ am__obj=conftest.${OBJEXT-o}
++ am__minus_obj=
++ ;;
++ none) break ;;
++ esac
++ if depmode=$depmode \
++ source=sub/conftest.c object=$am__obj \
++ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
++ >/dev/null 2>conftest.err &&
++ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
++ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++ # icc doesn't choke on unknown options, it will just issue warnings
++ # or remarks (even with -Werror). So we grep stderr for any message
++ # that says an option was ignored or not supported.
++ # When given -MP, icc 7.0 and 7.1 complain thusly:
++ # icc: Command line warning: ignoring option '-M'; no argument required
++ # The diagnosis changed in icc 8.0:
++ # icc: Command line remark: option '-MP' not supported
++ if (grep 'ignoring option' conftest.err ||
++ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++ am_cv_$1_dependencies_compiler_type=$depmode
++ break
++ fi
++ fi
++ done
+
+- if test "$gt_cv_have_gettext" = "yes"; then
+- if test "x$ALL_LINGUAS" = "x"; then
+- LINGUAS=
+- else
+- AC_MSG_CHECKING(for catalogs to be installed)
+- NEW_LINGUAS=
+- for presentlang in $ALL_LINGUAS; do
+- useit=no
+- if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then
+- desiredlanguages="$LINGUAS"
+- else
+- desiredlanguages="$ALL_LINGUAS"
+- fi
+- for desiredlang in $desiredlanguages; do
+- # Use the presentlang catalog if desiredlang is
+- # a. equal to presentlang, or
+- # b. a variant of presentlang (because in this case,
+- # presentlang can be used as a fallback for messages
+- # which are not translated in the desiredlang catalog).
+- case "$desiredlang" in
+- "$presentlang"*) useit=yes;;
+- esac
+- done
+- if test $useit = yes; then
+- NEW_LINGUAS="$NEW_LINGUAS $presentlang"
+- fi
+- done
+- LINGUAS=$NEW_LINGUAS
+- AC_MSG_RESULT($LINGUAS)
+- fi
++ cd ..
++ rm -rf conftest.dir
++else
++ am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++ test "x$enable_dependency_tracking" != xno \
++ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
+
+- dnl Construct list of names of catalog files to be constructed.
+- if test -n "$LINGUAS"; then
+- for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
+- fi
+- fi
+
+- dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly
+- dnl find the mkinstalldirs script in another subdir but ($top_srcdir).
+- dnl Try to locate is.
+- MKINSTALLDIRS=
+- if test -n "$ac_aux_dir"; then
+- MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs"
+- fi
+- if test -z "$MKINSTALLDIRS"; then
+- MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs"
+- fi
+- AC_SUBST(MKINSTALLDIRS)
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
+
+- dnl Generate list of files to be processed by xgettext which will
+- dnl be included in po/Makefile.
+- test -d po || mkdir po
+- if test "x$srcdir" != "x."; then
+- if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
+- posrcprefix="$srcdir/"
+- else
+- posrcprefix="../$srcdir/"
+- fi
+- else
+- posrcprefix="../"
+- fi
+- rm -f po/POTFILES
+- sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
+- < $srcdir/po/POTFILES.in > po/POTFILES
+- ])
+
+-# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
+-# -------------------------------
+-# Define VARIABLE to the location where catalog files will
+-# be installed by po/Makefile.
+-glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
+-[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
+-glib_save_prefix="$prefix"
+-glib_save_exec_prefix="$exec_prefix"
+-glib_save_datarootdir="$datarootdir"
+-test "x$prefix" = xNONE && prefix=$ac_default_prefix
+-test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+-datarootdir=`eval echo "${datarootdir}"`
+-if test "x$CATOBJEXT" = "x.mo" ; then
+- localedir=`eval echo "${libdir}/locale"`
+-else
+- localedir=`eval echo "${datadir}/locale"`
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[ --disable-dependency-tracking speeds up one-time build
++ --enable-dependency-tracking do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++ am_depcomp="$ac_aux_dir/depcomp"
++ AMDEPBACKSLASH='\'
+ fi
+-prefix="$glib_save_prefix"
+-exec_prefix="$glib_save_exec_prefix"
+-datarootdir="$glib_save_datarootdir"
+-AC_DEFINE_UNQUOTED($1, "$localedir",
+- [Define the location where the catalogs will be installed])
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])dnl
++_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+ ])
+
+-dnl
+-dnl Now the definitions that aclocal will find
+-dnl
+-ifdef(glib_configure_ac,[],[
+-AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
+-AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
+-])dnl
++# Generate code to set up dependency tracking. -*- Autoconf -*-
+
+-# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+-#
+-# Create a temporary file with TEST-FILE as its contents and pass the
+-# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+-# 0 and perform ACTION-IF-FAIL for any other exit status.
+-AC_DEFUN([GLIB_RUN_PROG],
+-[cat >conftest.foo <<_ACEOF
+-$2
+-_ACEOF
+-if AC_RUN_LOG([$1 conftest.foo]); then
+- m4_ifval([$3], [$3], [:])
+-m4_ifvaln([$4], [else $4])dnl
+-echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+-sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+-fi])
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++#serial 5
+
+-# gnome-common.m4
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[{
++ # Autoconf 2.62 quotes --file arguments for eval, but not when files
++ # are listed without --file. Let's play safe and only enable the eval
++ # if we detect the quoting.
++ case $CONFIG_FILES in
++ *\'*) eval set x "$CONFIG_FILES" ;;
++ *) set x $CONFIG_FILES ;;
++ esac
++ shift
++ for mf
++ do
++ # Strip MF so we end up with the name of the file.
++ mf=`echo "$mf" | sed -e 's/:.*$//'`
++ # Check whether this is an Automake generated Makefile or not.
++ # We used to match only the files named `Makefile.in', but
++ # some people rename them; so instead we look at the file content.
++ # Grep'ing the first line is not enough: some people post-process
++ # each Makefile.in and add a new line on top of each file to say so.
++ # Grep'ing the whole file is not good either: AIX grep has a line
++ # limit of 2048, but all sed's we know have understand at least 4000.
++ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
++ dirpart=`AS_DIRNAME("$mf")`
++ else
++ continue
++ fi
++ # Extract the definition of DEPDIR, am__include, and am__quote
++ # from the Makefile without running `make'.
++ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++ test -z "$DEPDIR" && continue
++ am__include=`sed -n 's/^am__include = //p' < "$mf"`
++ test -z "am__include" && continue
++ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++ # When using ansi2knr, U may be empty or an underscore; expand it
++ U=`sed -n 's/^U = //p' < "$mf"`
++ # Find all dependency output files, they are included files with
++ # $(DEPDIR) in their names. We invoke sed twice because it is the
++ # simplest approach to changing $(DEPDIR) to its actual value in the
++ # expansion.
++ for file in `sed -n "
++ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++ # Make sure the directory exists.
++ test -f "$dirpart/$file" && continue
++ fdir=`AS_DIRNAME(["$file"])`
++ AS_MKDIR_P([$dirpart/$fdir])
++ # echo "creating $dirpart/$file"
++ echo '# dummy' > "$dirpart/$file"
++ done
++ done
++}
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
+ #
+-# serial 3
+-#
++# This code is only required when automatic dependency tracking
++# is enabled. FIXME. This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
+
+-dnl GNOME_COMMON_INIT
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-AU_DEFUN([GNOME_COMMON_INIT],
+-[
+- dnl this macro should come after AC_CONFIG_MACRO_DIR
+- AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
++# serial 8
+
+- dnl ensure that when the Automake generated makefile calls aclocal,
+- dnl it honours the $ACLOCAL_FLAGS environment variable
+- ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
+- if test -n "$ac_macro_dir"; then
+- ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS"
+- fi
++# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+
+- AC_SUBST([ACLOCAL_AMFLAGS])
+-],
+-[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}"
+-in your top-level Makefile.am, instead, where "m4" is the macro directory set
+-with AC_CONFIG_MACRO_DIR() in your configure.ac]])
++# Do all the work for Automake. -*- Autoconf -*-
+
+-AC_DEFUN([GNOME_DEBUG_CHECK],
+-[
+- AC_ARG_ENABLE([debug],
+- AC_HELP_STRING([--enable-debug],
+- [turn on debugging]),,
+- [enable_debug=no])
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- if test x$enable_debug = xyes ; then
+- AC_DEFINE(GNOME_ENABLE_DEBUG, 1,
+- [Enable additional debugging at the expense of performance and size])
+- fi
+-])
++# serial 16
+
+-dnl GNOME_MAINTAINER_MODE_DEFINES ()
+-dnl define DISABLE_DEPRECATED
+-dnl
+-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+-[
+- AC_REQUIRE([AM_MAINTAINER_MODE])
++# This macro actually does too much. Some checks are only needed if
++# your package does certain things. But this isn't really a big deal.
+
+- DISABLE_DEPRECATED=""
+- if test $USE_MAINTAINER_MODE = yes; then
+- DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
+- for DOMAIN in $DOMAINS; do
+- DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
+- done
+- fi
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out. PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition. After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.62])dnl
++dnl Autoconf wants to disallow AM_ names. We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++if test "`cd $srcdir && pwd`" != "`pwd`"; then
++ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
++ # is not polluted with repeated "-I."
++ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
++ # test to see if srcdir already configured
++ if test -f $srcdir/config.status; then
++ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++ fi
++fi
+
+- AC_SUBST(DISABLE_DEPRECATED)
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++ if (cygpath --version) >/dev/null 2>/dev/null; then
++ CYGPATH_W='cygpath -w'
++ else
++ CYGPATH_W=echo
++ fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ AC_SUBST([PACKAGE], [$1])dnl
++ AC_SUBST([VERSION], [$2])],
++[_AM_SET_OPTIONS([$1])dnl
++dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
++m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
++ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
++ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
++ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target. The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++ [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++ [_AM_DEPENDENCIES(CC)],
++ [define([AC_PROG_CC],
++ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++ [_AM_DEPENDENCIES(CXX)],
++ [define([AC_PROG_CXX],
++ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_OBJC],
++ [_AM_DEPENDENCIES(OBJC)],
++ [define([AC_PROG_OBJC],
++ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
++])
++_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
++dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
++dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
++dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
++AC_CONFIG_COMMANDS_PRE(dnl
++[m4_provide_if([_AM_COMPILER_EXEEXT],
++ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
+ ])
+
+-dnl GNOME_COMPILE_WARNINGS
+-dnl Turn on many useful compiler warnings
+-dnl For now, only works on GCC
+-AC_DEFUN([GNOME_COMPILE_WARNINGS],[
+- dnl ******************************
+- dnl More compiler warnings
+- dnl ******************************
++dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
++dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
++dnl mangled by Autoconf and run in a shell conditional statement.
++m4_define([_AC_COMPILER_EXEEXT],
++m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
+
+- AC_ARG_ENABLE(compile-warnings,
+- AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],
+- [Turn on compiler warnings]),,
+- [enable_compile_warnings="m4_default([$1],[yes])"])
+
+- warnCFLAGS=
+- if test "x$GCC" != xyes; then
+- enable_compile_warnings=no
+- fi
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated. The stamp files are numbered to have different names.
+
+- warning_flags=
+- realsave_CFLAGS="$CFLAGS"
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_arg=$1
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++ case $_am_header in
++ $_am_arg | $_am_arg:* )
++ break ;;
++ * )
++ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++ esac
++done
++echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
+
+- case "$enable_compile_warnings" in
+- no)
+- warning_flags=
+- ;;
+- minimum)
+- warning_flags="-Wall"
+- ;;
+- yes)
+- warning_flags="-Wall -Wmissing-prototypes"
+- ;;
+- maximum|error)
+- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith"
+- CFLAGS="$warning_flags $CFLAGS"
+- for option in -Wno-sign-compare; do
+- SAVE_CFLAGS="$CFLAGS"
+- CFLAGS="$CFLAGS $option"
+- AC_MSG_CHECKING([whether gcc understands $option])
+- AC_TRY_COMPILE([], [],
+- has_option=yes,
+- has_option=no,)
+- CFLAGS="$SAVE_CFLAGS"
+- AC_MSG_RESULT($has_option)
+- if test $has_option = yes; then
+- warning_flags="$warning_flags $option"
+- fi
+- unset has_option
+- unset SAVE_CFLAGS
+- done
+- unset option
+- if test "$enable_compile_warnings" = "error" ; then
+- warning_flags="$warning_flags -Werror"
+- fi
+- ;;
+- *)
+- AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
+- ;;
+- esac
+- CFLAGS="$realsave_CFLAGS"
+- AC_MSG_CHECKING(what warning flags to pass to the C compiler)
+- AC_MSG_RESULT($warning_flags)
++# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- AC_ARG_ENABLE(iso-c,
+- AC_HELP_STRING([--enable-iso-c],
+- [Try to warn if code is not ISO C ]),,
+- [enable_iso_c=no])
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++if test x"${install_sh}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
++ *)
++ install_sh="\${SHELL} $am_aux_dir/install-sh"
++ esac
++fi
++AC_SUBST(install_sh)])
+
+- AC_MSG_CHECKING(what language compliance flags to pass to the C compiler)
+- complCFLAGS=
+- if test "x$enable_iso_c" != "xno"; then
+- if test "x$GCC" = "xyes"; then
+- case " $CFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -ansi" ;;
+- esac
+- case " $CFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCFLAGS="$complCFLAGS -pedantic" ;;
+- esac
+- fi
+- fi
+- AC_MSG_RESULT($complCFLAGS)
++# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- WARN_CFLAGS="$warning_flags $complCFLAGS"
+- AC_SUBST(WARN_CFLAGS)
+-])
++# serial 2
+
+-dnl For C++, do basically the same thing.
++# Check whether the underlying file-system supports filenames
++# with a leading dot. For instance MS-DOS doesn't.
++AC_DEFUN([AM_SET_LEADING_DOT],
++[rm -rf .tst 2>/dev/null
++mkdir .tst 2>/dev/null
++if test -d .tst; then
++ am__leading_dot=.
++else
++ am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
+
+-AC_DEFUN([GNOME_CXX_WARNINGS],[
+- AC_ARG_ENABLE(cxx-warnings,
+- AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@]
+- [Turn on compiler warnings.]),,
+- [enable_cxx_warnings="m4_default([$1],[minimum])"])
++# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
++# From Jim Meyering
+
+- AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
+- warnCXXFLAGS=
+- if test "x$GXX" != xyes; then
+- enable_cxx_warnings=no
+- fi
+- if test "x$enable_cxx_warnings" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-Wall[\ \ ]*) ;;
+- *) warnCXXFLAGS="-Wall -Wno-unused" ;;
+- esac
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- ## -W is not all that useful. And it cannot be controlled
+- ## with individual -Wno-xxx flags, unlike -Wall
+- if test "x$enable_cxx_warnings" = "xyes"; then
+- warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual"
+- fi
+- fi
+- fi
+- AC_MSG_RESULT($warnCXXFLAGS)
++# serial 5
+
+- AC_ARG_ENABLE(iso-cxx,
+- AC_HELP_STRING([--enable-iso-cxx],
+- [Try to warn if code is not ISO C++ ]),,
+- [enable_iso_cxx=no])
++# AM_MAINTAINER_MODE([DEFAULT-MODE])
++# ----------------------------------
++# Control maintainer-specific portions of Makefiles.
++# Default is to disable them, unless `enable' is passed literally.
++# For symmetry, `disable' may be passed as well. Anyway, the user
++# can override the default with the --enable/--disable switch.
++AC_DEFUN([AM_MAINTAINER_MODE],
++[m4_case(m4_default([$1], [disable]),
++ [enable], [m4_define([am_maintainer_other], [disable])],
++ [disable], [m4_define([am_maintainer_other], [enable])],
++ [m4_define([am_maintainer_other], [enable])
++ m4_warn([syntax], [unexpected argument to AM@&t at _MAINTAINER_MODE: $1])])
++AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles])
++ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
++ AC_ARG_ENABLE([maintainer-mode],
++[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
++ (and sometimes confusing) to the casual installer],
++ [USE_MAINTAINER_MODE=$enableval],
++ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
++ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
++ MAINT=$MAINTAINER_MODE_TRUE
++ AC_SUBST([MAINT])dnl
++]
++)
+
+- AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
+- complCXXFLAGS=
+- if test "x$enable_iso_cxx" != "xno"; then
+- if test "x$GXX" = "xyes"; then
+- case " $CXXFLAGS " in
+- *[\ \ ]-ansi[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
+- esac
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
+
+- case " $CXXFLAGS " in
+- *[\ \ ]-pedantic[\ \ ]*) ;;
+- *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+- esac
+- fi
+- fi
+- AC_MSG_RESULT($complCXXFLAGS)
++# Check to see how 'make' treats includes. -*- Autoconf -*-
+
+- WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+- AC_SUBST(WARN_CXXFLAGS)
++# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++ @echo this is the am__doit target
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++AC_MSG_CHECKING([for style of include used by $am_make])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# Ignore all kinds of additional output from `make'.
++case `$am_make -s -f confmf 2> /dev/null` in #(
++*the\ am__doit\ target*)
++ am__include=include
++ am__quote=
++ _am_result=GNU
++ ;;
++esac
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++ echo '.include "confinc"' > confmf
++ case `$am_make -s -f confmf 2> /dev/null` in #(
++ *the\ am__doit\ target*)
++ am__include=.include
++ am__quote="\""
++ _am_result=BSD
++ ;;
++ esac
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
+ ])
+
+-dnl -*- mode: autoconf -*-
++# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
+
+-# serial 1
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-dnl Usage:
+-dnl GTK_DOC_CHECK([minimum-gtk-doc-version])
+-AC_DEFUN([GTK_DOC_CHECK],
+-[
+- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++# serial 6
+
+- dnl check for tools we added during development
+- AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
+- AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
+- AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
+
+- dnl for overriding the documentation installation directory
+- AC_ARG_WITH([html-dir],
+- AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+- [with_html_dir='${datadir}/gtk-doc/html'])
+- HTML_DIR="$with_html_dir"
+- AC_SUBST([HTML_DIR])
+
+- dnl enable/disable documentation building
+- AC_ARG_ENABLE([gtk-doc],
+- AS_HELP_STRING([--enable-gtk-doc],
+- [use gtk-doc to build documentation [[default=no]]]),,
+- [enable_gtk_doc=no])
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++AC_REQUIRE_AUX_FILE([missing])dnl
++if test x"${MISSING+set}" != xset; then
++ case $am_aux_dir in
++ *\ * | *\ *)
++ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
++ *)
++ MISSING="\${SHELL} $am_aux_dir/missing" ;;
++ esac
++fi
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++ am_missing_run="$MISSING --run "
++else
++ am_missing_run=
++ AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
+
+- if test x$enable_gtk_doc = xyes; then
+- ifelse([$1],[],
+- [PKG_CHECK_EXISTS([gtk-doc],,
+- AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+- [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+- fi
++# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+- AC_MSG_CHECKING([whether to build gtk-doc documentation])
+- AC_MSG_RESULT($enable_gtk_doc)
++# AM_PROG_MKDIR_P
++# ---------------
++# Check for `mkdir -p'.
++AC_DEFUN([AM_PROG_MKDIR_P],
++[AC_PREREQ([2.60])dnl
++AC_REQUIRE([AC_PROG_MKDIR_P])dnl
++dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
++dnl while keeping a definition of mkdir_p for backward compatibility.
++dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
++dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
++dnl Makefile.ins that do not define MKDIR_P, so we do our own
++dnl adjustment using top_builddir (which is defined more often than
++dnl MKDIR_P).
++AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
++case $mkdir_p in
++ [[\\/$]]* | ?:[[\\/]]*) ;;
++ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
++esac
++])
+
+- dnl enable/disable output formats
+- AC_ARG_ENABLE([gtk-doc-html],
+- AS_HELP_STRING([--enable-gtk-doc-html],
+- [build documentation in html format [[default=yes]]]),,
+- [enable_gtk_doc_html=yes])
+- AC_ARG_ENABLE([gtk-doc-pdf],
+- AS_HELP_STRING([--enable-gtk-doc-pdf],
+- [build documentation in pdf format [[default=no]]]),,
+- [enable_gtk_doc_pdf=no])
++# Helper functions for option handling. -*- Autoconf -*-
+
+- if test -z "$GTKDOC_MKPDF"; then
+- enable_gtk_doc_pdf=no
+- fi
++# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
++# serial 4
+
+- AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
+- AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+- AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
+- AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+-])
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME. Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+-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
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+-case "$am__api_version" in
+- 1.[01234])
+- AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
+- ;;
+- *)
+- ;;
+-esac
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
+
+-if test -n "$1"; then
+- AC_MSG_CHECKING([for intltool >= $1])
++# Check to make sure that the build environment is sane. -*- Autoconf -*-
+
+- 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
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-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
++# serial 5
+
+- 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 $< [$]@'
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Reject unsafe characters in $srcdir or the absolute working directory
++# name. Accept space and tab only in the latter.
++am_lf='
++'
++case `pwd` in
++ *[[\\\"\#\$\&\'\`$am_lf]]*)
++ AC_MSG_ERROR([unsafe absolute working directory name]);;
++esac
++case $srcdir in
++ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
++ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
++esac
+
+-_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)
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments. Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
++ if test "$[*]" = "X"; then
++ # -L didn't work.
++ set X `ls -t "$srcdir/configure" conftest.file`
++ fi
++ rm -f conftest.file
++ if test "$[*]" != "X $srcdir/configure conftest.file" \
++ && test "$[*]" != "X conftest.file $srcdir/configure"; then
+
+-# 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
++ # If neither matched, then we have a broken ls. This can happen
++ # if, for instance, CONFIG_SHELL is bash and it inherits a
++ # broken ls alias from the environment. This has actually
++ # happened. Such a system could not be considered "sane".
++ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
++alias in your environment])
++ fi
+
+-AC_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])
++ test "$[2]" = conftest.file
++ )
++then
++ # Ok.
++ :
+ 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
++ AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
+ fi
++AC_MSG_RESULT(yes)])
+
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
+-AC_SUBST(ALL_LINGUAS)
++# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-# 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])
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries. This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'. However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++ AC_CHECK_TOOL([STRIP], [strip], :)
+ fi
+-AC_SUBST(DATADIRNAME)
++INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+-IT_PO_SUBDIR([po])
++# Copyright (C) 2006, 2008 Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
+
+-])
++# serial 2
++
++# _AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
++# This macro is traced by Automake.
++AC_DEFUN([_AM_SUBST_NOTMAKE])
++
++# AM_SUBST_NOTMAKE(VARIABLE)
++# ---------------------------
++# Public sister of _AM_SUBST_NOTMAKE.
++AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
+
++# Check how to create a tarball. -*- Autoconf -*-
+
+-# IT_PO_SUBDIR(DIRNAME)
+-# ---------------------
+-# All po subdirs have to be declared with this macro; the subdir "po" is
+-# declared by IT_PROG_INTLTOOL.
++# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ #
+-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
+-])
++# 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.
+
+-# _IT_SUBST(VARIABLE)
+-# -------------------
+-# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
++# serial 2
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
+ #
+-AC_DEFUN([_IT_SUBST],
+-[
+-AC_SUBST([$1])
+-m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+-]
+-)
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++# tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++# $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++ [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++ [m4_case([$1], [ustar],, [pax],,
++ [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++ case $_am_tool in
++ gnutar)
++ for _am_tar in tar gnutar gtar;
++ do
++ AM_RUN_LOG([$_am_tar --version]) && break
++ done
++ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++ am__untar="$_am_tar -xf -"
++ ;;
++ plaintar)
++ # Must skip GNU tar: if it does not support --format= it doesn't create
++ # ustar tarball either.
++ (tar --version) >/dev/null 2>&1 && continue
++ am__tar='tar chf - "$$tardir"'
++ am__tar_='tar chf - "$tardir"'
++ am__untar='tar xf -'
++ ;;
++ pax)
++ am__tar='pax -L -x $1 -w "$$tardir"'
++ am__tar_='pax -L -x $1 -w "$tardir"'
++ am__untar='pax -r'
++ ;;
++ cpio)
++ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++ am__untar='cpio -i -H $1 -d'
++ ;;
++ none)
++ am__tar=false
++ am__tar_=false
++ am__untar=false
++ ;;
++ esac
+
+-# 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], ...)
++ # If the value was cached, stop now. We just wanted to have am__tar
++ # and am__untar set.
++ test -n "${am_cv_prog_tar_$1}" && break
++
++ # tar/untar a dummy directory, and stop if the command works
++ rm -rf conftest.dir
++ mkdir conftest.dir
++ echo GrepMe > conftest.dir/file
++ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++ rm -rf conftest.dir
++ if test -s conftest.tar; then
++ AM_RUN_LOG([$am__untar <conftest.tar])
++ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++ fi
++done
++rm -rf conftest.dir
+
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
+
+ m4_include([acinclude.m4])
+Index: gnome-vfs-2.24.4/config.guess
+===================================================================
+--- gnome-vfs-2.24.4.orig/config.guess 2011-03-16 16:48:05.861009688 +0100
++++ gnome-vfs-2.24.4/config.guess 2011-03-16 16:47:40.177009687 +0100
+@@ -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-11-20'
++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
+@@ -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."
+@@ -139,16 +140,6 @@
+ UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+-case "${UNAME_MACHINE}" in
+- i?86)
+- test -z "$VENDOR" && VENDOR=pc
+- ;;
+- *)
+- test -z "$VENDOR" && VENDOR=unknown
+- ;;
+-esac
+-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+-
+ # Note: order is significant - the case branches are not exclusive.
+
+ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+@@ -213,19 +204,19 @@
+ exit ;;
+ *:OpenBSD:*:*)
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+- echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
++ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+@@ -290,13 +281,13 @@
+ echo alpha-dec-winnt3.5
+ exit ;;
+ Amiga*:UNIX_System_V:4.0:*)
+- echo m68k-${VENDOR}-sysv4
++ echo m68k-unknown-sysv4
+ exit ;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-amigaos
++ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-morphos
++ echo ${UNAME_MACHINE}-unknown-morphos
+ exit ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+@@ -311,7 +302,7 @@
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+- echo arm-${VENDOR}-riscos
++ echo arm-unknown-riscos
+ exit ;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+@@ -419,7 +410,7 @@
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+- echo m68k-${VENDOR}-mint${UNAME_RELEASE}
++ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+@@ -730,9 +721,9 @@
+ exit ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+- echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
++ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+- echo ${UNAME_MACHINE}-${VENDOR}-osf1
++ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit ;;
+ parisc*:Lites*:*:*)
+@@ -792,19 +783,19 @@
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit ;;
+ sparc*:BSD/OS:*:*)
+- echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
++ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:BSD/OS:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
++ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit ;;
+ *:FreeBSD:*:*)
+ case ${UNAME_MACHINE} in
+ pc98)
+- echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+- echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+- echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
+ i*:CYGWIN*:*)
+@@ -826,10 +817,10 @@
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ authenticamd | genuineintel | EM64T)
+- echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
++ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+- echo ia64-${VENDOR}-interix${UNAME_RELEASE}
++ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+@@ -848,21 +839,21 @@
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+- echo x86_64-${VENDOR}-cygwin
++ echo x86_64-unknown-cygwin
+ exit ;;
+ p*:CYGWIN*:*)
+- echo powerpcle-${VENDOR}-cygwin
++ echo powerpcle-unknown-cygwin
+ exit ;;
+ prep*:SunOS:5.*:*)
+- echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
+ *:GNU:*:*)
+ # the GNU system
+- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
++ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+- echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
++ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+@@ -879,20 +870,20 @@
+ esac
+ objdump --private-headers /bin/sh | grep -q ld.so.1
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
++ 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 \
+ | grep -q __ARM_EABI__
+ then
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
++ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
+ exit ;;
+ avr32*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+@@ -901,7 +892,7 @@
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+- echo frv-${VENDOR}-linux-gnu
++ echo frv-unknown-linux-gnu
+ exit ;;
+ i*86:Linux:*:*)
+ LIBC=gnu
+@@ -912,16 +903,16 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit ;;
+ ia64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m32r*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ m68*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+@@ -940,51 +931,51 @@
+ #endif
+ EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
++ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+- echo or32-${VENDOR}-linux-gnu
++ echo or32-unknown-linux-gnu
+ exit ;;
+ padre:Linux:*:*)
+- echo sparc-${VENDOR}-linux-gnu
++ echo sparc-unknown-linux-gnu
+ exit ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-${VENDOR}-linux-gnu
++ 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
+- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+- *) echo hppa-${VENDOR}-linux-gnu ;;
++ PA7*) echo hppa1.1-unknown-linux-gnu ;;
++ PA8*) echo hppa2.0-unknown-linux-gnu ;;
++ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+ ppc64:Linux:*:*)
+- echo powerpc64-${VENDOR}-linux-gnu
++ echo powerpc64-unknown-linux-gnu
+ exit ;;
+ ppc:Linux:*:*)
+- echo powerpc-${VENDOR}-linux-gnu
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit ;;
+ sh64*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sh*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
+ x86_64:Linux:*:*)
+- echo x86_64-${VENDOR}-linux-gnu
++ echo x86_64-unknown-linux-gnu
+ exit ;;
+ xtensa*:Linux:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
++ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+@@ -1006,16 +997,16 @@
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit ;;
+ i*86:XTS-300:*:STOP)
+- echo ${UNAME_MACHINE}-${VENDOR}-stop
++ echo ${UNAME_MACHINE}-unknown-stop
+ exit ;;
+ i*86:atheos:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-atheos
++ echo ${UNAME_MACHINE}-unknown-atheos
+ exit ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+- echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+@@ -1035,7 +1026,7 @@
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
++ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+@@ -1074,7 +1065,7 @@
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4
++ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit ;;
+ mini*:CTIX:SYS*5:*)
+@@ -1111,19 +1102,19 @@
+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit ;;
+ TSUNAMI:LynxOS:2.*:*)
+- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ rs6000:LynxOS:2.*:*)
+- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
++ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+@@ -1173,7 +1164,7 @@
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+- echo mips-${VENDOR}-sysv${UNAME_RELEASE}
++ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+@@ -1264,13 +1255,13 @@
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+- echo ${UNAME_MACHINE}-${VENDOR}-plan9
++ echo ${UNAME_MACHINE}-unknown-plan9
+ exit ;;
+ *:TOPS-10:*:*)
+- echo pdp10-${VENDOR}-tops10
++ echo pdp10-unknown-tops10
+ exit ;;
+ *:TENEX:*:*)
+- echo pdp10-${VENDOR}-tenex
++ echo pdp10-unknown-tenex
+ exit ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+@@ -1279,16 +1270,16 @@
+ echo pdp10-xkl-tops20
+ exit ;;
+ *:TOPS-20:*:*)
+- echo pdp10-${VENDOR}-tops20
++ echo pdp10-unknown-tops20
+ exit ;;
+ *:ITS:*:*)
+- echo pdp10-${VENDOR}-its
++ echo pdp10-unknown-its
+ exit ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit ;;
+ *:DragonFly:*:*)
+- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
++ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+Index: gnome-vfs-2.24.4/config.h.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/config.h.in 2011-03-16 16:48:05.609009688 +0100
++++ gnome-vfs-2.24.4/config.h.in 2011-03-16 16:47:39.401009687 +0100
+@@ -47,9 +47,6 @@
+ /* Name of the gettext package */
+ #undef GETTEXT_PACKAGE
+
+-/* FIXME */
+-#undef GNUTLS_COMPAT
+-
+ /* Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise */
+ #undef GSS_C_NT_HOSTBASED_SERVICE
+
+Index: gnome-vfs-2.24.4/config.sub
+===================================================================
+--- gnome-vfs-2.24.4.orig/config.sub 2011-03-16 16:48:06.149009688 +0100
++++ gnome-vfs-2.24.4/config.sub 2011-03-16 16:47:40.181009687 +0100
+@@ -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-11-20'
++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
+@@ -75,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."
+@@ -380,7 +381,8 @@
+ | 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-* \
+@@ -1085,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
+@@ -1435,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+Index: gnome-vfs-2.24.4/configure
+===================================================================
+--- gnome-vfs-2.24.4.orig/configure 2011-03-16 16:48:07.321009688 +0100
++++ gnome-vfs-2.24.4/configure 2011-03-16 16:47:37.497009687 +0100
+@@ -791,7 +791,9 @@
+ HAVE_SSL_TRUE
+ LIBGNUTLS_LIBS
+ LIBGNUTLS_CFLAGS
+-LIBGNUTLS_CONFIG
++LIBGCRYPT_LIBS
++LIBGCRYPT_CFLAGS
++LIBGCRYPT_CONFIG
+ OPENSSL_LIBS
+ OPENSSL_CFLAGS
+ SAMBA_LIBS
+@@ -856,6 +858,8 @@
+ MSGFMT_OPTS
+ GETTEXT_PACKAGE
+ WARN_CFLAGS
++PROGRAMS_LIBS
++PROGRAMS_CFLAGS
+ TEST_LIBS
+ TEST_CFLAGS
+ MODULES_XML_GCONF_LIBS
+@@ -1056,7 +1060,7 @@
+ with_openssl_includes
+ with_openssl_libs
+ enable_gnutls
+-with_libgnutls_prefix
++with_libgcrypt_prefix
+ enable_avahi
+ enable_howl
+ enable_daemon
+@@ -1099,10 +1103,14 @@
+ MODULES_XML_GCONF_LIBS
+ TEST_CFLAGS
+ TEST_LIBS
++PROGRAMS_CFLAGS
++PROGRAMS_LIBS
+ LIBXML_CFLAGS
+ LIBXML_LIBS
+ OPENSSL_CFLAGS
+ OPENSSL_LIBS
++LIBGNUTLS_CFLAGS
++LIBGNUTLS_LIBS
+ AVAHI_CFLAGS
+ AVAHI_LIBS
+ HOWL_CFLAGS
+@@ -1780,7 +1788,8 @@
+ --with-samba-libs=PREFIX Location of Samba libs.
+ --with-openssl-includes=PREFIX Location of OpenSSL includes.
+ --with-openssl-libs=PREFIX Location of OpenSSL libs.
+- --with-libgnutls-prefix=PFX Prefix where libgnutls is installed (optional)
++ --with-libgcrypt-prefix=PFX
++ prefix where LIBGCRYPT is installed (optional)
+ --with-hal-mount=PROGRAM Program for mounting filesystems known to HAL (not used if gnome-mount is installed)
+ --with-hal-umount=PROGRAM Program for unmounting filesystems known to HAL (not used if gnome-mount is installed)
+ --with-hal-eject=PROGRAM Program for ejecting filesystems known to HAL (not used if gnome-mount is installed)
+@@ -1824,6 +1833,10 @@
+ linker flags for MODULES_XML_GCONF, overriding pkg-config
+ TEST_CFLAGS C compiler flags for TEST, overriding pkg-config
+ TEST_LIBS linker flags for TEST, overriding pkg-config
++ PROGRAMS_CFLAGS
++ C compiler flags for PROGRAMS, overriding pkg-config
++ PROGRAMS_LIBS
++ linker flags for PROGRAMS, overriding pkg-config
+ LIBXML_CFLAGS
+ C compiler flags for LIBXML, overriding pkg-config
+ LIBXML_LIBS linker flags for LIBXML, overriding pkg-config
+@@ -1831,6 +1844,10 @@
+ C compiler flags for OPENSSL, overriding pkg-config
+ OPENSSL_LIBS
+ linker flags for OPENSSL, overriding pkg-config
++ LIBGNUTLS_CFLAGS
++ C compiler flags for LIBGNUTLS, overriding pkg-config
++ LIBGNUTLS_LIBS
++ linker flags for LIBGNUTLS, overriding pkg-config
+ AVAHI_CFLAGS
+ C compiler flags for AVAHI, overriding pkg-config
+ AVAHI_LIBS linker flags for AVAHI, overriding pkg-config
+@@ -2818,7 +2835,7 @@
+ || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "failed to load site script $ac_site_file
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ done
+
+@@ -3077,11 +3094,11 @@
+ '
+ case `pwd` in
+ *[\\\"\#\$\&\'\`$am_lf]*)
+- as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
++ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+ *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
+- as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -3852,7 +3869,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3967,7 +3984,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "C compiler cannot create executables
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -4010,7 +4027,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -4069,7 +4086,7 @@
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ fi
+ fi
+@@ -4121,7 +4138,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -4826,7 +4843,7 @@
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -5320,7 +5337,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+
+ ac_ext=c
+@@ -5393,7 +5410,7 @@
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -5426,7 +5443,7 @@
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -6354,13 +6371,13 @@
+ else
+ lt_cv_nm_interface="BSD nm"
+ echo "int some_variable = 0;" > conftest.$ac_ext
+- (eval echo "\"\$as_me:6357: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:6374: $ac_compile\"" >&5)
+ (eval "$ac_compile" 2>conftest.err)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6360: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:6377: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+ cat conftest.err >&5
+- (eval echo "\"\$as_me:6363: output\"" >&5)
++ (eval echo "\"\$as_me:6380: output\"" >&5)
+ cat conftest.out >&5
+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+ lt_cv_nm_interface="MS dumpbin"
+@@ -6823,11 +6840,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -7562,7 +7579,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7565 "configure"' > conftest.$ac_ext
++ echo '#line 7582 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -8948,11 +8965,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:8951: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:8968: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:8955: \$? = $ac_status" >&5
++ echo "$as_me:8972: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9117,7 +9134,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -9287,11 +9304,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9290: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9307: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9294: \$? = $ac_status" >&5
++ echo "$as_me:9311: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9392,11 +9409,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9395: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9412: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9399: \$? = $ac_status" >&5
++ echo "$as_me:9416: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9447,11 +9464,11 @@
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9450: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9467: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9454: \$? = $ac_status" >&5
++ echo "$as_me:9471: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -9566,6 +9583,9 @@
+ openbsd*)
+ with_gnu_ld=no
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs=no
++ ;;
+ esac
+
+ ld_shlibs=yes
+@@ -9587,6 +9607,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -9678,7 +9699,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -9748,7 +9769,7 @@
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -9923,6 +9944,7 @@
+ if test "$aix_use_runtimelinking" = yes; then
+ shared_flag="$shared_flag "'${wl}-G'
+ fi
++ link_all_deplibs=no
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -10249,7 +10271,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -11139,7 +11161,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11194,6 +11216,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11814,7 +11848,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11817 "configure"
++#line 11851 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -11910,7 +11944,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<_LT_EOF
+-#line 11913 "configure"
++#line 11947 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12939,7 +12973,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ MODULES_XML_CFLAGS=$pkg_cv_MODULES_XML_CFLAGS
+ MODULES_XML_LIBS=$pkg_cv_MODULES_XML_LIBS
+@@ -13031,7 +13065,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ MODULES_CFLAGS=$pkg_cv_MODULES_CFLAGS
+ MODULES_LIBS=$pkg_cv_MODULES_LIBS
+@@ -13123,7 +13157,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ MODULES_FILE_CFLAGS=$pkg_cv_MODULES_FILE_CFLAGS
+ MODULES_FILE_LIBS=$pkg_cv_MODULES_FILE_LIBS
+@@ -13215,7 +13249,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ MODULES_GCONF_CFLAGS=$pkg_cv_MODULES_GCONF_CFLAGS
+ MODULES_GCONF_LIBS=$pkg_cv_MODULES_GCONF_LIBS
+@@ -13307,7 +13341,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ MODULES_XML_GCONF_CFLAGS=$pkg_cv_MODULES_XML_GCONF_CFLAGS
+ MODULES_XML_GCONF_LIBS=$pkg_cv_MODULES_XML_GCONF_LIBS
+@@ -13327,12 +13361,12 @@
+ pkg_cv_TEST_CFLAGS="$TEST_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_TEST_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
++ pkg_cv_TEST_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13343,12 +13377,12 @@
+ pkg_cv_TEST_LIBS="$TEST_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= \$GCONF_REQUIRED gthread-2.0 >= \$GLIB_REQUIRED gobject-2.0 >= \$GLIB_REQUIRED gmodule-no-export-2.0 >= \$GLIB_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_TEST_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
++ pkg_cv_TEST_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -13368,14 +13402,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED" 2>&1`
++ TEST_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED" 2>&1`
+ else
+- TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED" 2>&1`
++ TEST_PKG_ERRORS=`$PKG_CONFIG --print-errors "gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$TEST_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED) were not met:
++ as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED gthread-2.0 >= $GLIB_REQUIRED gobject-2.0 >= $GLIB_REQUIRED gmodule-no-export-2.0 >= $GLIB_REQUIRED) were not met:
+
+ $TEST_PKG_ERRORS
+
+@@ -13399,7 +13433,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ TEST_CFLAGS=$pkg_cv_TEST_CFLAGS
+ TEST_LIBS=$pkg_cv_TEST_LIBS
+@@ -13410,6 +13444,98 @@
+
+
+
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PROGRAMS" >&5
++$as_echo_n "checking for PROGRAMS... " >&6; }
++
++if test -n "$PROGRAMS_CFLAGS"; then
++ pkg_cv_PROGRAMS_CFLAGS="$PROGRAMS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PROGRAMS_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$PROGRAMS_LIBS"; then
++ pkg_cv_PROGRAMS_LIBS="$PROGRAMS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gobject-2.0 >= \$GLIB_REQUIRED\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gobject-2.0 >= $GLIB_REQUIRED") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_PROGRAMS_LIBS=`$PKG_CONFIG --libs "gobject-2.0 >= $GLIB_REQUIRED" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ PROGRAMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
++ else
++ PROGRAMS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gobject-2.0 >= $GLIB_REQUIRED" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$PROGRAMS_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (gobject-2.0 >= $GLIB_REQUIRED) were not met:
++
++$PROGRAMS_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables PROGRAMS_CFLAGS
++and PROGRAMS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables PROGRAMS_CFLAGS
++and PROGRAMS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5 ; }
++else
++ PROGRAMS_CFLAGS=$pkg_cv_PROGRAMS_CFLAGS
++ PROGRAMS_LIBS=$pkg_cv_PROGRAMS_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++
++
++
+ cflags_set=yes
+
+
+@@ -15037,7 +15163,7 @@
+ if test "${enable_schemas_install+set}" = set; then :
+ enableval=$enable_schemas_install; case ${enableval} in
+ yes|no) ;;
+- *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
++ *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+ esac
+ fi
+
+@@ -16253,7 +16379,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (int)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_int=0
+ fi
+@@ -16286,7 +16412,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (long)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_long=0
+ fi
+@@ -16319,7 +16445,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (long long)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_long_long=0
+ fi
+@@ -16427,7 +16553,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (size_t)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_size_t=0
+ fi
+@@ -16522,7 +16648,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (off_t)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_off_t=0
+ fi
+@@ -16618,7 +16744,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error 77 "cannot compute sizeof (ssize_t)
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ ac_cv_sizeof_ssize_t=0
+ fi
+@@ -16917,7 +17043,7 @@
+ ;; #(
+ *)
+ as_fn_error $? "unknown endianness
+- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
++ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ esac
+
+ ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
+@@ -17357,7 +17483,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ LIBXML_CFLAGS=$pkg_cv_LIBXML_CFLAGS
+ LIBXML_LIBS=$pkg_cv_LIBXML_LIBS
+@@ -17904,40 +18030,30 @@
+ if test "x${OPENSSL_LIBS}" != "x"; then
+ as_fn_error $? "*** Can't use both openssl and gnutls at the same time. Please pick one only. ***" "$LINENO" 5
+ else
+- ac_fn_c_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default"
+-if test "x$ac_cv_header_gcrypt_h" = x""yes; then :
+
++# Check whether --with-libgcrypt-prefix was given.
++if test "${with_libgcrypt_prefix+set}" = set; then :
++ withval=$with_libgcrypt_prefix; libgcrypt_config_prefix="$withval"
+ else
+- as_fn_error $? "*** Need gcrypt.h to compile with GnuTLS support ***" "$LINENO" 5
++ libgcrypt_config_prefix=""
+ fi
+
+-
+-
+-# Check whether --with-libgnutls-prefix was given.
+-if test "${with_libgnutls_prefix+set}" = set; then :
+- withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
+-else
+- libgnutls_config_prefix=""
+-fi
+-
+-
+- if test x$libgnutls_config_prefix != x ; then
+- libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
+- if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
++ if test x$libgcrypt_config_prefix != x ; then
++ if test x${LIBGCRYPT_CONFIG+set} != xset ; then
++ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config
+ fi
+ fi
+
+- # Extract the first word of "libgnutls-config", so it can be a program name with args.
+-set dummy libgnutls-config; ac_word=$2
++ # Extract the first word of "libgcrypt-config", so it can be a program name with args.
++set dummy libgcrypt-config; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then :
++if test "${ac_cv_path_LIBGCRYPT_CONFIG+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- case $LIBGNUTLS_CONFIG in
++ case $LIBGCRYPT_CONFIG in
+ [\\/]* | ?:[\\/]*)
+- ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
++ ac_cv_path_LIBGCRYPT_CONFIG="$LIBGCRYPT_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -17947,7 +18063,7 @@
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ ac_cv_path_LIBGCRYPT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+@@ -17955,410 +18071,197 @@
+ done
+ IFS=$as_save_IFS
+
+- test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
++ test -z "$ac_cv_path_LIBGCRYPT_CONFIG" && ac_cv_path_LIBGCRYPT_CONFIG="no"
+ ;;
+ esac
+ fi
+-LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
+-if test -n "$LIBGNUTLS_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CONFIG" >&5
+-$as_echo "$LIBGNUTLS_CONFIG" >&6; }
++LIBGCRYPT_CONFIG=$ac_cv_path_LIBGCRYPT_CONFIG
++if test -n "$LIBGCRYPT_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGCRYPT_CONFIG" >&5
++$as_echo "$LIBGCRYPT_CONFIG" >&6; }
+ else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+- min_libgnutls_version=1.0.0
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls - version >= $min_libgnutls_version" >&5
+-$as_echo_n "checking for libgnutls - version >= $min_libgnutls_version... " >&6; }
+- no_libgnutls=""
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- no_libgnutls=yes
++ tmp=1:1.2.0
++ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
++ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'`
++ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'`
+ else
+- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+-
+-
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+- rm -f conf.libgnutlstest
+- if test "$cross_compiling" = yes; then :
+- echo $ac_n "cross compiling; assumed OK... $ac_c"
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
+-
+-int
+-main ()
+-{
+- system ("touch conf.libgnutlstest");
++ req_libgcrypt_api=0
++ min_libgcrypt_version="$tmp"
++ fi
+
+- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
+- {
+- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
+- "$libgnutls_config_version", gnutls_check_version(NULL) );
+- printf("*** was found! If libgnutls-config was correct, then it is best\n");
+- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
+- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+- printf("*** required on your system.\n");
+- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
+- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
+- }
+- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
+- {
+- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
+- printf("*** library (version %s)\n", gnutls_check_version(NULL) );
+- }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGCRYPT - version >= $min_libgcrypt_version" >&5
++$as_echo_n "checking for LIBGCRYPT - version >= $min_libgcrypt_version... " >&6; }
++ ok=no
++ if test "$LIBGCRYPT_CONFIG" != "no" ; then
++ req_major=`echo $min_libgcrypt_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\1/'`
++ req_minor=`echo $min_libgcrypt_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\2/'`
++ req_micro=`echo $min_libgcrypt_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\)/\3/'`
++ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version`
++ major=`echo $libgcrypt_config_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1/'`
++ minor=`echo $libgcrypt_config_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\2/'`
++ micro=`echo $libgcrypt_config_version | \
++ sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
++ if test "$major" -gt "$req_major"; then
++ ok=yes
+ else
+- {
+- if ( gnutls_check_version( "$min_libgnutls_version" ) )
+- {
+- return 0;
+- }
+- else
+- {
+- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
+- gnutls_check_version(NULL) );
+- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
+- "$min_libgnutls_version" );
+- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
+- printf("*** \n");
+- printf("*** If you have already installed a sufficiently new version, this error\n");
+- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
+- printf("*** being found. The easiest way to fix this is to remove the old version\n");
+- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
+- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
+- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+- printf("*** so that the correct libraries are found at run-time))\n");
+- }
+- }
+- return 1;
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
+-else
+- no_libgnutls=yes
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
++ if test "$major" -eq "$req_major"; then
++ if test "$minor" -gt "$req_minor"; then
++ ok=yes
++ else
++ if test "$minor" -eq "$req_minor"; then
++ if test "$micro" -ge "$req_micro"; then
++ ok=yes
++ fi
++ fi
++ fi
++ fi
++ fi
+ fi
+-
+- if test "x$no_libgnutls" = x ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+-$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
+-
+- have_ssl=true
++ if test $ok = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes ($libgcrypt_config_version)" >&5
++$as_echo "yes ($libgcrypt_config_version)" >&6; }
+ else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
++ fi
++ if test $ok = yes; then
++ # If we have a recent libgcrypt, we should also check that the
++ # API is compatible
++ if test "$req_libgcrypt_api" -gt 0 ; then
++ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
++ if test "$tmp" -gt 0 ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBGCRYPT API version" >&5
++$as_echo_n "checking LIBGCRYPT API version... " >&6; }
++ if test "$req_libgcrypt_api" -eq "$tmp" ; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: okay" >&5
++$as_echo "okay" >&6; }
++ else
++ ok=no
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: does not match. want=$req_libgcrypt_api got=$tmp" >&5
++$as_echo "does not match. want=$req_libgcrypt_api got=$tmp" >&6; }
++ fi
++ fi
+ fi
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
+- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
+- echo "*** full path to libgnutls-config."
+- else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- echo "*** Could not run libgnutls test program, checking why..."
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
+-
+-int
+-main ()
+-{
+- return !!gnutls_check_version(NULL);
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
+- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+- echo "***"
+-else
+- echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
+- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
+- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- LIBGNUTLS_CFLAGS=""
+- LIBGNUTLS_LIBS=""
+- :
+ fi
+- rm -f conf.libgnutlstest
++ if test $ok = yes; then
++ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
++ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
++ :
++ else
++ LIBGCRYPT_CFLAGS=""
++ LIBGCRYPT_LIBS=""
++ :
++ fi
+
+
+
++ if test "x${LIBGCRYPT_LIBS}" = "x"; then
++ as_fn_error $? "Unable to find LIBGRYPT" "$LINENO" 5
++ fi
+
+- if test "x${LIBGNUTLS_LIBS}" = "x"; then
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5
++$as_echo_n "checking for LIBGNUTLS... " >&6; }
+
+-# Check whether --with-libgnutls-prefix was given.
+-if test "${with_libgnutls_prefix+set}" = set; then :
+- withval=$with_libgnutls_prefix; libgnutls_config_prefix="$withval"
++if test -n "$LIBGNUTLS_CFLAGS"; then
++ pkg_cv_LIBGNUTLS_CFLAGS="$LIBGNUTLS_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.0.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.0.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBGNUTLS_CFLAGS=`$PKG_CONFIG --cflags "gnutls >= 1.0.0" 2>/dev/null`
+ else
+- libgnutls_config_prefix=""
++ pkg_failed=yes
+ fi
+-
+-
+- if test x$libgnutls_config_prefix != x ; then
+- libgnutls_config_args="$libgnutls_config_args --prefix=$libgnutls_config_prefix"
+- if test x${LIBGNUTLS_CONFIG+set} != xset ; then
+- LIBGNUTLS_CONFIG=$libgnutls_config_prefix/bin/libgnutls-config
+- fi
+- fi
+-
+- # Extract the first word of "libgnutls-config", so it can be a program name with args.
+-set dummy libgnutls-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then :
+- $as_echo_n "(cached) " >&6
+-else
+- case $LIBGNUTLS_CONFIG in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_LIBGNUTLS_CONFIG="$LIBGNUTLS_CONFIG" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+- break 2
+- fi
+-done
+- done
+-IFS=$as_save_IFS
+-
+- test -z "$ac_cv_path_LIBGNUTLS_CONFIG" && ac_cv_path_LIBGNUTLS_CONFIG="no"
+- ;;
+-esac
++ else
++ pkg_failed=untried
+ fi
+-LIBGNUTLS_CONFIG=$ac_cv_path_LIBGNUTLS_CONFIG
+-if test -n "$LIBGNUTLS_CONFIG"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBGNUTLS_CONFIG" >&5
+-$as_echo "$LIBGNUTLS_CONFIG" >&6; }
++if test -n "$LIBGNUTLS_LIBS"; then
++ pkg_cv_LIBGNUTLS_LIBS="$LIBGNUTLS_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnutls >= 1.0.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gnutls >= 1.0.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBGNUTLS_LIBS=`$PKG_CONFIG --libs "gnutls >= 1.0.0" 2>/dev/null`
+ else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
+ fi
+
+
+- min_libgnutls_version=0.5.1
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgnutls - version >= $min_libgnutls_version" >&5
+-$as_echo_n "checking for libgnutls - version >= $min_libgnutls_version... " >&6; }
+- no_libgnutls=""
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- no_libgnutls=yes
+- else
+- LIBGNUTLS_CFLAGS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --cflags`
+- LIBGNUTLS_LIBS=`$LIBGNUTLS_CONFIG $libgnutls_config_args --libs`
+- libgnutls_config_version=`$LIBGNUTLS_CONFIG $libgnutls_config_args --version`
+
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+
+- ac_save_CFLAGS="$CFLAGS"
+- ac_save_LIBS="$LIBS"
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+- rm -f conf.libgnutlstest
+- if test "$cross_compiling" = yes; then :
+- echo $ac_n "cross compiling; assumed OK... $ac_c"
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
+ else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 1.0.0" 2>&1`
++ else
++ LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 1.0.0" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$LIBGNUTLS_PKG_ERRORS" >&5
+
+-int
+-main ()
+-{
+- system ("touch conf.libgnutlstest");
++ as_fn_error $? "Package requirements (gnutls >= 1.0.0) were not met:
+
+- if( strcmp( gnutls_check_version(NULL), "$libgnutls_config_version" ) )
+- {
+- printf("\n*** 'libgnutls-config --version' returned %s, but LIBGNUTLS (%s)\n",
+- "$libgnutls_config_version", gnutls_check_version(NULL) );
+- printf("*** was found! If libgnutls-config was correct, then it is best\n");
+- printf("*** to remove the old version of LIBGNUTLS. You may also be able to fix the error\n");
+- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+- printf("*** required on your system.\n");
+- printf("*** If libgnutls-config was wrong, set the environment variable LIBGNUTLS_CONFIG\n");
+- printf("*** to point to the correct copy of libgnutls-config, and remove the file config.cache\n");
+- printf("*** before re-running configure\n");
+- }
+- else if ( strcmp(gnutls_check_version(NULL), LIBGNUTLS_VERSION ) )
+- {
+- printf("\n*** LIBGNUTLS header file (version %s) does not match\n", LIBGNUTLS_VERSION);
+- printf("*** library (version %s)\n", gnutls_check_version(NULL) );
+- }
+- else
+- {
+- if ( gnutls_check_version( "$min_libgnutls_version" ) )
+- {
+- return 0;
+- }
+- else
+- {
+- printf("no\n*** An old version of LIBGNUTLS (%s) was found.\n",
+- gnutls_check_version(NULL) );
+- printf("*** You need a version of LIBGNUTLS newer than %s. The latest version of\n",
+- "$min_libgnutls_version" );
+- printf("*** LIBGNUTLS is always available from ftp://gnutls.hellug.gr/pub/gnutls.\n");
+- printf("*** \n");
+- printf("*** If you have already installed a sufficiently new version, this error\n");
+- printf("*** probably means that the wrong copy of the libgnutls-config shell script is\n");
+- printf("*** being found. The easiest way to fix this is to remove the old version\n");
+- printf("*** of LIBGNUTLS, but you can also set the LIBGNUTLS_CONFIG environment to point to the\n");
+- printf("*** correct copy of libgnutls-config. (In this case, you will have to\n");
+- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+- printf("*** so that the correct libraries are found at run-time))\n");
+- }
+- }
+- return 1;
+-}
++$LIBGNUTLS_PKG_ERRORS
+
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+
+-else
+- no_libgnutls=yes
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
++Alternatively, you may set the environment variables LIBGNUTLS_CFLAGS
++and LIBGNUTLS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
+
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
++Alternatively, you may set the environment variables LIBGNUTLS_CFLAGS
++and LIBGNUTLS_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
+
+- if test "x$no_libgnutls" = x ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5 ; }
++else
++ LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS
++ LIBGNUTLS_LIBS=$pkg_cv_LIBGNUTLS_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+
+ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
+
+-
+-$as_echo "#define GNUTLS_COMPAT 1" >>confdefs.h
+-
+- have_ssl=true
+- else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+- fi
+- if test "$LIBGNUTLS_CONFIG" = "no" ; then
+- echo "*** The libgnutls-config script installed by LIBGNUTLS could not be found"
+- echo "*** If LIBGNUTLS was installed in PREFIX, make sure PREFIX/bin is in"
+- echo "*** your path, or set the LIBGNUTLS_CONFIG environment variable to the"
+- echo "*** full path to libgnutls-config."
+- else
+- if test -f conf.libgnutlstest ; then
+- :
+- else
+- echo "*** Could not run libgnutls test program, checking why..."
+- CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS"
+- LIBS="$LIBS $LIBGNUTLS_LIBS"
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <gnutls/gnutls.h>
+-
+-int
+-main ()
+-{
+- return !!gnutls_check_version(NULL);
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- echo "*** The test program compiled, but did not run. This usually means"
+- echo "*** that the run-time linker is not finding LIBGNUTLS or finding the wrong"
+- echo "*** version of LIBGNUTLS. If it is not finding LIBGNUTLS, you'll need to set your"
+- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+- echo "*** to the installed location Also, make sure you have run ldconfig if that"
+- echo "*** is required on your system"
+- echo "***"
+- echo "*** If you have an old version installed, it is best to remove it, although"
+- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+- echo "***"
+-else
+- echo "*** The test program failed to compile or link. See the file config.log for the"
+- echo "*** exact error that occured. This usually means LIBGNUTLS was incorrectly installed"
+- echo "*** or that you have moved LIBGNUTLS since it was installed. In the latter case, you"
+- echo "*** may want to edit the libgnutls-config script: $LIBGNUTLS_CONFIG"
++ have_ssl=true
+ fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+- CFLAGS="$ac_save_CFLAGS"
+- LIBS="$ac_save_LIBS"
+- fi
+- fi
+- LIBGNUTLS_CFLAGS=""
+- LIBGNUTLS_LIBS=""
+- as_fn_error $? "Unable to find GNUTLS" "$LINENO" 5
+- fi
+- rm -f conf.libgnutlstest
+-
+-
+-
++ if test "x${LIBGNUTLS_LIBS}" = "x"; then
++ as_fn_error $? "Unable to find GNUTLS" "$LINENO" 5
+ fi
+ fi
+ fi
+@@ -18615,7 +18518,7 @@
+ fi
+ ENABLE_DAEMON=yes ;;
+ no) ENABLE_DAEMON=no ;;
+-*) as_fn_error $? "bad value $enableval for --enable-daemon" "$LINENO" 5 ;;
++*) as_fn_error $? "bad value $enableval for --enable-daemon" "$LINENO" 5 ;;
+ esac
+ else
+ ENABLE_DAEMON=$enable_daemon_default
+@@ -18643,7 +18546,7 @@
+ enableval=$enable_hal; case $enableval in
+ yes) ENABLE_HAL=yes ;;
+ no) ENABLE_HAL=no ;;
+-*) as_fn_error $? "bad value $enableval for --enable-hal" "$LINENO" 5 ;;
++*) as_fn_error $? "bad value $enableval for --enable-hal" "$LINENO" 5 ;;
+ esac
+ else
+ ENABLE_HAL=yes
+@@ -19442,7 +19345,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ LIBGNOMEVFS_CFLAGS=$pkg_cv_LIBGNOMEVFS_CFLAGS
+ LIBGNOMEVFS_LIBS=$pkg_cv_LIBGNOMEVFS_LIBS
+@@ -19450,8 +19353,8 @@
+ $as_echo "yes" >&6; }
+
+ fi
+-LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
+-LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
++LIBGNOMEVFS_CFLAGS="$LIBGNOMEVFS_CFLAGS $OPENSSL_CFLAGS $LIBGNUTLS_CFLAGS $LIBGCRYPT_CFLAGS $HOWL_CFLAGS $AVAHI_CFLAGS"
++LIBGNOMEVFS_LIBS="$LIBGNOMEVFS_LIBS $OPENSSL_LIBS $LIBGNUTLS_LIBS $LIBGCRYPT_LIBS $HOWL_LIBS $AVAHI_LIBS $RESOLVER_LIBS"
+
+
+
+@@ -19536,7 +19439,7 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ LIBGNOMEVFSDAEMON_CFLAGS=$pkg_cv_LIBGNOMEVFSDAEMON_CFLAGS
+ LIBGNOMEVFSDAEMON_LIBS=$pkg_cv_LIBGNOMEVFSDAEMON_LIBS
+@@ -19892,7 +19795,7 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+@@ -21831,7 +21734,7 @@
+ "gnome-vfs-module-2.0.pc") CONFIG_FILES="$CONFIG_FILES gnome-vfs-module-2.0.pc" ;;
+ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+
+- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+ esac
+ done
+
+@@ -22147,7 +22050,7 @@
+ esac
+ case $ac_mode$ac_tag in
+ :[FHL]*:*);;
+- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
++ :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+ :[FH]-) ac_tag=-:-;;
+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+ esac
+@@ -22175,7 +22078,7 @@
+ [\\/$]*) false;;
+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ esac ||
+- as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+ esac
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ as_fn_append ac_file_inputs " '$ac_f'"
+@@ -22202,7 +22105,7 @@
+
+ case $ac_tag in
+ *:-:* | *:-) cat >"$tmp/stdin" \
+- || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
++ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+ esac
+ ;;
+ esac
+@@ -22534,6 +22437,7 @@
+
+ # `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
+Index: gnome-vfs-2.24.4/daemon/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/daemon/Makefile.in 2011-03-16 16:48:06.081009688 +0100
++++ gnome-vfs-2.24.4/daemon/Makefile.in 2011-03-16 16:47:40.349009687 +0100
+@@ -172,6 +172,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -186,7 +189,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -249,6 +251,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/devel-docs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/devel-docs/Makefile.in 2011-03-16 16:48:06.873009688 +0100
++++ gnome-vfs-2.24.4/devel-docs/Makefile.in 2011-03-16 16:47:40.453009687 +0100
+@@ -162,6 +162,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -176,7 +179,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -239,6 +241,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/devel-docs/gnome-vfs-tutorial/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/devel-docs/gnome-vfs-tutorial/Makefile.in 2011-03-16 16:48:06.933009688 +0100
++++ gnome-vfs-2.24.4/devel-docs/gnome-vfs-tutorial/Makefile.in 2011-03-16 16:47:40.549009687 +0100
+@@ -122,6 +122,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -136,7 +139,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -199,6 +201,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/doc/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/doc/Makefile.in 2011-03-16 16:48:07.045009688 +0100
++++ gnome-vfs-2.24.4/doc/Makefile.in 2011-03-16 16:47:40.673009687 +0100
+@@ -129,6 +129,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -143,7 +146,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -206,6 +208,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+@@ -387,17 +391,18 @@
+ #
+ GPATH = $(srcdir)
+ TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+-EXTRA_DIST = \
++SETUP_FILES = \
+ $(content_files) \
+- $(HTML_IMAGES) \
+ $(DOC_MAIN_SGML_FILE) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- pdf-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+- $(srcdir)/pdf.stamp
++EXTRA_DIST = \
++ $(SETUP_FILES)
++
++DOC_STAMPS = setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
++ html-build.stamp pdf-build.stamp \
++ setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -618,20 +623,38 @@
+
+ $(REPORT_FILES): sgml-build.stamp
+
++#### setup ####
++
++setup-build.stamp:
++ - at if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ echo 'gtk-doc: Preparing build'; \
++ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
++ if test "x$$files" != "x" ; then \
++ for file in $$files ; do \
++ test -f $(abs_srcdir)/$$file && \
++ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
++ done \
++ fi; \
++ test -f $(abs_srcdir)/tmpl && \
++ cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
++ fi
++ @touch setup-build.stamp
++
++setup.stamp: setup-build.stamp
++ @true
++
+ #### scan ####
+
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+- @-chmod -R u+w $(srcdir)
+- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+- done ; \
+- cd $(srcdir) && \
+- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
++ done ; \
++ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
++ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+ else \
+- cd $(srcdir) ; \
+ for i in $(SCANOBJ_FILES) ; do \
+ test -f $$i || touch $$i ; \
+ done \
+@@ -643,10 +666,14 @@
+
+ #### templates ####
+
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
++tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+- @-chmod -R u+w $(srcdir)
+- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ if test -w $(abs_srcdir) ; then \
++ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
++ fi \
++ fi
+ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+@@ -660,11 +687,11 @@
+ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+- done ; \
+- cd $(srcdir) && \
+- gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
++ done ; \
++ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+@@ -674,26 +701,32 @@
+
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+- @-chmod -R u+w $(srcdir)
+- @rm -rf $(srcdir)/html
+- @mkdir $(srcdir)/html
++ @rm -rf html
++ @mkdir html
+ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+- mkhtml_options=--path="$(srcdir)"; \
++ mkhtml_options=--path="$(abs_srcdir)"; \
+ fi; \
+- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ - at test "x$(HTML_IMAGES)" = "x" || \
++ for file in $(HTML_IMAGES) ; do \
++ if test -f $(abs_srcdir)/$$file ; then \
++ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
++ fi; \
++ if test -f $(abs_builddir)/$$file ; then \
++ cp $(abs_builddir)/$$file $(abs_builddir)/html; \
++ fi; \
++ done;
+ @echo 'gtk-doc: Fixing cross-references'
+- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @touch html-build.stamp
+
+ #### pdf ####
+
+ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building PDF'
+- @-chmod -R u+w $(srcdir)
+- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @rm -rf $(DOC_MODULE).pdf
+ @mkpdf_imgdirs=""; \
+ if test "x$(HTML_IMAGES)" != "x"; then \
+ for img in $(HTML_IMAGES); do \
+@@ -704,7 +737,7 @@
+ fi; \
+ done; \
+ fi; \
+- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ @touch pdf-build.stamp
+
+ ##############
+@@ -714,12 +747,15 @@
+ rm -rf .libs
+
+ distclean-local:
+- cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
++ rm -rf tmpl; \
++ fi
+
+ maintainer-clean-local: clean
+- cd $(srcdir) && rm -rf xml html
++ rm -rf xml html
+
+ install-data-local:
+ @installfiles=`echo $(srcdir)/html/*`; \
+@@ -764,11 +800,11 @@
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+ mkdir $(distdir)/html
+- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- cp $(srcdir)/html/* $(distdir)/html
+- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
++ -cp $(build)/tmpl/*.sgml $(distdir)/tmpl
++ cp $(builddir)/html/* $(distdir)/html
++ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
++ -cp $(build)/$(DOC_MODULE).types $(distdir)/
++ -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+Index: gnome-vfs-2.24.4/gtk-doc.make
+===================================================================
+--- gnome-vfs-2.24.4.orig/gtk-doc.make 2011-03-16 16:48:05.721009688 +0100
++++ gnome-vfs-2.24.4/gtk-doc.make 2011-03-16 16:47:18.385009687 +0100
+@@ -23,17 +23,18 @@
+
+ TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
+
+-EXTRA_DIST = \
++SETUP_FILES = \
+ $(content_files) \
+- $(HTML_IMAGES) \
+ $(DOC_MAIN_SGML_FILE) \
+ $(DOC_MODULE)-sections.txt \
+ $(DOC_MODULE)-overrides.txt
+
+-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- pdf-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
+- $(srcdir)/pdf.stamp
++EXTRA_DIST = \
++ $(SETUP_FILES)
++
++DOC_STAMPS=setup-build.stamp scan-build.stamp tmpl-build.stamp sgml-build.stamp \
++ html-build.stamp pdf-build.stamp \
++ setup.stamp tmpl.stamp sgml.stamp html.stamp pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -70,20 +71,40 @@
+
+ $(REPORT_FILES): sgml-build.stamp
+
++#### setup ####
++
++setup-build.stamp:
++ - at if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ echo 'gtk-doc: Preparing build'; \
++ files=`echo $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types`; \
++ if test "x$$files" != "x" ; then \
++ for file in $$files ; do \
++ test -f $(abs_srcdir)/$$file && \
++ cp -p $(abs_srcdir)/$$file $(abs_builddir)/; \
++ done \
++ fi; \
++ test -f $(abs_srcdir)/tmpl && \
++ cp -rp $(abs_srcdir)/tmpl $(abs_builddir)/; \
++ fi
++ @touch setup-build.stamp
++
++
++setup.stamp: setup-build.stamp
++ @true
++
++
+ #### scan ####
+
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+- @-chmod -R u+w $(srcdir)
+- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+- done ; \
+- cd $(srcdir) && \
+- gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+- CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
++ done ; \
++ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
++ @if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) ; \
+ else \
+- cd $(srcdir) ; \
+ for i in $(SCANOBJ_FILES) ; do \
+ test -f $$i || touch $$i ; \
+ done \
+@@ -95,10 +116,14 @@
+
+ #### templates ####
+
+-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
++tmpl-build.stamp: setup.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+- @-chmod -R u+w $(srcdir)
+- @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ if test -w $(abs_srcdir) ; then \
++ cp -rp $(abs_builddir)/tmpl $(abs_srcdir)/; \
++ fi \
++ fi
+ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+@@ -112,11 +137,11 @@
+ sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- @_source_dir='' ; for i in $(DOC_SOURCE_DIR) ; do \
++ @_source_dir='' ; \
++ for i in $(DOC_SOURCE_DIR) ; do \
+ _source_dir="$${_source_dir} --source-dir=$$i" ; \
+- done ; \
+- cd $(srcdir) && \
+- gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
++ done ; \
++ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS)
+ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+@@ -126,26 +151,32 @@
+
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+- @-chmod -R u+w $(srcdir)
+- @rm -rf $(srcdir)/html
+- @mkdir $(srcdir)/html
++ @rm -rf html
++ @mkdir html
+ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+- mkhtml_options=--path="$(srcdir)"; \
++ mkhtml_options=--path="$(abs_srcdir)"; \
+ fi; \
+- cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ - at test "x$(HTML_IMAGES)" = "x" || \
++ for file in $(HTML_IMAGES) ; do \
++ if test -f $(abs_srcdir)/$$file ; then \
++ cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
++ fi; \
++ if test -f $(abs_builddir)/$$file ; then \
++ cp $(abs_builddir)/$$file $(abs_builddir)/html; \
++ fi; \
++ done;
+ @echo 'gtk-doc: Fixing cross-references'
+- @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ @touch html-build.stamp
+
+ #### pdf ####
+
+ pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building PDF'
+- @-chmod -R u+w $(srcdir)
+- @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @rm -rf $(DOC_MODULE).pdf
+ @mkpdf_imgdirs=""; \
+ if test "x$(HTML_IMAGES)" != "x"; then \
+ for img in $(HTML_IMAGES); do \
+@@ -156,7 +187,7 @@
+ fi; \
+ done; \
+ fi; \
+- cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
+ @touch pdf-build.stamp
+
+ ##############
+@@ -166,12 +197,15 @@
+ rm -rf .libs
+
+ distclean-local:
+- cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+- $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ rm -rf xml html $(REPORT_FILES) $(DOC_MODULE).pdf \
++ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
++ if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
++ rm -f $(SETUP_FILES) $(expand_content_files) $(DOC_MODULE).types; \
++ rm -rf tmpl; \
++ fi
+
+ maintainer-clean-local: clean
+- cd $(srcdir) && rm -rf xml html
++ rm -rf xml html
+
+ install-data-local:
+ @installfiles=`echo $(srcdir)/html/*`; \
+@@ -219,11 +253,11 @@
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+ mkdir $(distdir)/html
+- -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- cp $(srcdir)/html/* $(distdir)/html
+- -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+- -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+- -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
++ -cp $(build)/tmpl/*.sgml $(distdir)/tmpl
++ cp $(builddir)/html/* $(distdir)/html
++ -cp $(builddir)/$(DOC_MODULE).pdf $(distdir)/
++ -cp $(build)/$(DOC_MODULE).types $(distdir)/
++ -cp $(build)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+Index: gnome-vfs-2.24.4/imported/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/imported/Makefile.in 2011-03-16 16:48:04.909009688 +0100
++++ gnome-vfs-2.24.4/imported/Makefile.in 2011-03-16 16:47:40.777009687 +0100
+@@ -162,6 +162,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -176,7 +179,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -239,6 +241,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/imported/fnmatch/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/imported/fnmatch/Makefile.in 2011-03-16 16:48:05.001009688 +0100
++++ gnome-vfs-2.24.4/imported/fnmatch/Makefile.in 2011-03-16 16:47:40.913009687 +0100
+@@ -146,6 +146,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -160,7 +163,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -223,6 +225,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/imported/neon/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/imported/neon/Makefile.in 2011-03-16 16:48:05.105009688 +0100
++++ gnome-vfs-2.24.4/imported/neon/Makefile.in 2011-03-16 16:47:41.057009687 +0100
+@@ -157,6 +157,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -171,7 +174,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -234,6 +236,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/libgnomevfs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/libgnomevfs/Makefile.in 2011-03-16 16:48:05.241009688 +0100
++++ gnome-vfs-2.24.4/libgnomevfs/Makefile.in 2011-03-16 16:47:41.249009687 +0100
+@@ -258,6 +258,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -272,7 +275,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -335,6 +337,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/ltmain.sh
+===================================================================
+--- gnome-vfs-2.24.4.orig/ltmain.sh 2011-03-16 16:48:05.801009688 +0100
++++ gnome-vfs-2.24.4/ltmain.sh 2011-03-16 16:47:30.485009687 +0100
+@@ -65,7 +65,7 @@
+ # compiler: $LTCC
+ # compiler flags: $LTCFLAGS
+ # linker: $LD (gnu? $with_gnu_ld)
+-# $progname: (GNU libtool) 2.2.6b
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
+ # automake: $automake_version
+ # autoconf: $autoconf_version
+ #
+@@ -73,7 +73,7 @@
+
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=2.2.6b
++VERSION="2.2.6b Debian-2.2.6b-2"
+ TIMESTAMP=""
+ package_revision=1.3017
+
+@@ -5033,7 +5033,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$linkmode,$pass" = "lib,dlpreopen"; then
+@@ -5344,19 +5347,19 @@
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if $opt_duplicate_deps ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ func_fatal_error "\`$lib' is not a convenience library"
+ fi
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- deplibs="$deplib $deplibs"
+- if $opt_duplicate_deps ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ continue
+ fi # $pass = conv
+
+@@ -5893,6 +5896,7 @@
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
++ path=
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+@@ -6206,6 +6210,9 @@
+ revision="$number_minor"
+ lt_irix_increment=no
+ ;;
++ *)
++ func_fatal_configuration "$modename: unknown library version type \`$version_type'"
++ ;;
+ esac
+ ;;
+ no)
+Index: gnome-vfs-2.24.4/modules/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/modules/Makefile.in 2011-03-16 16:48:06.745009688 +0100
++++ gnome-vfs-2.24.4/modules/Makefile.in 2011-03-16 16:47:41.469009687 +0100
+@@ -294,6 +294,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -308,7 +311,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -371,6 +373,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/programs/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/programs/Makefile.in 2011-03-16 16:48:05.985009688 +0100
++++ gnome-vfs-2.24.4/programs/Makefile.in 2011-03-16 16:47:41.629009687 +0100
+@@ -184,6 +184,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -198,7 +201,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -261,6 +263,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+@@ -343,13 +347,13 @@
+ INCLUDES = \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+- $(TEST_CFLAGS) \
++ $(PROGRAMS_CFLAGS) \
+ $(VFS_CFLAGS) \
+ -DG_DISABLE_DEPRECATED
+
+ libraries = \
+ $(top_builddir)/libgnomevfs/libgnomevfs-2.la \
+- $(TEST_LIBS) \
++ $(PROGRAMS_LIBS) \
+ $(LIBEFS_LIBS)
+
+ gnomevfs_cat_SOURCES = gnomevfs-cat.c
+Index: gnome-vfs-2.24.4/schemas/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/schemas/Makefile.in 2011-03-16 16:48:06.657009688 +0100
++++ gnome-vfs-2.24.4/schemas/Makefile.in 2011-03-16 16:47:41.741009687 +0100
+@@ -146,6 +146,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -160,7 +163,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -223,6 +225,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
+Index: gnome-vfs-2.24.4/test/Makefile.in
+===================================================================
+--- gnome-vfs-2.24.4.orig/test/Makefile.in 2011-03-16 16:48:06.529009688 +0100
++++ gnome-vfs-2.24.4/test/Makefile.in 2011-03-16 16:47:42.021009687 +0100
+@@ -309,6 +309,9 @@
+ LDFLAGS = @LDFLAGS@
+ LIBEFS_CFLAGS = @LIBEFS_CFLAGS@
+ LIBEFS_LIBS = @LIBEFS_LIBS@
++LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
++LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
++LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+ LIBGNOMEVFSDAEMON_CFLAGS = @LIBGNOMEVFSDAEMON_CFLAGS@
+ LIBGNOMEVFSDAEMON_LIBS = @LIBGNOMEVFSDAEMON_LIBS@
+ LIBGNOMEVFS_AGE = @LIBGNOMEVFS_AGE@
+@@ -323,7 +326,6 @@
+ LIBGNOMEVFS_REVISION = @LIBGNOMEVFS_REVISION@
+ LIBGNOMEVFS_VERSION = @LIBGNOMEVFS_VERSION@
+ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+-LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+ LIBOBJS = @LIBOBJS@
+ LIBS = @LIBS@
+@@ -386,6 +388,8 @@
+ POSUB = @POSUB@
+ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
++PROGRAMS_CFLAGS = @PROGRAMS_CFLAGS@
++PROGRAMS_LIBS = @PROGRAMS_LIBS@
+ RANLIB = @RANLIB@
+ REBUILD = @REBUILD@
+ SAMBA_CFLAGS = @SAMBA_CFLAGS@
Added: desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch?rev=26916&op=file
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/gnome-vfs/debian/patches/99_ltmain_as-needed.patch [utf-8] Wed Mar 16 15:50:01 2011
@@ -1,0 +1,32 @@
+Index: gnome-vfs-2.24.2/ltmain.sh
+===================================================================
+--- gnome-vfs-2.24.2.orig/ltmain.sh 2010-02-06 11:55:51.537282236 +0100
++++ gnome-vfs-2.24.2/ltmain.sh 2010-02-06 11:55:52.549279295 +0100
+@@ -4716,6 +4716,11 @@
+ arg=$func_stripname_result
+ ;;
+
++ -Wl,--as-needed)
++ deplibs="$deplibs $arg"
++ continue
++ ;;
++
+ -Wl,*)
+ func_stripname '-Wl,' '' "$arg"
+ args=$func_stripname_result
+@@ -5070,6 +5075,15 @@
+ lib=
+ found=no
+ case $deplib in
++ -Wl,--as-needed)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ deplibs="$deplib $deplibs"
++ fi
++ continue
++ ;;
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
Modified: desktop/unstable/gnome-vfs/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/patches/series?rev=26916&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/patches/series [utf-8] Wed Mar 16 15:50:01 2011
@@ -21,3 +21,5 @@
24_home_dir_fakeroot.patch
30_nfs4.patch
31_link_tests_and_programs_against_required_libs.patch
+90_relibtoolize.patch
+99_ltmain_as-needed.patch
Modified: desktop/unstable/gnome-vfs/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs/debian/rules?rev=26916&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs/debian/rules [utf-8] (original)
+++ desktop/unstable/gnome-vfs/debian/rules [utf-8] Wed Mar 16 15:50:01 2011
@@ -2,7 +2,6 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
@@ -27,5 +26,7 @@
--libexecdir=/usr/lib/gnome-vfs-2.0 \
$(HOST_ARCH_CONFIGURE_FLAGS)
+DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"
+
DEB_DH_MAKESHLIBS_ARGS_libgnomevfs2-extra := --no-act
DEB_COMPRESS_EXCLUDE := html
More information about the pkg-gnome-commits
mailing list