r23827 - in /desktop/unstable/totem/debian: changelog patches/02_python2.6.patch patches/70_bbc_plugin.patch patches/90_autotools.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Fri Apr 16 00:20:07 UTC 2010
Author: biebl
Date: Fri Apr 16 00:20:05 2010
New Revision: 23827
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23827
Log:
Refresh patches to apply cleanly.
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/patches/02_python2.6.patch
desktop/unstable/totem/debian/patches/70_bbc_plugin.patch
desktop/unstable/totem/debian/patches/90_autotools.patch
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=23827&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Fri Apr 16 00:20:05 2010
@@ -3,6 +3,7 @@
* debian/patches/03_tracker_0.8.patch
- Add support for tracker 0.8. Closes: #577207
Patch backported from upstream Git.
+ * Refresh patches to apply cleanly.
-- Michael Biebl <biebl at debian.org> Fri, 16 Apr 2010 02:14:39 +0200
Modified: desktop/unstable/totem/debian/patches/02_python2.6.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/02_python2.6.patch?rev=23827&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/02_python2.6.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/02_python2.6.patch [utf-8] Fri Apr 16 00:20:05 2010
@@ -5,11 +5,11 @@
https://bugzilla.gnome.org/show_bug.cgi?id=604077
---
-diff --git a/configure.in b/configure.in
-index e32afc3..c815fd0 100644
+Index: b/configure.in
+===================================================================
--- a/configure.in
+++ b/configure.in
-@@ -318,10 +318,9 @@ if test "x$have_python" != "xno"; then
+@@ -319,10 +319,9 @@
PYTHON_MAKEFILE="$PY_EXEC_PREFIX/lib/python$PYTHON_VERSION/config/Makefile"
fi
PYTHON_CFLAGS="-I$PY_PREFIX/include/python$PYTHON_VERSION"
@@ -21,5 +21,3 @@
AC_SUBST([PYTHON_LIBS])
AC_SUBST([PYTHON_LIB_LOC])
AC_SUBST([PYTHON_CFLAGS])
---
-cgit v0.8.3.1
Modified: desktop/unstable/totem/debian/patches/70_bbc_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_bbc_plugin.patch?rev=23827&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] Fri Apr 16 00:20:05 2010
@@ -1,3 +1,5 @@
+Index: b/bindings/python/totem.defs
+===================================================================
--- a/bindings/python/totem.defs
+++ b/bindings/python/totem.defs
@@ -206,6 +206,16 @@
@@ -17,6 +19,8 @@
(define-method action_stop
(of-object "TotemObject")
(c-name "totem_action_stop")
+Index: b/configure.in
+===================================================================
--- a/configure.in
+++ b/configure.in
@@ -52,7 +52,7 @@
@@ -28,7 +32,7 @@
PLUGINDIR='${libdir}/totem/plugins'
AC_SUBST(PLUGINDIR)
-@@ -513,6 +513,32 @@
+@@ -512,6 +512,32 @@
add_plugin="0"
fi
;;
@@ -61,7 +65,7 @@
bemused)
PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
if test "${HAVE_BLUEZ}" != "yes" ; then
-@@ -818,6 +844,7 @@
+@@ -821,6 +847,7 @@
lib/Makefile
src/Makefile
src/plugins/Makefile
@@ -69,6 +73,8 @@
src/plugins/bemused/Makefile
src/plugins/coherence_upnp/Makefile
src/plugins/dbus-service/Makefile
+Index: b/src/plugins/bbc/Makefile.am
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/Makefile.am
@@ -0,0 +1,26 @@
@@ -98,6 +104,8 @@
+ echo
+
+
+Index: b/src/plugins/bbc/bbc.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/bbc.py
@@ -0,0 +1,95 @@
@@ -196,6 +204,8 @@
+ else:
+ gst.error('No uri for episode ' + episode.title)
+
+Index: b/src/plugins/bbc/bbc.totem-plugin.in
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/bbc.totem-plugin.in
@@ -0,0 +1,9 @@
@@ -208,6 +218,8 @@
+Authors=Tim-Philipp Müller <tim.muller at collabora.co.uk>
+Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd.
+Website=http://www.gnome.org/projects/totem/
+Index: b/src/plugins/bbc/contentview.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/contentview.py
@@ -0,0 +1,1019 @@
@@ -1230,6 +1242,8 @@
+ window.show_all()
+ gtk.main()
+
+Index: b/src/plugins/bbc/genres.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/genres.py
@@ -0,0 +1,251 @@
@@ -1484,6 +1498,8 @@
+if __name__ == "__main__":
+ pass
+
+Index: b/src/plugins/bbc/installablecodecs.py
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/installablecodecs.py
@@ -0,0 +1,112 @@
Modified: desktop/unstable/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/90_autotools.patch?rev=23827&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] Fri Apr 16 00:20:05 2010
@@ -1,3 +1,91 @@
+Index: b/Makefile.in
+===================================================================
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -124,6 +124,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -180,6 +182,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -239,6 +243,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -442,7 +447,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -467,7 +472,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -637,7 +642,8 @@
+ fi; \
+ done
+ -test -n "$(am__skip_mode_fix)" \
+- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++ || find "$(distdir)" -type d ! -perm -755 \
++ -exec chmod u+rwx,go+rx {} \; -o \
+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
+@@ -680,17 +686,17 @@
+ distcheck: dist
+ case '$(DIST_ARCHIVES)' in \
+ *.tar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ *.tar.bz2*) \
+- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
+ *.tar.lzma*) \
+- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
++ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+ *.tar.xz*) \
+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
+ *.tar.Z*) \
+ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
+ *.shar.gz*) \
+- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ *.zip*) \
+ unzip $(distdir).zip ;;\
+ esac
+Index: b/aclocal.m4
+===================================================================
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,4 +1,4 @@
@@ -65,6 +153,15 @@
])
+@@ -938,7 +960,7 @@
+ AC_DEFUN([IT_PO_SUBDIR],
+ [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+ dnl
+-dnl The following CONFIG_COMMANDS should be exetuted at the very end
++dnl 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], [
@@ -3422,7 +3444,7 @@
;;
@@ -306,6 +403,8 @@
esac
])
AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])
+Index: b/bindings/Makefile.in
+===================================================================
--- a/bindings/Makefile.in
+++ b/bindings/Makefile.in
@@ -1,4 +1,4 @@
@@ -358,6 +457,8 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
+Index: b/bindings/python/Makefile.in
+===================================================================
--- a/bindings/python/Makefile.in
+++ b/bindings/python/Makefile.in
@@ -1,4 +1,4 @@
@@ -392,6 +493,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/bindings/vala/Makefile.in
+===================================================================
--- a/bindings/vala/Makefile.in
+++ b/bindings/vala/Makefile.in
@@ -1,4 +1,4 @@
@@ -426,6 +529,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/browser-plugin/Makefile.in
+===================================================================
--- a/browser-plugin/Makefile.in
+++ b/browser-plugin/Makefile.in
@@ -1,4 +1,4 @@
@@ -460,6 +565,380 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/compile
+===================================================================
+--- a/compile
++++ b/compile
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # Wrapper for compilers which do not understand `-c -o'.
+
+-scriptversion=2009-04-28.21; # UTC
++scriptversion=2009-10-06.20; # UTC
+
+ # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
+ # Foundation, Inc.
+@@ -124,9 +124,9 @@
+ ret=$?
+
+ if test -f "$cofile"; then
+- mv "$cofile" "$ofile"
++ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+ elif test -f "${cofile}bj"; then
+- mv "${cofile}bj" "$ofile"
++ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+ fi
+
+ rmdir "$lockdir"
+Index: b/config.guess
+===================================================================
+--- a/config.guess
++++ b/config.guess
+@@ -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
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-27'
++timestamp='2009-12-30'
+
+ # This file is free software; you can redistribute it and/or modify it
+ # under the terms of the GNU General Public License as published by
+@@ -27,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+
+
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner. Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub. If it succeeds, it prints the system name on stdout, and
+ # exits with 0. Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+
+ me=`echo "$0" | sed -e 's,.*/,,'`
+
+@@ -56,8 +56,9 @@
+ GNU config.guess ($timestamp)
+
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -170,7 +171,7 @@
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+- | grep __ELF__ >/dev/null
++ | grep -q __ELF__
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+@@ -333,6 +334,9 @@
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit ;;
++ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++ echo i386-pc-auroraux${UNAME_RELEASE}
++ exit ;;
+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
+ eval $set_cc_for_build
+ SUN_ARCH="i386"
+@@ -656,7 +660,7 @@
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+- grep __LP64__ >/dev/null
++ grep -q __LP64__
+ then
+ HP_ARCH="hppa2.0w"
+ else
+@@ -807,12 +811,12 @@
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit ;;
+- *:Interix*:[3456]*)
++ *:Interix*:*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+- EM64T | authenticamd | genuineintel)
++ authenticamd | genuineintel | EM64T)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ IA64)
+@@ -822,6 +826,9 @@
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit ;;
++ 8664:Windows_NT:*)
++ echo x86_64-pc-mks
++ exit ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+@@ -851,6 +858,20 @@
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit ;;
++ alpha:Linux:*:*)
++ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++ EV5) UNAME_MACHINE=alphaev5 ;;
++ EV56) UNAME_MACHINE=alphaev56 ;;
++ PCA56) UNAME_MACHINE=alphapca56 ;;
++ PCA57) UNAME_MACHINE=alphapca56 ;;
++ EV6) UNAME_MACHINE=alphaev6 ;;
++ EV67) UNAME_MACHINE=alphaev67 ;;
++ EV68*) UNAME_MACHINE=alphaev68 ;;
++ esac
++ objdump --private-headers /bin/sh | grep -q ld.so.1
++ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++ exit ;;
+ arm*:Linux:*:*)
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+@@ -873,6 +894,17 @@
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
++ i*86:Linux:*:*)
++ LIBC=gnu
++ eval $set_cc_for_build
++ sed 's/^ //' << EOF >$dummy.c
++ #ifdef __dietlibc__
++ LIBC=dietlibc
++ #endif
++EOF
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++ exit ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+@@ -882,78 +914,34 @@
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- mips:Linux:*:*)
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #undef CPU
+- #undef mips
+- #undef mipsel
+- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mipsel
+- #else
+- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips
+- #else
+- CPU=
+- #endif
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
+- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+- ;;
+- mips64:Linux:*:*)
++ mips:Linux:*:* | mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+- #undef mips64
+- #undef mips64el
++ #undef ${UNAME_MACHINE}
++ #undef ${UNAME_MACHINE}el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+- CPU=mips64el
++ CPU=${UNAME_MACHINE}el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+- CPU=mips64
++ CPU=${UNAME_MACHINE}
+ #else
+ CPU=
+ #endif
+ #endif
+ EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^CPU/{
+- s: ::g
+- p
+- }'`"
++ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
+ ;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
+- ppc:Linux:*:*)
+- echo powerpc-unknown-linux-gnu
+- exit ;;
+- ppc64:Linux:*:*)
+- echo powerpc64-unknown-linux-gnu
+- exit ;;
+- alpha:Linux:*:*)
+- case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+- EV5) UNAME_MACHINE=alphaev5 ;;
+- EV56) UNAME_MACHINE=alphaev56 ;;
+- PCA56) UNAME_MACHINE=alphapca56 ;;
+- PCA57) UNAME_MACHINE=alphapca56 ;;
+- EV6) UNAME_MACHINE=alphaev6 ;;
+- EV67) UNAME_MACHINE=alphaev67 ;;
+- EV68*) UNAME_MACHINE=alphaev68 ;;
+- esac
+- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+- exit ;;
+ padre:Linux:*:*)
+ echo sparc-unknown-linux-gnu
+ exit ;;
++ parisc64:Linux:*:* | hppa64:Linux:*:*)
++ echo hppa64-unknown-linux-gnu
++ exit ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+@@ -962,8 +950,11 @@
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit ;;
+- parisc64:Linux:*:* | hppa64:Linux:*:*)
+- echo hppa64-unknown-linux-gnu
++ ppc64:Linux:*:*)
++ echo powerpc64-unknown-linux-gnu
++ exit ;;
++ ppc:Linux:*:*)
++ echo powerpc-unknown-linux-gnu
+ exit ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+@@ -986,66 +977,6 @@
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
+- i*86:Linux:*:*)
+- # The BFD linker knows what the default object file format is, so
+- # first see if it will tell us. cd to the root directory to prevent
+- # problems with other programs or directories called `ld' in the path.
+- # Set LC_ALL=C to ensure ld outputs messages in English.
+- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+- | sed -ne '/supported targets:/!d
+- s/[ ][ ]*/ /g
+- s/.*supported targets: *//
+- s/ .*//
+- p'`
+- case "$ld_supported_targets" in
+- elf32-i386)
+- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+- ;;
+- a.out-i386-linux)
+- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+- exit ;;
+- "")
+- # Either a pre-BFD a.out linker (linux-gnuoldld) or
+- # one that does not give us useful --help.
+- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+- exit ;;
+- esac
+- # Determine whether the default compiler is a.out or elf
+- eval $set_cc_for_build
+- sed 's/^ //' << EOF >$dummy.c
+- #include <features.h>
+- #ifdef __ELF__
+- # ifdef __GLIBC__
+- # if __GLIBC__ >= 2
+- LIBC=gnu
+- # else
+- LIBC=gnulibc1
+- # endif
+- # else
+- LIBC=gnulibc1
+- # endif
+- #else
+- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
+- LIBC=gnu
+- #else
+- LIBC=gnuaout
+- #endif
+- #endif
+- #ifdef __dietlibc__
+- LIBC=dietlibc
+- #endif
+-EOF
+- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+- /^LIBC/{
+- s: ::g
+- p
+- }'`"
+- test x"${LIBC}" != x && {
+- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+- exit
+- }
+- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+- ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+@@ -1074,7 +1005,7 @@
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit ;;
+- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
++ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ i*86:*DOS:*:*)
+@@ -1182,7 +1113,7 @@
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
++ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit ;;
+ SM[BE]S:UNIX_SV:*:*)
+@@ -1275,6 +1206,16 @@
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
++ i386)
++ eval $set_cc_for_build
++ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++ grep IS_64BIT_ARCH >/dev/null
++ then
++ UNAME_PROCESSOR="x86_64"
++ fi
++ fi ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+Index: b/config.h.in
+===================================================================
--- a/config.h.in
+++ b/config.h.in
@@ -100,6 +100,9 @@
@@ -472,6 +951,206 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+Index: b/config.sub
+===================================================================
+--- a/config.sub
++++ b/config.sub
+@@ -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
++# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ # Free Software Foundation, Inc.
+
+-timestamp='2009-04-17'
++timestamp='2010-01-22'
+
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -32,13 +32,16 @@
+
+
+ # Please send patches to <config-patches at gnu.org>. Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -72,8 +75,9 @@
+ version="\
+ GNU config.sub ($timestamp)
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+
+ This is free software; see the source for copying conditions. There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -149,10 +153,13 @@
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+- -apple | -axis | -knuth | -cray)
++ -apple | -axis | -knuth | -cray | -microblaze)
+ os=
+ basic_machine=$1
+ ;;
++ -bluegene*)
++ os=-cnk
++ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+@@ -281,6 +288,7 @@
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
++ | rx \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+@@ -288,13 +296,14 @@
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
++ | ubicom32 \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k | z80)
+ basic_machine=$basic_machine-unknown
+ ;;
+- m6811 | m68hc11 | m6812 | m68hc12)
++ m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+@@ -337,7 +346,7 @@
+ | lm32-* \
+ | m32c-* | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+@@ -365,15 +374,17 @@
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+- | romp-* | rs6000-* \
++ | romp-* | rs6000-* | rx-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++ | tile-* | tilegx-* \
+ | tron-* \
++ | ubicom32-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+@@ -467,6 +478,10 @@
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
++ bluegene*)
++ basic_machine=powerpc-ibm
++ os=-cnk
++ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+@@ -719,6 +734,9 @@
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
++ microblaze)
++ basic_machine=microblaze-xilinx
++ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+@@ -1069,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
+@@ -1240,6 +1263,9 @@
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
++ -auroraux)
++ os=-auroraux
++ ;;
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+@@ -1260,9 +1286,9 @@
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+- | -kopensolaris* \
++ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
++ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++ | -sym* | -kopensolaris* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* | -aros* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+@@ -1283,7 +1309,7 @@
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+- | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+@@ -1416,6 +1442,8 @@
+ -dicos*)
+ os=-dicos
+ ;;
++ -nacl*)
++ ;;
+ -none)
+ ;;
+ *)
+@@ -1613,7 +1641,7 @@
+ -sunos*)
+ vendor=sun
+ ;;
+- -aix*)
++ -cnk*|-aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+Index: b/configure
+===================================================================
--- a/configure
+++ b/configure
@@ -1,20 +1,24 @@
@@ -4594,261 +5273,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -5137,202 +4869,58 @@
- ;
- return 0;
- }
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- gt_cv_func_ngettext_libc=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- gt_cv_func_ngettext_libc=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--
--fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
--$as_echo "$gt_cv_func_ngettext_libc" >&6; }
--
-- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
--$as_echo_n "checking for dgettext in libc... " >&6; }
--if test "${gt_cv_func_dgettext_libc+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--#include <libintl.h>
--
--int
--main ()
--{
--return !dgettext ("","")
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- gt_cv_func_dgettext_libc=yes
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gt_cv_func_ngettext_libc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_ngettext_libc=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
--$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
-+$as_echo "$gt_cv_func_ngettext_libc" >&6; }
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
--
--for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
-+$as_echo_n "checking for dgettext in libc... " >&6; }
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-
--#undef $ac_func
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
-+#include <libintl.h>
-
- int
- main ()
- {
--return $ac_func ();
-+return !dgettext ("","")
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ gt_cv_func_dgettext_libc=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ gt_cv_func_dgettext_libc=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
-+$as_echo "$gt_cv_func_dgettext_libc" >&6; }
-+ fi
-+
-+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -5347,18 +4935,14 @@
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5376,55 +4960,26 @@
+@@ -5138,54 +4870,25 @@
return 0;
}
_ACEOF
@@ -4874,13 +5299,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
+ gt_cv_func_ngettext_libc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_intl_bindtextdomain=no
-+ ac_cv_lib_intl_bindtextdomain=no
+- gt_cv_func_ngettext_libc=no
++ gt_cv_func_ngettext_libc=no
fi
-
-rm -rf conftest.dSYM
@@ -4888,32 +5313,30 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+ $as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+ $as_echo_n "checking for dgettext in libc... " >&6; }
+-if test "${gt_cv_func_dgettext_libc+set}" = set; then
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
+- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- /* Override any GCC internal prototype to avoid an error.
-@@ -5442,55 +4997,26 @@
+ #include <libintl.h>
+@@ -5198,141 +4901,26 @@
return 0;
}
_ACEOF
@@ -4939,13 +5362,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
+ gt_cv_func_dgettext_libc=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
+- gt_cv_func_dgettext_libc=no
++ gt_cv_func_dgettext_libc=no
fi
-
-rm -rf conftest.dSYM
@@ -4953,228 +5376,14 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
- $as_echo_n "checking for dgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5508,43 +5034,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dgettext=no
-+ ac_cv_lib_intl_dgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -5554,22 +5055,18 @@
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
- $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: " >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5587,55 +5084,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
- $as_echo_n "checking for dcgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5653,43 +5121,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dcgettext=no
-+ ac_cv_lib_intl_dcgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
- $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- libintl_extra_libs=-liconv
- else
-@@ -5711,102 +5154,12 @@
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS -lintl $libintl_extra_libs"
- unset ac_cv_func_bind_textdomain_codeset
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
+ fi
+
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-
-for ac_func in bind_textdomain_codeset
-do
@@ -5269,7 +5478,8 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
@@ -5279,41 +5489,357 @@
_ACEOF
fi
-@@ -5836,15 +5189,13 @@
-
- if test "$gt_cv_have_gettext" = "yes"; then
-
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_GETTEXT 1
+@@ -5347,18 +4935,14 @@
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
-_ACEOF
-+$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5376,55 +4960,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_bindtextdomain=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_bindtextdomain=no
++ ac_cv_lib_intl_bindtextdomain=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
- case "$MSGFMT" in
-@@ -5869,118 +5220,28 @@
- fi
- MSGFMT="$ac_cv_path_MSGFMT"
- if test "$MSGFMT" != "no"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
--$as_echo "no" >&6; }
--fi
-- if test "$MSGFMT" != "no"; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS $INTLLIBS"
--
--for ac_func in dcgettext
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5442,55 +4997,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5508,43 +5034,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dgettext=no
++ ac_cv_lib_intl_dgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -5554,22 +5055,18 @@
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5587,55 +5084,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5653,43 +5121,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dcgettext=no
++ ac_cv_lib_intl_dcgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -5711,102 +5154,12 @@
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
+-
+-for ac_func in bind_textdomain_codeset
-do
-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -5398,9 +5924,7 @@
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
- fi
+-fi
-ac_res=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -5408,9 +5932,144 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ if test "$MSGFMT" != "no"; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS $INTLLIBS"
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -5836,15 +5189,13 @@
+
+ if test "$gt_cv_have_gettext" = "yes"; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case "$MSGFMT" in
+@@ -5869,118 +5220,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ if test "$MSGFMT" != "no"; then
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
+ for ac_func in dcgettext
+do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
@@ -5503,7 +6162,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -6078,18 +5339,14 @@
+@@ -6078,144 +5339,33 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -5525,7 +6184,656 @@
/* end confdefs.h. */
int
-@@ -6101,121 +5358,14 @@
+ main ()
+ {
+ extern int _nl_msg_cat_cntr;
+- return _nl_msg_cat_cntr
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- CATOBJEXT=.gmo
+- DATADIRNAME=share
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
+- *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return bind_textdomain_codeset ();
++ return _nl_msg_cat_cntr
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- ac_cv_func_bind_textdomain_codeset=yes
++if ac_fn_c_try_link "$LINENO"; then :
++ CATOBJEXT=.gmo
++ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++ case $host in
++ *-*-solaris*)
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ CATOBJEXT=.gmo
+ DATADIRNAME=share
+ else
+@@ -6230,10 +5380,8 @@
+ ;;
+ esac
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS="$glib_save_LIBS"
+ INSTOBJEXT=.mo
+ else
+@@ -6247,9 +5395,7 @@
+
+ if test "$gt_cv_have_gettext" = "yes" ; then
+
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+
+ fi
+
+@@ -6257,7 +5403,7 @@
+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+ : ;
+ else
+- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+ XGETTEXT=":"
+ fi
+@@ -6290,7 +5436,7 @@
+ if test "x$ALL_LINGUAS" = "x"; then
+ LINGUAS=
+ else
+- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+ $as_echo_n "checking for catalogs to be installed... " >&6; }
+ NEW_LINGUAS=
+ for presentlang in $ALL_LINGUAS; do
+@@ -6315,7 +5461,7 @@
+ fi
+ done
+ LINGUAS=$NEW_LINGUAS
+- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+ $as_echo "$LINGUAS" >&6; }
+ fi
+
+@@ -6348,16 +5494,16 @@
+ < $srcdir/po/POTFILES.in > po/POTFILES
+
+
+- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+ # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then
++if test "${enable_nls+set}" = set; then :
+ enableval=$enable_nls; USE_NLS=$enableval
+ else
+ USE_NLS=yes
+ fi
+
+- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+ $as_echo "$USE_NLS" >&6; }
+
+
+@@ -6365,35 +5511,31 @@
+
+ case "$am__api_version" in
+ 1.01234)
+- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+ ;;
+ *)
+ ;;
+ esac
+
+ if test -n "0.40.0"; then
+- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
+ $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | 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; }'`
+
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
+ fi
+
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_UPDATE in
+@@ -6406,14 +5548,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6421,19 +5563,19 @@
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_MERGE in
+@@ -6446,14 +5588,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6461,19 +5603,19 @@
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_EXTRACT in
+@@ -6486,14 +5628,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6501,18 +5643,16 @@
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ fi
+
+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+@@ -6634,9 +5774,9 @@
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $XGETTEXT in
+@@ -6649,14 +5789,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6664,19 +5804,19 @@
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGMERGE in
+@@ -6689,14 +5829,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6704,19 +5844,19 @@
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $MSGFMT in
+@@ -6729,14 +5869,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6744,19 +5884,19 @@
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $GMSGFMT in
+@@ -6769,14 +5909,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -6785,33 +5925,29 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ 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
+- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $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_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ case $INTLTOOL_PERL in
+@@ -6824,14 +5960,14 @@
+ do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+- for ac_exec_ext in '' $ac_executable_extensions; do
++ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+ done
+-done
++ done
+ IFS=$as_save_IFS
+
+ ;;
+@@ -6839,41 +5975,35 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
+ else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+
+
+ if test -z "$INTLTOOL_PERL"; then
+- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+ if test "x" != "xno-xml"; then
+- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- { $as_echo "$as_me:$LINENO: result: ok" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ else
+- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+ fi
+ fi
+
+@@ -6883,11 +6013,7 @@
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -6899,120 +6025,13 @@
return 0;
}
_ACEOF
@@ -5551,16 +6859,15 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
+ DATADIRNAME=share
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- case $host in
+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
- $as_echo_n "(cached) " >&6
@@ -5646,646 +6953,6 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- CATOBJEXT=.gmo
- DATADIRNAME=share
- else
-@@ -6230,10 +5380,8 @@
- ;;
- esac
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS="$glib_save_LIBS"
- INSTOBJEXT=.mo
- else
-@@ -6247,9 +5395,7 @@
-
- if test "$gt_cv_have_gettext" = "yes" ; then
-
--cat >>confdefs.h <<\_ACEOF
--#define ENABLE_NLS 1
--_ACEOF
-+$as_echo "#define ENABLE_NLS 1" >>confdefs.h
-
- fi
-
-@@ -6257,7 +5403,7 @@
- if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
- : ;
- else
-- { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
- $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
- XGETTEXT=":"
- fi
-@@ -6290,7 +5436,7 @@
- if test "x$ALL_LINGUAS" = "x"; then
- LINGUAS=
- else
-- { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
- $as_echo_n "checking for catalogs to be installed... " >&6; }
- NEW_LINGUAS=
- for presentlang in $ALL_LINGUAS; do
-@@ -6315,7 +5461,7 @@
- fi
- done
- LINGUAS=$NEW_LINGUAS
-- { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
- $as_echo "$LINGUAS" >&6; }
- fi
-
-@@ -6348,16 +5494,16 @@
- < $srcdir/po/POTFILES.in > po/POTFILES
-
-
-- { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
- $as_echo_n "checking whether NLS is requested... " >&6; }
- # Check whether --enable-nls was given.
--if test "${enable_nls+set}" = set; then
-+if test "${enable_nls+set}" = set; then :
- enableval=$enable_nls; USE_NLS=$enableval
- else
- USE_NLS=yes
- fi
-
-- { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
- $as_echo "$USE_NLS" >&6; }
-
-
-@@ -6365,35 +5511,31 @@
-
- case "$am__api_version" in
- 1.01234)
-- { { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
--$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
- ;;
- *)
- ;;
- esac
-
- if test -n "0.40.0"; then
-- { $as_echo "$as_me:$LINENO: checking for intltool >= 0.40.0" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.40.0" >&5
- $as_echo_n "checking for intltool >= 0.40.0... " >&6; }
-
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.40.0 | 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; }'`
-
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
- $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-- { { $as_echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.40.0 or later." >&5
--$as_echo "$as_me: error: Your intltool is too old. You need intltool 0.40.0 or later." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "Your intltool is too old. You need intltool 0.40.0 or later." "$LINENO" 5
- fi
-
- # Extract the first word of "intltool-update", so it can be a program name with args.
- set dummy intltool-update; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_INTLTOOL_UPDATE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_UPDATE in
-@@ -6406,14 +5548,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6421,19 +5563,19 @@
- fi
- INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
- if test -n "$INTLTOOL_UPDATE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
- $as_echo "$INTLTOOL_UPDATE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-merge", so it can be a program name with args.
- set dummy intltool-merge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_INTLTOOL_MERGE+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_MERGE in
-@@ -6446,14 +5588,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6461,19 +5603,19 @@
- fi
- INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
- if test -n "$INTLTOOL_MERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
- $as_echo "$INTLTOOL_MERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "intltool-extract", so it can be a program name with args.
- set dummy intltool-extract; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_INTLTOOL_EXTRACT+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_EXTRACT in
-@@ -6486,14 +5628,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6501,18 +5643,16 @@
- fi
- INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
- if test -n "$INTLTOOL_EXTRACT"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
- $as_echo "$INTLTOOL_EXTRACT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
-- { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
--$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -6634,9 +5774,9 @@
- # Check the gettext tools to make sure they are GNU
- # Extract the first word of "xgettext", so it can be a program name with args.
- set dummy xgettext; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_XGETTEXT+set}" = set; then
-+if test "${ac_cv_path_XGETTEXT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $XGETTEXT in
-@@ -6649,14 +5789,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6664,19 +5804,19 @@
- fi
- XGETTEXT=$ac_cv_path_XGETTEXT
- if test -n "$XGETTEXT"; then
-- { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
- $as_echo "$XGETTEXT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgmerge", so it can be a program name with args.
- set dummy msgmerge; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_MSGMERGE+set}" = set; then
-+if test "${ac_cv_path_MSGMERGE+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGMERGE in
-@@ -6689,14 +5829,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6704,19 +5844,19 @@
- fi
- MSGMERGE=$ac_cv_path_MSGMERGE
- if test -n "$MSGMERGE"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
- $as_echo "$MSGMERGE" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "msgfmt", so it can be a program name with args.
- set dummy msgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_MSGFMT+set}" = set; then
-+if test "${ac_cv_path_MSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $MSGFMT in
-@@ -6729,14 +5869,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6744,19 +5884,19 @@
- fi
- MSGFMT=$ac_cv_path_MSGFMT
- if test -n "$MSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
- $as_echo "$MSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- # Extract the first word of "gmsgfmt", so it can be a program name with args.
- set dummy gmsgfmt; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_GMSGFMT+set}" = set; then
-+if test "${ac_cv_path_GMSGFMT+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GMSGFMT in
-@@ -6769,14 +5909,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6785,33 +5925,29 @@
- fi
- GMSGFMT=$ac_cv_path_GMSGFMT
- if test -n "$GMSGFMT"; then
-- { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
- $as_echo "$GMSGFMT" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- 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
-- { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
--$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
- fi
-
- # Extract the first word of "perl", so it can be a program name with args.
- set dummy perl; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $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_INTLTOOL_PERL+set}" = set; then
-+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $INTLTOOL_PERL in
-@@ -6824,14 +5960,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
--done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -6839,41 +5975,35 @@
- fi
- INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
- if test -n "$INTLTOOL_PERL"; then
-- { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
- $as_echo "$INTLTOOL_PERL" >&6; }
- else
-- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-
- if test -z "$INTLTOOL_PERL"; then
-- { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
--$as_echo "$as_me: error: perl not found" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl not found" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
- $as_echo_n "checking for perl >= 5.8.1... " >&6; }
- $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
- if test $? -ne 0; then
-- { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
--$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
- else
- IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
-- { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
- $as_echo "$IT_PERL_VERSION" >&6; }
- fi
- if test "x" != "xno-xml"; then
-- { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
- $as_echo_n "checking for XML::Parser... " >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-- { $as_echo "$as_me:$LINENO: result: ok" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- else
-- { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
--$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
- fi
- fi
-
-@@ -6883,11 +6013,7 @@
- # Set DATADIRNAME correctly if it is not set yet
- # (copied from glib-gettext.m4)
- if test -z "$DATADIRNAME"; then
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -6899,120 +6025,13 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- DATADIRNAME=share
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-+ case $host in
- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
--
--int
--main ()
--{
--return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_bind_textdomain_codeset=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
--$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
--if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
@@ -6618,10 +7285,12 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
@@ -6629,12 +7298,10 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
@@ -6816,13 +7483,10 @@
/* end confdefs.h. */
int
-@@ -7565,45 +6490,20 @@
- {
-
- ;
-- return 0;
--}
--_ACEOF
+@@ -7568,42 +6493,17 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -6841,17 +7505,13 @@
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-- ac_cv_prog_cxx_g=yes
++if ac_fn_cxx_try_compile "$LINENO"; then :
+ ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_compile "$LINENO"; then :
-+ ac_cv_prog_cxx_g=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -8051,7 +8711,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -9756,11 +8632,7 @@
+@@ -9756,53 +8632,24 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -8062,12 +8722,15 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-
- int
-@@ -9771,38 +8643,13 @@
- return 0;
- }
- _ACEOF
+-
+-int
+-main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -8089,6 +8752,15 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++
++int
++main ()
++{
++
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
lt_cv_cc_needs_belf=yes
else
@@ -8864,12 +9536,10 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -v >&5"
-+for ac_option in --version -v -V -qversion; do
-+ { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -v >&5") 2>&5
@@ -8877,10 +9547,12 @@
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }
-{ (ac_try="$ac_compiler -V >&5"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
++for ac_option in --version -v -V -qversion; do
++ { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+ esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
- (eval "$ac_compiler -V >&5") 2>&5
@@ -9247,24 +9919,23 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -11153,95 +9759,47 @@
- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+@@ -11154,11 +9760,7 @@
# <limits.h> exists even on freestanding compilers.
# On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
+ # not just through cpp. "Syntax error" is here to catch this case.
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-- Syntax error
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -11167,81 +9769,37 @@
+ #endif
+ Syntax error
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -9286,16 +9957,6 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ # not just through cpp. "Syntax error" is here to catch this case.
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+ Syntax error
-+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
@@ -9833,20 +10494,26 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12876,16 +11384,9 @@
- if test -z "$aix_libpath"; then
- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
+@@ -12873,19 +11381,12 @@
+ }'
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then
+- aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+-fi
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
++fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -10310,24 +10977,30 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dld_shl_load=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dld_shl_load=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_dld_shl_load=no
--fi
++ ac_cv_lib_dld_shl_load=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
+ $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
--else
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
@@ -10400,31 +11073,20 @@
- $as_test_x conftest$ac_exeext
- }; then
- ac_cv_func_dlopen=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dld_shl_load=yes
- else
+-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_func_dlopen=no
-+ ac_cv_lib_dld_shl_load=no
- fi
+-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
@@ -12300,7 +12962,7 @@
fi
-@@ -20277,14 +18387,14 @@
+@@ -20277,25 +18387,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12314,25 +12976,25 @@
echo "$GST_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements ($MM) were not met:
+-
+-$GST_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 GST_CFLAGS
+-and GST_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($MM) were not met:
+ as_fn_error "Package requirements ($MM) were not met:
$GST_PKG_ERRORS
-@@ -20294,33 +18404,11 @@
+@@ -20305,22 +18404,11 @@
Alternatively, you may set the environment variables GST_CFLAGS
and GST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements ($MM) were not met:
--
--$GST_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 GST_CFLAGS
--and GST_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -12386,13 +13048,13 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error:
-- Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
-- It should be part of gstreamer-0_10-utils. Please install it.
-- " >&5
--$as_echo "$as_me: error:
+ as_fn_error "
Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
It should be part of gstreamer-0_10-utils. Please install it.
+- " >&5
+-$as_echo "$as_me: error:
+- Cannot find required GStreamer-0.10 tool 'gst-inspect-0.10'.
+- It should be part of gstreamer-0_10-utils. Please install it.
- " >&2;}
- { (exit 1); exit 1; }; }
+ " "$LINENO" 5
@@ -12439,13 +13101,13 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error:
-- Cannot find required GStreamer-0.10 plugin '$good_element'.
-- It should be part of gst-plugins-good. Please install it.
-- " >&5
--$as_echo "$as_me: error:
+ as_fn_error "
Cannot find required GStreamer-0.10 plugin '$good_element'.
It should be part of gst-plugins-good. Please install it.
+- " >&5
+-$as_echo "$as_me: error:
+- Cannot find required GStreamer-0.10 plugin '$good_element'.
+- It should be part of gst-plugins-good. Please install it.
- " >&2;}
- { (exit 1); exit 1; }; }
+ " "$LINENO" 5
@@ -13187,7 +13849,7 @@
fi
-@@ -21086,25 +19077,14 @@
+@@ -21086,14 +19077,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13201,6 +13863,16 @@
echo "$UNIQUE_PKG_ERRORS" >&5
- { { $as_echo "$as_me:$LINENO: error: Package requirements (unique-1.0) were not met:
++ as_fn_error "Package requirements (unique-1.0) were not met:
+
+ $UNIQUE_PKG_ERRORS
+
+@@ -21103,33 +19094,11 @@
+ Alternatively, you may set the environment variables UNIQUE_CFLAGS
+ and UNIQUE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (unique-1.0) were not met:
-
-$UNIQUE_PKG_ERRORS
-
@@ -13210,16 +13882,6 @@
-Alternatively, you may set the environment variables UNIQUE_CFLAGS
-and UNIQUE_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (unique-1.0) were not met:
-+ as_fn_error "Package requirements (unique-1.0) were not met:
-
- $UNIQUE_PKG_ERRORS
-
-@@ -21114,22 +19094,11 @@
- Alternatively, you may set the environment variables UNIQUE_CFLAGS
- and UNIQUE_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
+" "$LINENO" 5
@@ -14389,7 +15051,7 @@
$SCREENSAVER_PKG_ERRORS
-@@ -22340,12 +20179,11 @@
+@@ -22340,22 +20179,11 @@
Alternatively, you may set the environment variables SCREENSAVER_CFLAGS
and SCREENSAVER_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -14401,24 +15063,24 @@
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: 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 SCREENSAVER_CFLAGS
+-and SCREENSAVER_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." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
+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.
-@@ -22354,22 +20192,11 @@
+@@ -22364,12 +20192,11 @@
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." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables SCREENSAVER_CFLAGS
--and SCREENSAVER_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." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -14819,7 +15481,7 @@
LIRC_LIBS="-llirc_client"
HAVE_LIRC=yes
else
-@@ -22746,40 +20421,123 @@
+@@ -22746,40 +20421,44 @@
mythtv)
pkg_failed=no
@@ -14853,60 +15515,67 @@
+ fi
+else
+ pkg_failed=untried
-+fi
+ fi
+-if test -n "$GMYTH_LIBS"; then
+- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GMYTH_LIBS"; then
+ pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
-+ ac_status=$?
+ ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
+ ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
-+ pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+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
+ fi
+
+
+@@ -22792,14 +20471,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
-+ else
+ else
+- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
-+ echo "$GMYTH_PKG_ERRORS" >&5
-+
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GMYTH_PKG_ERRORS" >&5
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+ HAVE_GMYTH=no
-+elif test $pkg_failed = untried; then
-+ HAVE_GMYTH=no
-+else
-+ GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
-+ GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
+ $as_echo "no" >&6; }
+ HAVE_GMYTH=no
+ elif test $pkg_failed = untried; then
+@@ -22807,7 +20486,7 @@
+ else
+ GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
+ GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+ HAVE_GMYTH=yes
-+fi
-+ if test "${HAVE_GMYTH}" != "yes"; then
-+ plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
-+ add_plugin="0"
-+ fi
-+ ;;
+ $as_echo "yes" >&6; }
+ HAVE_GMYTH=yes
+ fi
+@@ -22816,43 +20495,141 @@
+ add_plugin="0"
+ fi
+ ;;
+ bbc)
+ # pygobject >= 2.15.3 for gio support
+ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support
@@ -14932,17 +15601,7 @@
+ fi
+else
+ pkg_failed=untried
- fi
--if test -n "$GMYTH_LIBS"; then
-- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
-- ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
-- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
-- pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
++fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$BBC_LIBS"; then
+ pkg_cv_BBC_LIBS="$BBC_LIBS"
@@ -14954,56 +15613,47 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
++else
++ pkg_failed=yes
++fi
+ fi
+else
+ pkg_failed=untried
- fi
-
-
-@@ -22792,67 +20550,86 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++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
+ BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
- else
-- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++ else
+ BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
- fi
- # Put the nasty error message in config.log where it belongs
-- echo "$GMYTH_PKG_ERRORS" >&5
++ fi
++ # Put the nasty error message in config.log where it belongs
+ echo "$BBC_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-- HAVE_GMYTH=no
++$as_echo "no" >&6; }
+ HAVE_BBCSTUFF=no
- elif test $pkg_failed = untried; then
-- HAVE_GMYTH=no
++elif test $pkg_failed = untried; then
+ HAVE_BBCSTUFF=no
- else
-- GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
-- GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
++else
+ BBC_CFLAGS=$pkg_cv_BBC_CFLAGS
+ BBC_LIBS=$pkg_cv_BBC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-- HAVE_GMYTH=yes
++$as_echo "yes" >&6; }
+ HAVE_BBCSTUFF=yes
- fi
-- if test "${HAVE_GMYTH}" != "yes"; then
-- plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
++fi
+ if test "x$HAVE_BBCSTUFF" != "xyes"; then
+ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin"
- add_plugin="0"
- fi
++ add_plugin="0"
++ fi
+ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu
+ bbc_py_pkg_reqs=''
+ if test -f /etc/debian_version ; then
@@ -15019,7 +15669,7 @@
+ add_plugin="0"
+ fi
+ done
- ;;
++ ;;
bemused)
pkg_failed=no
@@ -15110,59 +15760,117 @@
$as_echo "yes" >&6; }
HAVE_BLUEZ=yes
fi
-@@ -22892,40 +20669,44 @@
- publish)
-
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5
+@@ -22889,43 +20666,124 @@
+ add_plugin="0"
+ fi
+ ;;
+- publish)
++ publish)
++
++pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEPC" >&5
- $as_echo_n "checking for LIBEPC... " >&6; }
-
--if test -n "$LIBEPC_CFLAGS"; then
-- pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
++$as_echo_n "checking for LIBEPC... " >&6; }
++
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBEPC_CFLAGS"; then
+ pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
++ pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
+ fi
+else
+ pkg_failed=untried
- fi
--if test -n "$LIBEPC_LIBS"; then
-- pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
++fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$LIBEPC_LIBS"; then
+ pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
- ac_status=$?
++ ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++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
++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`
++ else
++ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$LIBEPC_PKG_ERRORS" >&5
++
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ HAVE_LIBEPC=no
++elif test $pkg_failed = untried; then
++ HAVE_LIBEPC=no
++else
++ LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
++ LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ HAVE_LIBEPC=yes
++fi
++ if test "${HAVE_LIBEPC}" != "yes" ; then
++ plugin_error_or_ignore "you need the easy-publish-and-consume library installed for the publish plugin"
++ add_plugin="0"
++ fi
++ ;;
++ tracker)
+
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBEPC" >&5
+-$as_echo_n "checking for LIBEPC... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TRACKER" >&5
++$as_echo_n "checking for TRACKER... " >&6; }
+
+-if test -n "$LIBEPC_CFLAGS"; then
+- pkg_cv_LIBEPC_CFLAGS="$LIBEPC_CFLAGS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
+- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+- pkg_cv_LIBEPC_CFLAGS=`$PKG_CONFIG --cflags "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TRACKER_CFLAGS"; then
++ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
++ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.8 >= 0.8.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15172,37 +15880,78 @@
+else
+ pkg_failed=untried
fi
-
-
-@@ -22938,14 +20719,14 @@
+-if test -n "$LIBEPC_LIBS"; then
+- pkg_cv_LIBEPC_LIBS="$LIBEPC_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libepc-ui-1.0 >= 0.3.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "libepc-ui-1.0 >= 0.3.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_LIBEPC_LIBS=`$PKG_CONFIG --libs "libepc-ui-1.0 >= 0.3.0" 2>/dev/null`
++if test -n "$PKG_CONFIG"; then
++ if test -n "$TRACKER_LIBS"; then
++ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.8 >= 0.8.1\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.8 >= 0.8.1") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.8 >= 0.8.1" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
++ fi
++else
++ pkg_failed=untried
+ fi
+
+
+@@ -22938,67 +20796,66 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1`
-+ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"`
else
- LIBEPC_PKG_ERRORS=`$PKG_CONFIG --print-errors "libepc-ui-1.0 >= 0.3.0" 2>&1`
-+ LIBEPC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libepc-ui-1.0 >= 0.3.0"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.8 >= 0.8.1"`
fi
# Put the nasty error message in config.log where it belongs
- echo "$LIBEPC_PKG_ERRORS" >&5
+- echo "$LIBEPC_PKG_ERRORS" >&5
++ echo "$TRACKER_PKG_ERRORS" >&5
- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- HAVE_LIBEPC=no
+- HAVE_LIBEPC=no
++ HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -22953,7 +20734,7 @@
- else
- LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
- LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
+- HAVE_LIBEPC=no
++ HAVE_TRACKER=no
+ else
+- LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
+- LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
- { $as_echo "$as_me:$LINENO: result: yes" >&5
++ TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
++ TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
- HAVE_LIBEPC=yes
- fi
-@@ -22965,40 +20746,44 @@
- tracker)
+- HAVE_LIBEPC=yes
++ HAVE_TRACKER=yes
+ fi
+- if test "${HAVE_LIBEPC}" != "yes" ; then
+- plugin_error_or_ignore "you need the easy-publish-and-consume library installed for the publish plugin"
+- add_plugin="0"
+- fi
+- ;;
+- tracker)
++ if test "${HAVE_TRACKER}" != "yes" ; then
pkg_failed=no
-{ $as_echo "$as_me:$LINENO: checking for TRACKER" >&5
@@ -15214,19 +15963,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5
+- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_CFLAGS"; then
+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
++ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.9 >= 0.9.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15241,19 +15993,22 @@
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5
+- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_LIBS"; then
+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.9 >= 0.9.0\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "tracker-client-0.9 >= 0.9.0") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
++ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.9 >= 0.9.0" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15265,15 +16020,15 @@
fi
-@@ -23011,14 +20796,14 @@
+@@ -23011,14 +20868,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"`
else
- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.9 >= 0.9.0"`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_PKG_ERRORS" >&5
@@ -15283,7 +16038,7 @@
$as_echo "no" >&6; }
HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -23026,7 +20811,7 @@
+@@ -23026,10 +20883,12 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -15292,7 +16047,12 @@
$as_echo "yes" >&6; }
HAVE_TRACKER=yes
fi
-@@ -23044,40 +20829,44 @@
++ fi
++
+ if test "${HAVE_TRACKER}" != "yes" ; then
+ plugin_error_or_ignore "you need the tracker development headers installed for the tracker plugin"
+ add_plugin="0"
+@@ -23044,40 +20903,44 @@
thumbnail)
pkg_failed=no
@@ -15356,7 +16116,7 @@
fi
-@@ -23090,14 +20879,14 @@
+@@ -23090,14 +20953,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15374,7 +16134,7 @@
$as_echo "no" >&6; }
HAVE_GLIB_2_15=no
elif test $pkg_failed = untried; then
-@@ -23105,7 +20894,7 @@
+@@ -23105,7 +20968,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -15383,7 +16143,7 @@
$as_echo "yes" >&6; }
HAVE_GLIB_2_15=yes
fi
-@@ -23117,40 +20906,44 @@
+@@ -23117,40 +20980,44 @@
brasero-disc-recorder)
pkg_failed=no
@@ -15447,7 +16207,7 @@
fi
-@@ -23163,14 +20956,14 @@
+@@ -23163,14 +21030,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15465,7 +16225,7 @@
$as_echo "no" >&6; }
BUILD_RECORDER=no
elif test $pkg_failed = untried; then
-@@ -23178,7 +20971,7 @@
+@@ -23178,7 +21045,7 @@
else
DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
@@ -15474,7 +16234,7 @@
$as_echo "yes" >&6; }
BUILD_RECORDER=yes
fi
-@@ -23190,40 +20983,44 @@
+@@ -23190,40 +21057,44 @@
youtube)
pkg_failed=no
@@ -15538,7 +16298,7 @@
fi
-@@ -23236,14 +21033,14 @@
+@@ -23236,14 +21107,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15556,7 +16316,7 @@
$as_echo "no" >&6; }
HAVE_LIBGDATA=no
elif test $pkg_failed = untried; then
-@@ -23251,7 +21048,7 @@
+@@ -23251,7 +21122,7 @@
else
LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
@@ -15565,7 +16325,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGDATA=yes
fi
-@@ -23260,23 +21057,18 @@
+@@ -23260,23 +21131,18 @@
add_plugin="0"
fi
@@ -15594,7 +16354,7 @@
fi
;;
esac
-@@ -23290,9 +21082,9 @@
+@@ -23290,9 +21156,9 @@
ALL_PLUGINS=$allowed_plugins
PLUGINS=$used_plugins2
@@ -15606,7 +16366,7 @@
$as_echo "$PLUGINS" >&6; }
-@@ -23302,24 +21094,22 @@
+@@ -23302,24 +21168,22 @@
# Browser plugins
# ***************
@@ -15635,7 +16395,7 @@
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23327,24 +21117,25 @@
+@@ -23327,24 +21191,25 @@
pkg_failed=no
@@ -15670,7 +16430,7 @@
pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
gio-2.0
x11
-@@ -23352,24 +21143,26 @@
+@@ -23352,24 +21217,26 @@
else
pkg_failed=yes
fi
@@ -15707,7 +16467,7 @@
pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
gio-2.0
x11
-@@ -23377,8 +21170,9 @@
+@@ -23377,8 +21244,9 @@
else
pkg_failed=yes
fi
@@ -15719,7 +16479,7 @@
fi
-@@ -23391,20 +21185,20 @@
+@@ -23391,20 +21259,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15745,7 +16505,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23412,7 +21206,7 @@
+@@ -23412,7 +21280,7 @@
else
BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
@@ -15754,7 +16514,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23422,58 +21216,58 @@
+@@ -23422,58 +21290,58 @@
# Earlier versions misdetect playlists
if test -n "$PKG_CONFIG" && \
@@ -15841,7 +16601,7 @@
fi
-@@ -23486,14 +21280,14 @@
+@@ -23486,14 +21354,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15859,7 +16619,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23501,7 +21295,7 @@
+@@ -23501,7 +21369,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15868,7 +16628,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23509,9 +21303,9 @@
+@@ -23509,9 +21377,9 @@
DBUSBINDIR="`echo $DBUSLIBDIR | sed -e s/lib/bin/`"
# Extract the first word of "dbus-binding-tool", so it can be a program name with args.
set dummy dbus-binding-tool; ac_word=$2
@@ -15880,7 +16640,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BIND in
-@@ -23525,14 +21319,14 @@
+@@ -23525,14 +21393,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15898,7 +16658,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23541,16 +21335,16 @@
+@@ -23541,16 +21409,16 @@
fi
DBUS_BIND=$ac_cv_path_DBUS_BIND
if test -n "$DBUS_BIND"; then
@@ -15918,7 +16678,7 @@
$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
enable_browser_plugins=no
fi
-@@ -23566,13 +21360,9 @@
+@@ -23566,13 +21434,9 @@
__SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-fno-rtti $CXXFLAGS"
@@ -15934,7 +16694,7 @@
/* end confdefs.h. */
int
-@@ -23583,34 +21373,13 @@
+@@ -23583,34 +21447,13 @@
return 0;
}
_ACEOF
@@ -15972,7 +16732,7 @@
$as_echo "$have_no_rtti_flag" >&6; }
CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23639,64 +21408,64 @@
+@@ -23639,64 +21482,64 @@
if test "$enable_browser_plugins" = "yes"; then
@@ -16052,7 +16812,7 @@
$as_echo "$enable_cone_plugin" >&6; }
fi
-@@ -23744,13 +21513,11 @@
+@@ -23744,13 +21587,11 @@
# Check whether --enable-nautilus was given.
@@ -16068,7 +16828,7 @@
esac
else
ENABLE_NAUTILUS=yes
-@@ -23759,40 +21526,44 @@
+@@ -23759,40 +21600,44 @@
if test x$ENABLE_NAUTILUS = "xyes" ; then
pkg_failed=no
@@ -16132,7 +16892,7 @@
fi
-@@ -23805,14 +21576,14 @@
+@@ -23805,14 +21650,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16150,7 +16910,7 @@
$as_echo "no" >&6; }
HAVE_NAUTILUS=no
elif test $pkg_failed = untried; then
-@@ -23820,7 +21591,7 @@
+@@ -23820,7 +21665,7 @@
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -16159,7 +16919,7 @@
$as_echo "yes" >&6; }
HAVE_NAUTILUS=yes
fi
-@@ -23828,7 +21599,7 @@
+@@ -23828,7 +21673,7 @@
# Check whether --with-nautilusdir was given.
@@ -16168,7 +16928,7 @@
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
else
ac_with_nautilusdir=""
-@@ -23840,15 +21611,13 @@
+@@ -23840,15 +21685,13 @@
if test x$HAVE_NAUTILUS = "xyes"; then
@@ -16186,7 +16946,7 @@
$as_echo "$as_me: installing nautilus plugin in ${ac_with_nautilusdir}" >&6;}
NAUTILUSDIR=${ac_with_nautilusdir}
-@@ -23865,7 +21634,7 @@
+@@ -23865,7 +21708,7 @@
# Check whether --with-dbus was given.
@@ -16195,7 +16955,7 @@
withval=$with_dbus;
else
with_dbus=auto
-@@ -23874,40 +21643,44 @@
+@@ -23874,40 +21717,44 @@
if test "x$with_dbus" != "xno"; then
pkg_failed=no
@@ -16259,7 +17019,7 @@
fi
-@@ -23920,14 +21693,14 @@
+@@ -23920,14 +21767,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16277,7 +17037,7 @@
$as_echo "no" >&6; }
enable_dbus=no
elif test $pkg_failed = untried; then
-@@ -23935,20 +21708,16 @@
+@@ -23935,20 +21782,16 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -16301,7 +17061,7 @@
fi
fi
-@@ -23963,9 +21732,9 @@
+@@ -23963,9 +21806,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -16313,7 +17073,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -23978,14 +21747,14 @@
+@@ -23978,14 +21821,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16331,7 +17091,7 @@
IFS=$as_save_IFS
;;
-@@ -23993,10 +21762,10 @@
+@@ -23993,10 +21836,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -16344,7 +17104,7 @@
$as_echo "no" >&6; }
fi
-@@ -24010,13 +21779,13 @@
+@@ -24010,13 +21853,13 @@
# Check whether --with-gconf-source was given.
@@ -16360,7 +17120,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -24025,22 +21794,20 @@
+@@ -24025,22 +21868,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -16387,7 +17147,7 @@
esac
fi
-@@ -24066,7 +21833,7 @@
+@@ -24066,7 +21907,7 @@
# Check whether --enable-debug was given.
@@ -16396,7 +17156,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -24075,16 +21842,14 @@
+@@ -24075,16 +21916,14 @@
if test x$enable_debug = xyes ; then
@@ -16415,7 +17175,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -24115,13 +21880,9 @@
+@@ -24115,13 +21954,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16431,7 +17191,7 @@
/* end confdefs.h. */
int
-@@ -24132,35 +21893,14 @@
+@@ -24132,35 +21967,14 @@
return 0;
}
_ACEOF
@@ -16470,7 +17230,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -24174,26 +21914,24 @@
+@@ -24174,26 +21988,24 @@
fi
;;
*)
@@ -16502,7 +17262,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -24208,7 +21946,7 @@
+@@ -24208,7 +22020,7 @@
esac
fi
fi
@@ -16511,7 +17271,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24216,14 +21954,14 @@
+@@ -24216,14 +22028,14 @@
# Check whether --enable-cxx-warnings was given.
@@ -16528,7 +17288,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -24243,18 +21981,18 @@
+@@ -24243,18 +22055,18 @@
fi
fi
fi
@@ -16550,7 +17310,7 @@
$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
complCXXFLAGS=
if test "x$enable_iso_cxx" != "xno"; then
-@@ -24270,7 +22008,7 @@
+@@ -24270,7 +22082,7 @@
esac
fi
fi
@@ -16559,7 +17319,7 @@
$as_echo "$complCXXFLAGS" >&6; }
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -24291,8 +22029,136 @@
+@@ -24291,8 +22103,136 @@
@@ -16697,7 +17457,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -24302,7 +22168,7 @@
+@@ -24302,7 +22242,7 @@
# Check whether --enable-gtk-doc was given.
@@ -16706,7 +17466,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -24311,68 +22177,40 @@
+@@ -24311,68 +22251,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -16793,7 +17553,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -24383,6 +22221,22 @@
+@@ -24383,6 +22295,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -16816,7 +17576,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -24391,6 +22245,14 @@
+@@ -24391,6 +22319,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -16831,7 +17591,7 @@
# This macro expands DIR and assigns it to RET.
-@@ -24409,22 +22271,18 @@
+@@ -24409,22 +22345,18 @@
# Check whether --enable-run-in-source-tree was given.
@@ -16857,7 +17617,7 @@
fi
-@@ -24443,7 +22301,7 @@
+@@ -24443,7 +22375,7 @@
@@ -16866,7 +17626,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -24472,13 +22330,13 @@
+@@ -24472,13 +22404,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16882,7 +17642,7 @@
esac ;;
esac
done
-@@ -24486,8 +22344,8 @@
+@@ -24486,8 +22418,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16893,7 +17653,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24510,11 +22368,11 @@
+@@ -24510,11 +22442,11 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
@@ -16907,7 +17667,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -24534,8 +22392,8 @@
+@@ -24534,8 +22466,8 @@
ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
@@ -16918,7 +17678,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -24543,11 +22401,8 @@
+@@ -24543,11 +22475,8 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -16932,7 +17692,7 @@
fi
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
-@@ -24558,185 +22413,126 @@
+@@ -24558,185 +22487,126 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -17181,7 +17941,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -24746,17 +22542,18 @@
+@@ -24746,17 +22616,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -17207,7 +17967,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -24764,23 +22561,15 @@
+@@ -24764,23 +22635,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -17236,7 +17996,7 @@
as_nl='
'
export as_nl
-@@ -24788,7 +22577,13 @@
+@@ -24788,7 +22651,13 @@
as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
@@ -17251,7 +18011,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -24799,7 +22594,7 @@
+@@ -24799,7 +22668,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -17260,7 +18020,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24822,13 +22617,6 @@
+@@ -24822,13 +22691,6 @@
}
fi
@@ -17274,7 +18034,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -24838,15 +22626,15 @@
+@@ -24838,15 +22700,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -17293,7 +18053,7 @@
IFS=$as_save_IFS
;;
-@@ -24858,12 +22646,16 @@
+@@ -24858,12 +22720,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -17314,7 +18074,7 @@
done
PS1='$ '
PS2='> '
-@@ -24875,7 +22667,89 @@
+@@ -24875,7 +22741,89 @@
LANGUAGE=C
export LANGUAGE
@@ -17405,7 +18165,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -24889,8 +22763,12 @@
+@@ -24889,8 +22837,12 @@
as_basename=false
fi
@@ -17419,7 +18179,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -24910,76 +22788,25 @@
+@@ -24910,76 +22862,25 @@
}
s/.*/./; q'`
@@ -17507,7 +18267,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -25008,8 +22835,56 @@
+@@ -25008,8 +22909,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17565,7 +18325,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -25028,10 +22903,10 @@
+@@ -25028,10 +22977,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17578,7 +18338,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -25046,13 +22921,19 @@
+@@ -25046,13 +22995,19 @@
exec 6>&1
@@ -17600,7 +18360,7 @@
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25084,13 +22965,15 @@
+@@ -25084,13 +23039,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17619,7 +18379,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -25109,16 +22992,17 @@
+@@ -25109,16 +23066,17 @@
Configuration commands:
$config_commands
@@ -17641,7 +18401,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25154,6 +23038,8 @@
+@@ -25154,6 +23112,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -17650,7 +18410,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -25161,20 +23047,19 @@
+@@ -25161,20 +23121,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17675,7 +18435,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25182,11 +23067,10 @@
+@@ -25182,11 +23141,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -17690,7 +18450,7 @@
ac_need_defaults=false ;;
esac
-@@ -25599,6 +23483,7 @@
+@@ -25599,6 +23557,7 @@
"lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/plugins/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/Makefile" ;;
@@ -17698,7 +18458,7 @@
"src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;;
"src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;;
"src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;;
-@@ -25647,9 +23532,7 @@
+@@ -25647,9 +23606,7 @@
"docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17709,7 +18469,7 @@
esac
done
-@@ -25676,7 +23559,7 @@
+@@ -25676,7 +23633,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17718,7 +18478,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -25687,11 +23570,7 @@
+@@ -25687,11 +23644,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17731,7 +18491,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25699,10 +23578,16 @@
+@@ -25699,10 +23652,16 @@
if test -n "$CONFIG_FILES"; then
@@ -17750,7 +18510,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25716,24 +23601,18 @@
+@@ -25716,24 +23675,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17778,7 +18538,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25755,7 +23634,7 @@
+@@ -25755,7 +23708,7 @@
t delim
:nl
h
@@ -17787,7 +18547,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -25769,7 +23648,7 @@
+@@ -25769,7 +23722,7 @@
t nl
:delim
h
@@ -17796,7 +18556,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -25822,9 +23701,7 @@
+@@ -25822,9 +23775,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17807,7 +18567,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25865,9 +23742,7 @@
+@@ -25865,9 +23816,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17818,7 +18578,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25952,9 +23827,7 @@
+@@ -25952,9 +23901,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17829,7 +18589,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -25967,9 +23840,7 @@
+@@ -25967,9 +23914,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17840,7 +18600,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25997,12 +23868,10 @@
+@@ -25997,12 +23942,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17855,7 +18615,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -26013,7 +23882,7 @@
+@@ -26013,7 +23956,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17864,7 +18624,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -26026,9 +23895,7 @@
+@@ -26026,9 +23969,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17875,7 +18635,7 @@
esac
;;
esac
-@@ -26056,47 +23923,7 @@
+@@ -26056,47 +23997,7 @@
q
}
s/.*/./; q'`
@@ -17924,7 +18684,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -26153,7 +23980,6 @@
+@@ -26153,7 +24054,6 @@
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
@@ -17932,7 +18692,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -26163,12 +23989,11 @@
+@@ -26163,12 +24063,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17947,7 +18707,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -26178,7 +24003,7 @@
+@@ -26178,7 +24077,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17956,7 +18716,7 @@
esac
_ACEOF
-@@ -26207,14 +24032,12 @@
+@@ -26207,14 +24106,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -17973,7 +18733,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -26224,9 +24047,7 @@
+@@ -26224,9 +24121,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17984,7 +18744,7 @@
;;
:H)
#
-@@ -26237,25 +24058,19 @@
+@@ -26237,25 +24132,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -18014,7 +18774,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26293,7 +24108,7 @@
+@@ -26293,7 +24182,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -18023,7 +18783,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -26388,47 +24203,7 @@
+@@ -26388,47 +24277,7 @@
q
}
s/.*/./; q'`
@@ -18072,7 +18832,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -27242,9 +25017,7 @@
+@@ -27242,9 +25091,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -18083,7 +18843,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -27267,15 +25040,12 @@
+@@ -27267,15 +25114,12 @@
done # for ac_tag
@@ -18101,7 +18861,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27296,37 +25066,37 @@
+@@ -27296,37 +25140,37 @@
exec 5>>config.log
# Use ||, not &&, to avoid exiting from the if with $? = 1, which
# would make configure fail if this is the last instruction.
@@ -18149,7 +18909,7 @@
$as_echo "$as_me: Vala binding support disabled" >&6;}
fi
if test "x${PLUGINS}" != "x" ; then
-@@ -27334,112 +25104,112 @@
+@@ -27334,112 +25178,112 @@
for plugin in ${PLUGINS}; do
case ${allowed_plugin} in
${plugin})
@@ -18292,6 +19052,62 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5
$as_echo "$as_me: End options" >&6;}
+Index: b/data/Makefile.in
+===================================================================
+--- a/data/Makefile.in
++++ b/data/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -141,6 +141,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -197,6 +199,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -256,6 +260,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -605,7 +610,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -630,7 +635,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: b/data/icons/16x16/Makefile.in
+===================================================================
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -1,4 +1,4 @@
@@ -18326,6 +19142,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/data/icons/22x22/Makefile.in
+===================================================================
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -1,4 +1,4 @@
@@ -18360,6 +19178,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/data/icons/24x24/Makefile.in
+===================================================================
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -1,4 +1,4 @@
@@ -18394,6 +19214,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/data/icons/32x32/Makefile.in
+===================================================================
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -1,4 +1,4 @@
@@ -18428,6 +19250,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/data/icons/48x48/Makefile.in
+===================================================================
--- a/data/icons/48x48/Makefile.in
+++ b/data/icons/48x48/Makefile.in
@@ -1,4 +1,4 @@
@@ -18462,6 +19286,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/data/icons/Makefile.in
+===================================================================
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -1,4 +1,4 @@
@@ -18514,6 +19340,8 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
+Index: b/data/icons/scalable/Makefile.in
+===================================================================
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
@@ -1,4 +1,4 @@
@@ -18548,58 +19376,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/Makefile.in
-+++ b/data/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -141,6 +141,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -197,6 +199,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-@@ -256,6 +260,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -605,7 +610,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -630,7 +635,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
+Index: b/docs/Makefile.in
+===================================================================
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,4 +1,4 @@
@@ -18652,6 +19430,8 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
+Index: b/docs/reference/Makefile.in
+===================================================================
--- a/docs/reference/Makefile.in
+++ b/docs/reference/Makefile.in
@@ -1,4 +1,4 @@
@@ -18686,8 +19466,474 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/help/bg/Makefile.in
-+++ b/help/bg/Makefile.in
+@@ -408,10 +413,10 @@
+ $(DEPENDENCY_LIBS)
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -430,7 +435,9 @@
+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
+ version.xml.in
+ DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -445,6 +452,10 @@
+ $(DOC_MODULE)-unused.txt
+
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
+ @ENABLE_GTK_DOC_TRUE at TESTS_ENVIRONMENT = cd $(srcdir) &&
+ @ENABLE_GTK_DOC_TRUE at TESTS = $(GTKDOC_CHECK)
+ all: all-am
+@@ -735,10 +746,10 @@
+ uninstall-local
+
+
+- at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ @ENABLE_GTK_DOC_FALSE at all-local:
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -747,9 +758,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @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) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -757,7 +768,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -767,23 +778,23 @@
+ tmpl-build.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)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++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)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -793,18 +804,37 @@
+ 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
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(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 )
++ 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 )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && 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
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -814,14 +844,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -841,12 +871,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -863,16 +892,14 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+Index: b/gnome-doc-utils.make
+===================================================================
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -266,6 +266,13 @@
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++## @ _DOC_MOFILES
++## The .mo files used for translating the document
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
++
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ ## @ _DOC_LC_MODULES
+ ## The top-level documentation files in all other locales
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+@@ -332,16 +339,23 @@
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+
+@@ -386,12 +400,14 @@
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
+Index: b/gtk-doc.make
+===================================================================
+--- a/gtk-doc.make
++++ b/gtk-doc.make
+@@ -5,13 +5,13 @@
+ ####################################
+
+ if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ GTKDOC_RUN = $(LIBTOOL) --mode=execute
+ else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN = sh -c
++GTKDOC_RUN =
+ endif
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -31,7 +31,9 @@
+ $(DOC_MODULE)-overrides.txt
+
+ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -48,12 +50,23 @@
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+ if ENABLE_GTK_DOC
+-all-local: html-build.stamp
++if GTK_DOC_BUILD_HTML
++HTML_BUILD_STAMP=html-build.stamp
++else
++HTML_BUILD_STAMP=
++endif
++if GTK_DOC_BUILD_PDF
++PDF_BUILD_STAMP=pdf-build.stamp
++else
++PDF_BUILD_STAMP=
++endif
++
++all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ else
+ all-local:
+ endif
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -62,9 +75,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @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) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -72,7 +85,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -82,24 +95,23 @@
+ tmpl-build.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)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+-
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++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)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -109,18 +121,37 @@
+ 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
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(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 )
++ 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 )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && 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
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -130,14 +161,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -157,12 +188,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -182,15 +212,13 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+Index: b/help/Makefile.in
+===================================================================
+--- a/help/Makefile.in
++++ b/help/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18720,8 +19966,89 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/help/Makefile.in
-+++ b/help/Makefile.in
+@@ -425,6 +430,7 @@
+ _DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
+
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
+ _DOC_LC_MODULES = $(if $(DOC_MODULE), \
+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
+
+@@ -528,7 +534,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -553,7 +559,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -944,6 +950,9 @@
+ .PHONY: po
+ po: $(_DOC_POFILES)
+
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ $(_DOC_POFILES):
+ @if ! test -d $(dir $@); then \
+ echo "mkdir $(dir $@)"; \
+@@ -971,16 +980,23 @@
+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
+ fi
+
++$(_DOC_MOFILES): %.mo: %.po
++ @if ! test -d $(dir $@); then \
++ echo "mkdir $(dir $@)"; \
++ mkdir "$(dir $@)"; \
++ fi
++ msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+- po="$(dir $@)$(patsubst %/$(notdir $@),%,$@).po"; \
+- if [ -f "$${po}" ]; then po="../$${po}"; else po="$(_DOC_ABS_SRCDIR)/$${po}"; fi; \
++ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \
++ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \
+ (cd $(dir $@) && \
+- $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
++ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \
+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+ .PHONY: pot
+@@ -1006,12 +1022,14 @@
+ clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
+ clean-doc-lc:
+ rm -f $(_DOC_LC_DOCS)
++ rm -f $(_DOC_MOFILES)
+ @list='$(_DOC_POFILES)'; for po in $$list; do \
+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \
+ echo "rm -f $$po"; \
+ rm -f "$$po"; \
+ fi; \
+ done
++# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x
+ @for lc in C $(_DOC_REAL_LINGUAS); do \
+ if test -f "$$lc/.xml2po.mo"; then \
+ echo "rm -f $$lc/.xml2po.mo"; \
+Index: b/help/bg/Makefile.in
+===================================================================
+--- a/help/bg/Makefile.in
++++ b/help/bg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -18754,24 +20081,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -528,7 +533,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -553,7 +558,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
+Index: b/lib/Makefile.in
+===================================================================
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -1,4 +1,4 @@
@@ -18806,6 +20117,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/ltmain.sh
+===================================================================
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -65,7 +65,7 @@
@@ -18886,135 +20199,8 @@
esac
;;
no)
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -124,6 +124,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -180,6 +182,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-@@ -239,6 +243,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -442,7 +447,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -467,7 +472,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -637,7 +642,8 @@
- fi; \
- done
- -test -n "$(am__skip_mode_fix)" \
-- || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+ || find "$(distdir)" -type d ! -perm -755 \
-+ -exec chmod u+rwx,go+rx {} \; -o \
- ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -680,17 +686,17 @@
- distcheck: dist
- case '$(DIST_ARCHIVES)' in \
- *.tar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
-- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.xz*) \
- xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- *.zip*) \
- unzip $(distdir).zip ;;\
- esac
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
-@@ -129,7 +129,7 @@
- done
-
- # Empty stubs to satisfy archaic automake needs
--dvi info ctags tags CTAGS TAGS ID:
-+dvi info tags TAGS ID:
-
- # Define this as empty until I found a useful application.
- install-exec installcheck:
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -121,6 +121,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -177,6 +179,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-@@ -236,6 +240,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/Makefile.in
+===================================================================
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
@@ -19067,6 +20253,98 @@
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
+Index: b/src/backend/Makefile.in
+===================================================================
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -121,6 +121,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -177,6 +179,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -236,6 +240,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/Makefile.in
+===================================================================
+--- a/src/plugins/Makefile.in
++++ b/src/plugins/Makefile.in
+@@ -1,4 +1,4 @@
+-# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+ # @configure_input@
+
+ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+@@ -167,6 +167,8 @@
+ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
++BBC_CFLAGS = @BBC_CFLAGS@
++BBC_LIBS = @BBC_LIBS@
+ BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
+ BEMUSED_LIBS = @BEMUSED_LIBS@
+ BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
+@@ -223,6 +225,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -282,6 +286,7 @@
+ PACKAGE_NAME = @PACKAGE_NAME@
+ PACKAGE_STRING = @PACKAGE_STRING@
+ PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_URL = @PACKAGE_URL@
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PKG_CONFIG = @PKG_CONFIG@
+@@ -575,7 +580,7 @@
+ # (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+ $(RECURSIVE_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+@@ -600,7 +605,7 @@
+ fi; test -z "$$fail"
+
+ $(RECURSIVE_CLEAN_TARGETS):
+- @failcom='exit 1'; \
++ @fail= failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+Index: b/src/plugins/bbc/Makefile.in
+===================================================================
--- /dev/null
+++ b/src/plugins/bbc/Makefile.in
@@ -0,0 +1,596 @@
@@ -19666,6 +20944,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
+Index: b/src/plugins/bemused/Makefile.in
+===================================================================
--- a/src/plugins/bemused/Makefile.in
+++ b/src/plugins/bemused/Makefile.in
@@ -1,4 +1,4 @@
@@ -19700,6 +20980,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/brasero-disc-recorder/Makefile.in
+===================================================================
--- a/src/plugins/brasero-disc-recorder/Makefile.in
+++ b/src/plugins/brasero-disc-recorder/Makefile.in
@@ -1,4 +1,4 @@
@@ -19734,6 +21016,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/coherence_upnp/Makefile.in
+===================================================================
--- a/src/plugins/coherence_upnp/Makefile.in
+++ b/src/plugins/coherence_upnp/Makefile.in
@@ -1,4 +1,4 @@
@@ -19768,6 +21052,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/dbus-service/Makefile.in
+===================================================================
--- a/src/plugins/dbus-service/Makefile.in
+++ b/src/plugins/dbus-service/Makefile.in
@@ -1,4 +1,4 @@
@@ -19802,6 +21088,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/galago/Makefile.in
+===================================================================
--- a/src/plugins/galago/Makefile.in
+++ b/src/plugins/galago/Makefile.in
@@ -1,4 +1,4 @@
@@ -19836,6 +21124,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/gromit/Makefile.in
+===================================================================
--- a/src/plugins/gromit/Makefile.in
+++ b/src/plugins/gromit/Makefile.in
@@ -1,4 +1,4 @@
@@ -19870,6 +21160,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/iplayer/Makefile.in
+===================================================================
--- a/src/plugins/iplayer/Makefile.in
+++ b/src/plugins/iplayer/Makefile.in
@@ -1,4 +1,4 @@
@@ -19904,6 +21196,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/jamendo/Makefile.in
+===================================================================
--- a/src/plugins/jamendo/Makefile.in
+++ b/src/plugins/jamendo/Makefile.in
@@ -1,4 +1,4 @@
@@ -19938,6 +21232,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/lirc/Makefile.in
+===================================================================
--- a/src/plugins/lirc/Makefile.in
+++ b/src/plugins/lirc/Makefile.in
@@ -1,4 +1,4 @@
@@ -19972,58 +21268,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/Makefile.in
-+++ b/src/plugins/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -167,6 +167,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -223,6 +225,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-@@ -282,6 +286,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -575,7 +580,7 @@
- # (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
-@@ -600,7 +605,7 @@
- fi; test -z "$$fail"
-
- $(RECURSIVE_CLEAN_TARGETS):
-- @failcom='exit 1'; \
-+ @fail= failcom='exit 1'; \
- for f in x $$MAKEFLAGS; do \
- case $$f in \
- *=* | --[!k]*);; \
+Index: b/src/plugins/media-player-keys/Makefile.in
+===================================================================
--- a/src/plugins/media-player-keys/Makefile.in
+++ b/src/plugins/media-player-keys/Makefile.in
@@ -1,4 +1,4 @@
@@ -20058,6 +21304,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/mythtv/Makefile.in
+===================================================================
--- a/src/plugins/mythtv/Makefile.in
+++ b/src/plugins/mythtv/Makefile.in
@@ -1,4 +1,4 @@
@@ -20092,6 +21340,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/ontop/Makefile.in
+===================================================================
--- a/src/plugins/ontop/Makefile.in
+++ b/src/plugins/ontop/Makefile.in
@@ -1,4 +1,4 @@
@@ -20126,6 +21376,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/opensubtitles/Makefile.in
+===================================================================
--- a/src/plugins/opensubtitles/Makefile.in
+++ b/src/plugins/opensubtitles/Makefile.in
@@ -1,4 +1,4 @@
@@ -20160,6 +21412,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/properties/Makefile.in
+===================================================================
--- a/src/plugins/properties/Makefile.in
+++ b/src/plugins/properties/Makefile.in
@@ -1,4 +1,4 @@
@@ -20194,6 +21448,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/publish/Makefile.in
+===================================================================
--- a/src/plugins/publish/Makefile.in
+++ b/src/plugins/publish/Makefile.in
@@ -1,4 +1,4 @@
@@ -20228,6 +21484,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/pythonconsole/Makefile.in
+===================================================================
--- a/src/plugins/pythonconsole/Makefile.in
+++ b/src/plugins/pythonconsole/Makefile.in
@@ -1,4 +1,4 @@
@@ -20262,6 +21520,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/sample-python/Makefile.in
+===================================================================
--- a/src/plugins/sample-python/Makefile.in
+++ b/src/plugins/sample-python/Makefile.in
@@ -1,4 +1,4 @@
@@ -20296,6 +21556,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/sample-vala/Makefile.in
+===================================================================
--- a/src/plugins/sample-vala/Makefile.in
+++ b/src/plugins/sample-vala/Makefile.in
@@ -1,4 +1,4 @@
@@ -20330,6 +21592,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/screensaver/Makefile.in
+===================================================================
--- a/src/plugins/screensaver/Makefile.in
+++ b/src/plugins/screensaver/Makefile.in
@@ -1,4 +1,4 @@
@@ -20364,6 +21628,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/screenshot/Makefile.in
+===================================================================
--- a/src/plugins/screenshot/Makefile.in
+++ b/src/plugins/screenshot/Makefile.in
@@ -1,4 +1,4 @@
@@ -20398,6 +21664,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/sidebar-test/Makefile.in
+===================================================================
--- a/src/plugins/sidebar-test/Makefile.in
+++ b/src/plugins/sidebar-test/Makefile.in
@@ -1,4 +1,4 @@
@@ -20432,6 +21700,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/skipto/Makefile.in
+===================================================================
--- a/src/plugins/skipto/Makefile.in
+++ b/src/plugins/skipto/Makefile.in
@@ -1,4 +1,4 @@
@@ -20466,6 +21736,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/thumbnail/Makefile.in
+===================================================================
--- a/src/plugins/thumbnail/Makefile.in
+++ b/src/plugins/thumbnail/Makefile.in
@@ -1,4 +1,4 @@
@@ -20500,6 +21772,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/totem/Makefile.in
+===================================================================
--- a/src/plugins/totem/Makefile.in
+++ b/src/plugins/totem/Makefile.in
@@ -1,4 +1,4 @@
@@ -20534,6 +21808,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/tracker/Makefile.in
+===================================================================
--- a/src/plugins/tracker/Makefile.in
+++ b/src/plugins/tracker/Makefile.in
@@ -1,4 +1,4 @@
@@ -20568,6 +21844,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
+Index: b/src/plugins/youtube/Makefile.in
+===================================================================
--- a/src/plugins/youtube/Makefile.in
+++ b/src/plugins/youtube/Makefile.in
@@ -1,4 +1,4 @@
@@ -20602,386 +21880,3 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/config.guess
-+++ b/config.guess
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
-
- # 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
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
---- a/config.sub
-+++ b/config.sub
-@@ -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
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
---- a/INSTALL
-+++ b/INSTALL
-@@ -4,8 +4,10 @@
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
- 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-
-- This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
-+ Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved. This file is offered as-is,
-+without warranty of any kind.
-
- Basic Installation
- ==================
-@@ -13,7 +15,11 @@
- Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package. The following
- more-detailed instructions are generic; see the `README' file for
--instructions specific to this package.
-+instructions specific to this package. Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below. The lack of an optional feature in a given package is not
-+necessarily a bug. More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
-
- The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation. It uses
-@@ -42,7 +48,7 @@
- you want to change it or regenerate `configure' using a newer version
- of `autoconf'.
-
--The simplest way to compile this package is:
-+ The simplest way to compile this package is:
-
- 1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@
- 2. Type `make' to compile the package.
-
- 3. Optionally, type `make check' to run any self-tests that come with
-- the package.
-+ the package, generally using the just-built uninstalled binaries.
-
- 4. Type `make install' to install the programs and any data files and
-- documentation.
-+ documentation. When installing into a prefix owned by root, it is
-+ recommended that the package be configured and built as a regular
-+ user, and only the `make install' phase executed with root
-+ privileges.
-+
-+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
-+ this time using the binaries in their final installed location.
-+ This target does not install anything. Running this target as a
-+ regular user, particularly if the prior `make install' required
-+ root privileges, verifies that the installation completed
-+ correctly.
-
-- 5. You can remove the program binaries and object files from the
-+ 6. You can remove the program binaries and object files from the
- source code directory by typing `make clean'. To also remove the
- files that `configure' created (so you can compile the package for
- a different kind of computer), type `make distclean'. There is
-@@ -67,8 +83,15 @@
- all sorts of other programs in order to regenerate files that came
- with the distribution.
-
-- 6. Often, you can also type `make uninstall' to remove the installed
-- files again.
-+ 7. Often, you can also type `make uninstall' to remove the installed
-+ files again. In practice, not all packages have tested that
-+ uninstallation works correctly, even though it is required by the
-+ GNU Coding Standards.
-+
-+ 8. Some packages, particularly those that use Automake, provide `make
-+ distcheck', which can by used by developers to test that all other
-+ targets like `make install' and `make uninstall' work correctly.
-+ This target is generally not run by end users.
-
- Compilers and Options
- =====================
-@@ -93,7 +116,8 @@
- own directory. To do this, you can use GNU `make'. `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script. `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
-+source code in the directory that `configure' is in and in `..'. This
-+is known as a "VPATH" build.
-
- With a non-GNU `make', it is safer to compile the package for one
- architecture at a time in the source code directory. After you have
-@@ -120,7 +144,8 @@
- By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc. You
- can specify an installation prefix other than `/usr/local' by giving
--`configure' the option `--prefix=PREFIX'.
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
-
- You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files. If you
-@@ -131,15 +156,46 @@
- In addition, if you use an unusual directory layout you can give
- options like `--bindir=DIR' to specify different values for particular
- kinds of files. Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
-+you can set and what kinds of files go in them. In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+ The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+ The first method involves providing an override variable for each
-+affected directory. For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'. Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated. The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+ The second method involves providing the `DESTDIR' variable. For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names. The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters. On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-+
-+Optional Features
-+=================
-
- If the package supports it, you can cause programs to be installed
- with an extra prefix or suffix on their names by giving `configure' the
- option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
-
--Optional Features
--=================
--
- Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
-@@ -152,6 +208,13 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
-
-+ Some packages offer the ability to configure how verbose the
-+execution of `make' will be. For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
- Particular systems
- ==================
-
-@@ -288,7 +351,7 @@
- `configure' can determine that directory automatically.
-
- `--prefix=DIR'
-- Use DIR as the installation prefix. *Note Installation Names::
-+ Use DIR as the installation prefix. *note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
---- a/compile
-+++ b/compile
-@@ -1,7 +1,7 @@
- #! /bin/sh
- # Wrapper for compilers which do not understand `-c -o'.
-
--scriptversion=2009-04-28.21; # UTC
-+scriptversion=2009-10-06.20; # UTC
-
- # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software
- # Foundation, Inc.
-@@ -124,9 +124,9 @@
- ret=$?
-
- if test -f "$cofile"; then
-- mv "$cofile" "$ofile"
-+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
- elif test -f "${cofile}bj"; then
-- mv "${cofile}bj" "$ofile"
-+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
- fi
-
- rmdir "$lockdir"
More information about the pkg-gnome-commits
mailing list