r21677 - in /desktop/unstable/totem/debian: changelog patches/90_autotools.patch
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Tue Sep 29 15:18:54 UTC 2009
Author: slomo
Date: Tue Sep 29 15:18:54 2009
New Revision: 21677
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=21677
Log:
* New upstream bugfix release:
+ debian/patches/90_autotools.patch:
- Regenerated for the new version.
Modified:
desktop/unstable/totem/debian/changelog
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=21677&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Tue Sep 29 15:18:54 2009
@@ -1,4 +1,4 @@
-totem (2.28.0-3) unstable; urgency=low
+totem (2.28.1-1) unstable; urgency=low
* debian/control.in:
+ Clean up inter-package dependencies and remove a completely
@@ -7,8 +7,11 @@
* debian/totem.install,
debian/totem-common.install:
+ Move the desktop file into the same package as the binaries.
-
- -- Sebastian Dröge <slomo at debian.org> Tue, 29 Sep 2009 16:35:41 +0200
+ * New upstream bugfix release:
+ + debian/patches/90_autotools.patch:
+ - Regenerated for the new version.
+
+ -- Sebastian Dröge <slomo at debian.org> Tue, 29 Sep 2009 17:16:16 +0200
totem (2.28.0-2) unstable; urgency=low
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=21677&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] Tue Sep 29 15:18:54 2009
@@ -1,6 +1,6 @@
-diff -Naur totem-2.28.0.old/aclocal.m4 totem-2.28.0/aclocal.m4
---- totem-2.28.0.old/aclocal.m4 2009-09-21 13:11:56.000000000 +0200
-+++ totem-2.28.0/aclocal.m4 2009-09-21 17:05:05.000000000 +0200
+diff -Naur totem-2.28.1.old/aclocal.m4 totem-2.28.1/aclocal.m4
+--- totem-2.28.1.old/aclocal.m4 2009-09-29 13:36:54.000000000 +0200
++++ totem-2.28.1/aclocal.m4 2009-09-29 17:18:03.000000000 +0200
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -12,23 +12,7 @@
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -729,12 +729,15 @@
-
- ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
-
-+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
- PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
- [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
-
- if test "$gdu_cv_have_gdu" = "yes"; then
-+ AC_MSG_RESULT([yes])
- ifelse([$2],,[:],[$2])
- else
-+ AC_MSG_RESULT([no])
- ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
- fi
-
-@@ -3441,13 +3444,10 @@
+@@ -3444,13 +3444,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -43,7 +27,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3459,6 +3459,18 @@
+@@ -3462,6 +3459,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -62,7 +46,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4050,7 +4062,7 @@
+@@ -4053,7 +4062,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -71,7 +55,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
else
-@@ -4731,7 +4743,7 @@
+@@ -4734,7 +4743,7 @@
;;
esac
;;
@@ -80,7 +64,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -5156,6 +5168,9 @@
+@@ -5159,6 +5168,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -90,7 +74,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5220,6 +5235,9 @@
+@@ -5223,6 +5235,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -100,7 +84,7 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5402,7 +5420,7 @@
+@@ -5405,7 +5420,7 @@
fi
;;
@@ -109,7 +93,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5577,6 +5595,7 @@
+@@ -5580,6 +5595,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -117,7 +101,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5815,7 +5834,7 @@
+@@ -5818,7 +5834,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -126,7 +110,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9024,14 +9043,16 @@
+@@ -9027,14 +9043,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -151,7 +135,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -9075,9 +9096,9 @@
+@@ -9078,9 +9096,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -163,9 +147,9 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur totem-2.28.0.old/bindings/Makefile.in totem-2.28.0/bindings/Makefile.in
---- totem-2.28.0.old/bindings/Makefile.in 2009-09-21 13:52:11.000000000 +0200
-+++ totem-2.28.0/bindings/Makefile.in 2009-09-21 17:05:08.000000000 +0200
+diff -Naur totem-2.28.1.old/bindings/Makefile.in totem-2.28.1/bindings/Makefile.in
+--- totem-2.28.1.old/bindings/Makefile.in 2009-09-29 13:39:56.000000000 +0200
++++ totem-2.28.1/bindings/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -109,6 +109,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -183,9 +167,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/bindings/python/Makefile.in totem-2.28.0/bindings/python/Makefile.in
---- totem-2.28.0.old/bindings/python/Makefile.in 2009-09-21 13:52:11.000000000 +0200
-+++ totem-2.28.0/bindings/python/Makefile.in 2009-09-21 17:05:08.000000000 +0200
+diff -Naur totem-2.28.1.old/bindings/python/Makefile.in totem-2.28.1/bindings/python/Makefile.in
+--- totem-2.28.1.old/bindings/python/Makefile.in 2009-09-29 13:39:56.000000000 +0200
++++ totem-2.28.1/bindings/python/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -106,6 +106,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -203,9 +187,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/bindings/vala/Makefile.in totem-2.28.0/bindings/vala/Makefile.in
---- totem-2.28.0.old/bindings/vala/Makefile.in 2009-09-21 13:52:12.000000000 +0200
-+++ totem-2.28.0/bindings/vala/Makefile.in 2009-09-21 17:05:08.000000000 +0200
+diff -Naur totem-2.28.1.old/bindings/vala/Makefile.in totem-2.28.1/bindings/vala/Makefile.in
+--- totem-2.28.1.old/bindings/vala/Makefile.in 2009-09-29 13:39:56.000000000 +0200
++++ totem-2.28.1/bindings/vala/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -70,6 +70,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -223,9 +207,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/browser-plugin/Makefile.in totem-2.28.0/browser-plugin/Makefile.in
---- totem-2.28.0.old/browser-plugin/Makefile.in 2009-09-21 13:52:12.000000000 +0200
-+++ totem-2.28.0/browser-plugin/Makefile.in 2009-09-21 17:05:08.000000000 +0200
+diff -Naur totem-2.28.1.old/browser-plugin/Makefile.in totem-2.28.1/browser-plugin/Makefile.in
+--- totem-2.28.1.old/browser-plugin/Makefile.in 2009-09-29 13:39:57.000000000 +0200
++++ totem-2.28.1/browser-plugin/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -333,6 +333,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -243,141 +227,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/config.guess totem-2.28.0/config.guess
---- totem-2.28.0.old/config.guess 2009-09-21 13:52:11.000000000 +0200
-+++ totem-2.28.0/config.guess 2009-09-21 17:05:07.000000000 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 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:*:*)
-diff -Naur totem-2.28.0.old/config.h.in totem-2.28.0/config.h.in
---- totem-2.28.0.old/config.h.in 2009-09-21 13:52:09.000000000 +0200
-+++ totem-2.28.0/config.h.in 2009-09-21 17:05:07.000000000 +0200
+diff -Naur totem-2.28.1.old/config.guess totem-2.28.1/config.guess
+diff -Naur totem-2.28.1.old/config.h.in totem-2.28.1/config.h.in
+--- totem-2.28.1.old/config.h.in 2009-09-29 13:39:54.000000000 +0200
++++ totem-2.28.1/config.h.in 2009-09-29 17:18:05.000000000 +0200
@@ -100,6 +100,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -388,69 +241,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur totem-2.28.0.old/config.sub totem-2.28.0/config.sub
---- totem-2.28.0.old/config.sub 2009-09-21 13:52:11.000000000 +0200
-+++ totem-2.28.0/config.sub 2009-09-21 17:05:07.000000000 +0200
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 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*)
-diff -Naur totem-2.28.0.old/configure totem-2.28.0/configure
---- totem-2.28.0.old/configure 2009-09-21 13:23:49.000000000 +0200
-+++ totem-2.28.0/configure 2009-09-21 17:05:06.000000000 +0200
+diff -Naur totem-2.28.1.old/config.sub totem-2.28.1/config.sub
+diff -Naur totem-2.28.1.old/configure totem-2.28.1/configure
+--- totem-2.28.1.old/configure 2009-09-29 13:37:13.000000000 +0200
++++ totem-2.28.1/configure 2009-09-29 17:18:05.000000000 +0200
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for totem 2.28.0.
-+# Generated by GNU Autoconf 2.64 for totem 2.28.0.
+-# Generated by GNU Autoconf 2.63 for totem 2.28.1.
++# Generated by GNU Autoconf 2.64 for totem 2.28.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=totem>.
#
@@ -684,18 +483,6 @@
-
-if as_func_ret_success; then
- :
--else
-- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
@@ -715,11 +502,23 @@
+ as_have_required=yes
else
- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
++ as_have_required=no
+ fi
++ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
+ else
+- exitcode=1
- echo positional parameters were not saved.
-+ as_have_required=no
- fi
-+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-
+-fi
+-
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
@@ -729,7 +528,7 @@
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
- else
+-else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -1244,8 +1043,8 @@
# Identity of this package.
PACKAGE_NAME='totem'
@@ -748,6 +702,7 @@
- PACKAGE_VERSION='2.28.0'
- PACKAGE_STRING='totem 2.28.0'
+ PACKAGE_VERSION='2.28.1'
+ PACKAGE_STRING='totem 2.28.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem'
+PACKAGE_URL=''
@@ -1408,19 +1207,42 @@
BEMUSED_CFLAGS
C compiler flags for BEMUSED, overriding pkg-config
BEMUSED_LIBS
-@@ -2049,25 +2000,503 @@
- done
- fi
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--totem configure 2.28.0
--generated by GNU Autoconf 2.63
+@@ -2034,40 +1985,518 @@
+ esac
+ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+- cd "$ac_dir" || { ac_status=$?; continue; }
+- # Check for guested configure.
+- if test -f "$ac_srcdir/configure.gnu"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
+- elif test -f "$ac_srcdir/configure"; then
+- echo &&
+- $SHELL "$ac_srcdir/configure" --help=recursive
+- else
+- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+- fi || ac_status=$?
+- cd "$ac_pwd" || { ac_status=$?; break; }
+- done
++ cd "$ac_dir" || { ac_status=$?; continue; }
++ # Check for guested configure.
++ if test -f "$ac_srcdir/configure.gnu"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
++ elif test -f "$ac_srcdir/configure"; then
++ echo &&
++ $SHELL "$ac_srcdir/configure" --help=recursive
++ else
++ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
++ fi || ac_status=$?
++ cd "$ac_pwd" || { ac_status=$?; break; }
++ done
++fi
++
+test -n "$ac_init_help" && exit $ac_status
+if $ac_init_version; then
+ cat <<\_ACEOF
-+totem configure 2.28.0
++totem configure 2.28.1
+generated by GNU Autoconf 2.64
+
+Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1857,10 +1679,15 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
-+fi
+ fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+ return $ac_retval
-+
+
+-test -n "$ac_init_help" && exit $ac_status
+-if $ac_init_version; then
+- cat <<\_ACEOF
+-totem configure 2.28.1
+-generated by GNU Autoconf 2.63
+} # ac_fn_cxx_try_cpp
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1918,7 +1745,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
- It was created by totem $as_me 2.28.0, which was
+ It was created by totem $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
@@ -3620,8 +3447,9 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+ #include <ac_nonexistent.h>
-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
@@ -3640,9 +3468,6 @@
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
@@ -4182,7 +4007,7 @@
_ACEOF
fi
-@@ -4880,16 +4739,12 @@
+@@ -4880,227 +4739,61 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -4202,10 +4027,11 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -4898,209 +4753,47 @@
+ main ()
+ {
return LC_MESSAGES
- ;
- return 0;
+- ;
+- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
@@ -4385,6 +4211,8 @@
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
++ ;
++ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
@@ -4886,7 +4714,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5562,226 +5020,82 @@
+@@ -5562,161 +5020,27 @@
return 0;
}
_ACEOF
@@ -5057,19 +4885,17 @@
/* 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
+@@ -5724,64 +5048,54 @@
+ #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
-+#ifdef __cplusplus
-+extern "C"
- #endif
+-#endif
-
+char dcgettext ();
int
@@ -6030,7 +5856,7 @@
fi
fi
-@@ -6858,11 +5949,7 @@
+@@ -6858,136 +5949,25 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -6039,14 +5865,17 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- int
-@@ -6874,120 +5961,13 @@
- return 0;
- }
- _ACEOF
+-/* end confdefs.h. */
+-
+-int
+-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
@@ -6085,7 +5914,8 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* 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
@@ -6116,15 +5946,17 @@
-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
-choke me
-#endif
--
--int
--main ()
--{
+
+ int
+ main ()
+ {
-return bind_textdomain_codeset ();
-- ;
-- return 0;
--}
--_ACEOF
++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
@@ -6313,12 +6145,13 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -7140,29 +6118,33 @@
+@@ -7140,35 +6118,33 @@
gdu_cv_version_required=0.3.2
+-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
-+$as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+ $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
if test -n "$PKG_CONFIG" && \
- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
@@ -6334,15 +6167,17 @@
fi
if test "$gdu_cv_have_gdu" = "yes"; then
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
:
else
+- { $as_echo "$as_me:$LINENO: result: no" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
- { { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
- { (exit 1); exit 1; }; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
fi
@@ -6354,7 +6189,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -7173,7 +6155,7 @@
+@@ -7179,7 +6155,7 @@
# Check whether --with-omf-dir was given.
@@ -6363,7 +6198,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -7184,7 +6166,7 @@
+@@ -7190,7 +6166,7 @@
# Check whether --with-help-formats was given.
@@ -6372,7 +6207,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -7194,7 +6176,7 @@
+@@ -7200,7 +6176,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -6381,7 +6216,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -7237,9 +6219,9 @@
+@@ -7243,9 +6219,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -6393,7 +6228,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -7250,24 +6232,24 @@
+@@ -7256,24 +6232,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6423,7 +6258,7 @@
$as_echo "no" >&6; }
fi
-@@ -7281,9 +6263,9 @@
+@@ -7287,9 +6263,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -6435,7 +6270,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -7294,24 +6276,24 @@
+@@ -7300,24 +6276,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6465,7 +6300,7 @@
$as_echo "no" >&6; }
fi
-@@ -7324,7 +6306,7 @@
+@@ -7330,7 +6306,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6474,7 +6309,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7335,53 +6317,36 @@
+@@ -7341,53 +6317,36 @@
fi
fi
# Provide some information about the compiler.
@@ -6547,7 +6382,7 @@
/* end confdefs.h. */
int
-@@ -7395,37 +6360,16 @@
+@@ -7401,37 +6360,16 @@
return 0;
}
_ACEOF
@@ -6588,7 +6423,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -7434,20 +6378,16 @@
+@@ -7440,20 +6378,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -6612,7 +6447,7 @@
/* end confdefs.h. */
int
-@@ -7458,35 +6398,11 @@
+@@ -7464,35 +6398,11 @@
return 0;
}
_ACEOF
@@ -6651,7 +6486,7 @@
/* end confdefs.h. */
int
-@@ -7497,36 +6413,12 @@
+@@ -7503,36 +6413,12 @@
return 0;
}
_ACEOF
@@ -6692,7 +6527,7 @@
/* end confdefs.h. */
int
-@@ -7537,42 +6429,17 @@
+@@ -7543,42 +6429,17 @@
return 0;
}
_ACEOF
@@ -6737,7 +6572,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -7597,9 +6464,9 @@
+@@ -7603,9 +6464,9 @@
depcc="$CXX" am_compiler_list=
@@ -6749,7 +6584,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -7707,7 +6574,7 @@
+@@ -7713,7 +6574,7 @@
fi
fi
@@ -6758,7 +6593,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -7723,22 +6590,18 @@
+@@ -7729,22 +6590,18 @@
if test "x$CC" != xcc; then
@@ -6785,7 +6620,7 @@
/* end confdefs.h. */
int
-@@ -7754,63 +6617,63 @@
+@@ -7760,63 +6617,63 @@
# existing .o file with -o, though they will create one.
ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
rm -f conftest2.*
@@ -6874,7 +6709,7 @@
then
# cc works too.
:
-@@ -7827,15 +6690,13 @@
+@@ -7833,15 +6690,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -6893,7 +6728,7 @@
fi
-@@ -7856,7 +6717,7 @@
+@@ -7862,7 +6717,7 @@
case `pwd` in
*\ * | *\ *)
@@ -6902,7 +6737,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -7881,35 +6742,27 @@
+@@ -7887,35 +6742,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -6945,7 +6780,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -7925,28 +6778,24 @@
+@@ -7931,28 +6778,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -6979,7 +6814,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -7962,9 +6811,9 @@
+@@ -7968,9 +6811,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -6991,7 +6826,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -7972,7 +6821,7 @@
+@@ -7978,7 +6821,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -7000,7 +6835,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -7981,7 +6830,7 @@
+@@ -7987,7 +6830,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7009,7 +6844,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -8001,7 +6850,7 @@
+@@ -8007,7 +6850,7 @@
$as_echo '' >> "conftest.nl"
"$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -7018,7 +6853,7 @@
if test $ac_count -gt ${ac_path_SED_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_SED="$ac_path_SED"
-@@ -8016,19 +6865,17 @@
+@@ -8022,19 +6865,17 @@
$ac_path_SED_found && break 3
done
done
@@ -7041,7 +6876,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -8046,9 +6893,9 @@
+@@ -8052,9 +6893,9 @@
@@ -7053,7 +6888,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -8062,7 +6909,7 @@
+@@ -8068,7 +6909,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7062,7 +6897,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -8082,7 +6929,7 @@
+@@ -8088,7 +6929,7 @@
$as_echo 'FGREP' >> "conftest.nl"
"$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -7071,7 +6906,7 @@
if test $ac_count -gt ${ac_path_FGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -8097,12 +6944,10 @@
+@@ -8103,12 +6944,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -7086,7 +6921,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -8110,7 +6955,7 @@
+@@ -8116,7 +6955,7 @@
fi
fi
@@ -7095,7 +6930,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -8136,7 +6981,7 @@
+@@ -8142,7 +6981,7 @@
# Check whether --with-gnu-ld was given.
@@ -7104,7 +6939,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -8145,7 +6990,7 @@
+@@ -8151,7 +6990,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -7113,7 +6948,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -8175,13 +7020,13 @@
+@@ -8181,13 +7020,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -7130,7 +6965,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -8212,18 +7057,16 @@
+@@ -8218,18 +7057,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -7154,7 +6989,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -8236,7 +7079,7 @@
+@@ -8242,7 +7079,7 @@
;;
esac
fi
@@ -7163,7 +6998,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -8248,9 +7091,9 @@
+@@ -8254,9 +7091,9 @@
@@ -7175,7 +7010,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -8297,7 +7140,7 @@
+@@ -8303,7 +7140,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -7184,7 +7019,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -8308,9 +7151,9 @@
+@@ -8314,9 +7151,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7196,7 +7031,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -8321,24 +7164,24 @@
+@@ -8327,24 +7164,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7226,7 +7061,7 @@
$as_echo "no" >&6; }
fi
-@@ -8352,9 +7195,9 @@
+@@ -8358,9 +7195,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7238,7 +7073,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -8365,24 +7208,24 @@
+@@ -8371,24 +7208,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7268,7 +7103,7 @@
$as_echo "no" >&6; }
fi
-@@ -8395,7 +7238,7 @@
+@@ -8401,7 +7238,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7277,7 +7112,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8415,33 +7258,33 @@
+@@ -8421,33 +7258,33 @@
@@ -7290,15 +7125,15 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:8425: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:8431: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:7268: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8428: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:8434: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:7271: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8431: output\"" >&5)
+- (eval echo "\"\$as_me:8437: output\"" >&5)
+ (eval echo "\"\$as_me:7274: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
@@ -7319,7 +7154,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -8559,10 +7402,10 @@
+@@ -8565,10 +7402,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7332,7 +7167,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -8576,7 +7419,7 @@
+@@ -8582,7 +7419,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -7341,7 +7176,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -8586,17 +7429,17 @@
+@@ -8592,17 +7429,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -7362,7 +7197,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -8631,14 +7474,14 @@
+@@ -8637,14 +7474,14 @@
@@ -7380,7 +7215,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -8667,9 +7510,9 @@
+@@ -8673,9 +7510,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -7392,7 +7227,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -8680,24 +7523,24 @@
+@@ -8686,24 +7523,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7422,7 +7257,7 @@
$as_echo "no" >&6; }
fi
-@@ -8707,9 +7550,9 @@
+@@ -8713,9 +7550,9 @@
ac_ct_OBJDUMP=$OBJDUMP
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
@@ -7434,7 +7269,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -8720,24 +7563,24 @@
+@@ -8726,24 +7563,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7464,7 +7299,7 @@
$as_echo "no" >&6; }
fi
-@@ -8746,7 +7589,7 @@
+@@ -8752,7 +7589,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7473,7 +7308,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8766,9 +7609,9 @@
+@@ -8772,9 +7609,9 @@
@@ -7485,7 +7320,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -8887,7 +7730,7 @@
+@@ -8893,7 +7730,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -7494,7 +7329,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
else
-@@ -8962,7 +7805,7 @@
+@@ -8968,7 +7805,7 @@
esac
fi
@@ -7503,7 +7338,7 @@
$as_echo "$lt_cv_deplibs_check_method" >&6; }
file_magic_cmd=$lt_cv_file_magic_cmd
deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -8982,9 +7825,9 @@
+@@ -8988,9 +7825,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -7515,7 +7350,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -8995,24 +7838,24 @@
+@@ -9001,24 +7838,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7545,7 +7380,7 @@
$as_echo "no" >&6; }
fi
-@@ -9022,9 +7865,9 @@
+@@ -9028,9 +7865,9 @@
ac_ct_AR=$AR
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
@@ -7557,7 +7392,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -9035,24 +7878,24 @@
+@@ -9041,24 +7878,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7587,7 +7422,7 @@
$as_echo "no" >&6; }
fi
-@@ -9061,7 +7904,7 @@
+@@ -9067,7 +7904,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7596,7 +7431,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9087,9 +7930,9 @@
+@@ -9093,9 +7930,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -7608,7 +7443,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -9100,24 +7943,24 @@
+@@ -9106,24 +7943,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7638,7 +7473,7 @@
$as_echo "no" >&6; }
fi
-@@ -9127,9 +7970,9 @@
+@@ -9133,9 +7970,9 @@
ac_ct_STRIP=$STRIP
# Extract the first word of "strip", so it can be a program name with args.
set dummy strip; ac_word=$2
@@ -7650,7 +7485,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -9140,24 +7983,24 @@
+@@ -9146,24 +7983,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7680,7 +7515,7 @@
$as_echo "no" >&6; }
fi
-@@ -9166,7 +8009,7 @@
+@@ -9172,7 +8009,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7689,7 +7524,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9186,9 +8029,9 @@
+@@ -9192,9 +8029,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -7701,7 +7536,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -9199,24 +8042,24 @@
+@@ -9205,24 +8042,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7731,7 +7566,7 @@
$as_echo "no" >&6; }
fi
-@@ -9226,9 +8069,9 @@
+@@ -9232,9 +8069,9 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
@@ -7743,7 +7578,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -9239,24 +8082,24 @@
+@@ -9245,24 +8082,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7773,7 +7608,7 @@
$as_echo "no" >&6; }
fi
-@@ -9265,7 +8108,7 @@
+@@ -9271,7 +8108,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7782,7 +7617,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9343,9 +8186,9 @@
+@@ -9349,9 +8186,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -7794,7 +7629,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -9461,18 +8304,18 @@
+@@ -9467,18 +8304,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -7819,7 +7654,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -9525,11 +8368,11 @@
+@@ -9531,11 +8368,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -7834,7 +7669,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -9563,10 +8406,10 @@
+@@ -9569,10 +8406,10 @@
lt_cv_sys_global_symbol_to_cdecl=
fi
if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -7847,7 +7682,7 @@
$as_echo "ok" >&6; }
fi
-@@ -9592,7 +8435,7 @@
+@@ -9598,7 +8435,7 @@
# Check whether --enable-libtool-lock was given.
@@ -7856,7 +7691,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -9604,11 +8447,11 @@
+@@ -9610,11 +8447,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7871,11 +7706,11 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -9622,12 +8465,12 @@
+@@ -9628,12 +8465,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 9625 "configure"' > conftest.$ac_ext
+- echo '#line 9631 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ echo '#line 8468 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -7888,7 +7723,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -9661,11 +8504,11 @@
+@@ -9667,11 +8504,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7903,7 +7738,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -9714,9 +8557,9 @@
+@@ -9720,9 +8557,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -7915,7 +7750,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -9725,11 +8568,7 @@
+@@ -9731,11 +8568,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7928,7 +7763,7 @@
/* end confdefs.h. */
int
-@@ -9740,38 +8579,13 @@
+@@ -9746,38 +8579,13 @@
return 0;
}
_ACEOF
@@ -7971,7 +7806,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9779,7 +8593,7 @@
+@@ -9785,7 +8593,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -7980,7 +7815,7 @@
$as_echo "$lt_cv_cc_needs_belf" >&6; }
if test x"$lt_cv_cc_needs_belf" != x"yes"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -9789,11 +8603,11 @@
+@@ -9795,11 +8603,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7995,7 +7830,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -9819,9 +8633,9 @@
+@@ -9825,9 +8633,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
@@ -8007,7 +7842,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -9832,24 +8646,24 @@
+@@ -9838,24 +8646,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8037,7 +7872,7 @@
$as_echo "no" >&6; }
fi
-@@ -9859,9 +8673,9 @@
+@@ -9865,9 +8673,9 @@
ac_ct_DSYMUTIL=$DSYMUTIL
# Extract the first word of "dsymutil", so it can be a program name with args.
set dummy dsymutil; ac_word=$2
@@ -8049,7 +7884,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -9872,24 +8686,24 @@
+@@ -9878,24 +8686,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8079,7 +7914,7 @@
$as_echo "no" >&6; }
fi
-@@ -9898,7 +8712,7 @@
+@@ -9904,7 +8712,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8088,7 +7923,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9911,9 +8725,9 @@
+@@ -9917,9 +8725,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
set dummy ${ac_tool_prefix}nmedit; ac_word=$2
@@ -8100,7 +7935,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -9924,24 +8738,24 @@
+@@ -9930,24 +8738,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8130,7 +7965,7 @@
$as_echo "no" >&6; }
fi
-@@ -9951,9 +8765,9 @@
+@@ -9957,9 +8765,9 @@
ac_ct_NMEDIT=$NMEDIT
# Extract the first word of "nmedit", so it can be a program name with args.
set dummy nmedit; ac_word=$2
@@ -8142,7 +7977,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -9964,24 +8778,24 @@
+@@ -9970,24 +8778,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8172,7 +8007,7 @@
$as_echo "no" >&6; }
fi
-@@ -9990,7 +8804,7 @@
+@@ -9996,7 +8804,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8181,7 +8016,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10003,9 +8817,9 @@
+@@ -10009,9 +8817,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
set dummy ${ac_tool_prefix}lipo; ac_word=$2
@@ -8193,7 +8028,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -10016,24 +8830,24 @@
+@@ -10022,24 +8830,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8223,7 +8058,7 @@
$as_echo "no" >&6; }
fi
-@@ -10043,9 +8857,9 @@
+@@ -10049,9 +8857,9 @@
ac_ct_LIPO=$LIPO
# Extract the first word of "lipo", so it can be a program name with args.
set dummy lipo; ac_word=$2
@@ -8235,7 +8070,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -10056,24 +8870,24 @@
+@@ -10062,24 +8870,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8265,7 +8100,7 @@
$as_echo "no" >&6; }
fi
-@@ -10082,7 +8896,7 @@
+@@ -10088,7 +8896,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8274,7 +8109,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10095,9 +8909,9 @@
+@@ -10101,9 +8909,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool; ac_word=$2
@@ -8286,7 +8121,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -10108,24 +8922,24 @@
+@@ -10114,24 +8922,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8316,7 +8151,7 @@
$as_echo "no" >&6; }
fi
-@@ -10135,9 +8949,9 @@
+@@ -10141,9 +8949,9 @@
ac_ct_OTOOL=$OTOOL
# Extract the first word of "otool", so it can be a program name with args.
set dummy otool; ac_word=$2
@@ -8328,7 +8163,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -10148,24 +8962,24 @@
+@@ -10154,24 +8962,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8358,7 +8193,7 @@
$as_echo "no" >&6; }
fi
-@@ -10174,7 +8988,7 @@
+@@ -10180,7 +8988,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8367,7 +8202,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10187,9 +9001,9 @@
+@@ -10193,9 +9001,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
set dummy ${ac_tool_prefix}otool64; ac_word=$2
@@ -8379,7 +8214,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -10200,24 +9014,24 @@
+@@ -10206,24 +9014,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8409,7 +8244,7 @@
$as_echo "no" >&6; }
fi
-@@ -10227,9 +9041,9 @@
+@@ -10233,9 +9041,9 @@
ac_ct_OTOOL64=$OTOOL64
# Extract the first word of "otool64", so it can be a program name with args.
set dummy otool64; ac_word=$2
@@ -8421,7 +8256,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -10240,24 +9054,24 @@
+@@ -10246,24 +9054,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8451,7 +8286,7 @@
$as_echo "no" >&6; }
fi
-@@ -10266,7 +9080,7 @@
+@@ -10272,7 +9080,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8460,7 +8295,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10302,9 +9116,9 @@
+@@ -10308,9 +9116,9 @@
@@ -8472,7 +8307,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -10329,22 +9143,18 @@
+@@ -10335,22 +9143,18 @@
rm -f conftest.*
fi
fi
@@ -8499,7 +8334,7 @@
/* end confdefs.h. */
int
-@@ -10355,42 +9165,17 @@
+@@ -10361,42 +9165,17 @@
return 0;
}
_ACEOF
@@ -8547,7 +8382,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -10427,62 +9212,13 @@
+@@ -10433,62 +9212,13 @@
;;
esac
@@ -8615,7 +8450,7 @@
_ACEOF
fi
-@@ -10505,9 +9241,9 @@
+@@ -10511,9 +9241,9 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -8627,7 +8462,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -10518,24 +9254,24 @@
+@@ -10524,24 +9254,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8657,7 +8492,7 @@
$as_echo "no" >&6; }
fi
-@@ -10549,9 +9285,9 @@
+@@ -10555,9 +9285,9 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -8669,7 +8504,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -10562,24 +9298,24 @@
+@@ -10568,24 +9298,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8699,7 +8534,7 @@
$as_echo "no" >&6; }
fi
-@@ -10592,7 +9328,7 @@
+@@ -10598,7 +9328,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8708,7 +8543,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10603,53 +9339,36 @@
+@@ -10609,53 +9339,36 @@
fi
fi
# Provide some information about the compiler.
@@ -8781,7 +8616,7 @@
/* end confdefs.h. */
int
-@@ -10660,40 +9379,19 @@
+@@ -10666,40 +9379,19 @@
#endif
;
@@ -8828,7 +8663,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -10702,20 +9400,16 @@
+@@ -10708,20 +9400,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -8852,7 +8687,7 @@
/* end confdefs.h. */
int
-@@ -10726,35 +9420,11 @@
+@@ -10732,35 +9420,11 @@
return 0;
}
_ACEOF
@@ -8891,7 +8726,7 @@
/* end confdefs.h. */
int
-@@ -10765,36 +9435,12 @@
+@@ -10771,36 +9435,12 @@
return 0;
}
_ACEOF
@@ -8932,7 +8767,7 @@
/* end confdefs.h. */
int
-@@ -10805,42 +9451,17 @@
+@@ -10811,42 +9451,17 @@
return 0;
}
_ACEOF
@@ -8977,7 +8812,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -10865,9 +9486,9 @@
+@@ -10871,9 +9486,9 @@
depcc="$CXX" am_compiler_list=
@@ -8989,7 +8824,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -10975,7 +9596,7 @@
+@@ -10981,7 +9596,7 @@
fi
fi
@@ -8998,7 +8833,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -10998,10 +9619,10 @@
+@@ -11004,10 +9619,10 @@
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
@@ -9011,7 +8846,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -11016,11 +9637,7 @@
+@@ -11022,11 +9637,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.
@@ -9024,7 +8859,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -11029,78 +9646,34 @@
+@@ -11035,78 +9646,34 @@
#endif
Syntax error
_ACEOF
@@ -9108,7 +8943,7 @@
break
fi
-@@ -11112,7 +9685,7 @@
+@@ -11118,7 +9685,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -9117,7 +8952,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -11123,11 +9696,7 @@
+@@ -11129,11 +9696,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.
@@ -9130,7 +8965,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -11136,81 +9705,37 @@
+@@ -11142,81 +9705,37 @@
#endif
Syntax error
_ACEOF
@@ -9219,7 +9054,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -11240,7 +9765,7 @@
+@@ -11246,7 +9765,7 @@
# Check whether --enable-shared was given.
@@ -9228,7 +9063,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -11271,7 +9796,7 @@
+@@ -11277,7 +9796,7 @@
# Check whether --enable-static was given.
@@ -9237,7 +9072,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -11303,7 +9828,7 @@
+@@ -11309,7 +9828,7 @@
# Check whether --with-pic was given.
@@ -9246,7 +9081,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -11319,7 +9844,7 @@
+@@ -11325,7 +9844,7 @@
# Check whether --enable-fast-install was given.
@@ -9255,7 +9090,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -11400,9 +9925,9 @@
+@@ -11406,9 +9925,9 @@
setopt NO_GLOB_SUBST
fi
@@ -9267,7 +9102,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -11415,7 +9940,7 @@
+@@ -11421,7 +9940,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -9276,7 +9111,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -11508,9 +10033,9 @@
+@@ -11514,9 +10033,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -9288,7 +9123,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11561,10 +10086,10 @@
+@@ -11567,10 +10086,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9301,7 +9136,7 @@
$as_echo "no" >&6; }
fi
-@@ -11574,9 +10099,9 @@
+@@ -11580,9 +10099,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -9313,7 +9148,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11627,10 +10152,10 @@
+@@ -11633,10 +10152,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9326,7 +9161,7 @@
$as_echo "no" >&6; }
fi
-@@ -11707,9 +10232,9 @@
+@@ -11713,9 +10232,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -9338,21 +9173,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -11725,11 +10250,11 @@
+@@ -11731,11 +10250,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:11728: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:11734: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10253: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:11732: \$? = $ac_status" >&5
+- echo "$as_me:11738: \$? = $ac_status" >&5
+ echo "$as_me:10257: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -11742,7 +10267,7 @@
+@@ -11748,7 +10267,7 @@
$RM conftest*
fi
@@ -9361,7 +9196,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -11762,7 +10287,7 @@
+@@ -11768,7 +10287,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -9370,7 +9205,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -12034,7 +10559,7 @@
+@@ -12040,7 +10559,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -9379,7 +9214,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -12046,9 +10571,9 @@
+@@ -12052,9 +10571,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -9391,21 +9226,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -12064,11 +10589,11 @@
+@@ -12070,11 +10589,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12067: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12073: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10592: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12071: \$? = $ac_status" >&5
+- echo "$as_me:12077: \$? = $ac_status" >&5
+ echo "$as_me:10596: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -12081,7 +10606,7 @@
+@@ -12087,7 +10606,7 @@
$RM conftest*
fi
@@ -9414,7 +9249,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -12105,9 +10630,9 @@
+@@ -12111,9 +10630,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -9426,7 +9261,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -12133,7 +10658,7 @@
+@@ -12139,7 +10658,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9435,7 +9270,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -12148,9 +10673,9 @@
+@@ -12154,9 +10673,9 @@
@@ -9447,21 +9282,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12169,11 +10694,11 @@
+@@ -12175,11 +10694,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12172: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12178: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12176: \$? = $ac_status" >&5
+- echo "$as_me:12182: \$? = $ac_status" >&5
+ echo "$as_me:10701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -12195,7 +10720,7 @@
+@@ -12201,7 +10720,7 @@
$RM conftest*
fi
@@ -9470,7 +9305,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12203,9 +10728,9 @@
+@@ -12209,9 +10728,9 @@
@@ -9482,21 +9317,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12224,11 +10749,11 @@
+@@ -12230,11 +10749,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:12227: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12233: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:10752: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12231: \$? = $ac_status" >&5
+- echo "$as_me:12237: \$? = $ac_status" >&5
+ echo "$as_me:10756: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -12250,7 +10775,7 @@
+@@ -12256,7 +10775,7 @@
$RM conftest*
fi
@@ -9505,7 +9340,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12259,7 +10784,7 @@
+@@ -12265,7 +10784,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -9514,7 +9349,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -12267,10 +10792,10 @@
+@@ -12273,10 +10792,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -9527,7 +9362,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -12283,7 +10808,7 @@
+@@ -12289,7 +10808,7 @@
@@ -9536,7 +9371,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -12343,6 +10868,9 @@
+@@ -12349,6 +10868,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -9546,7 +9381,7 @@
esac
ld_shlibs=yes
-@@ -12525,7 +11053,7 @@
+@@ -12531,7 +11053,7 @@
fi
;;
@@ -9555,7 +9390,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -12700,6 +11228,7 @@
+@@ -12706,6 +11228,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -9563,7 +9398,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12725,11 +11254,7 @@
+@@ -12731,11 +11254,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9576,7 +9411,7 @@
/* end confdefs.h. */
int
-@@ -12740,27 +11265,7 @@
+@@ -12746,27 +11265,7 @@
return 0;
}
_ACEOF
@@ -9605,7 +9440,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12774,16 +11279,9 @@
+@@ -12780,16 +11279,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
@@ -9624,7 +9459,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12796,11 +11294,7 @@
+@@ -12802,11 +11294,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9637,7 +9472,7 @@
/* end confdefs.h. */
int
-@@ -12811,27 +11305,7 @@
+@@ -12817,27 +11305,7 @@
return 0;
}
_ACEOF
@@ -9666,7 +9501,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12845,16 +11319,9 @@
+@@ -12851,16 +11319,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
@@ -9685,7 +9520,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13066,42 +11533,16 @@
+@@ -13072,42 +11533,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -9733,7 +9568,7 @@
LDFLAGS="$save_LDFLAGS"
else
archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -13114,7 +11555,7 @@
+@@ -13120,7 +11555,7 @@
link_all_deplibs=yes
;;
@@ -9742,7 +9577,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -13357,7 +11798,7 @@
+@@ -13363,7 +11798,7 @@
fi
fi
@@ -9751,7 +9586,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -13394,16 +11835,16 @@
+@@ -13400,16 +11835,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -9772,7 +9607,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -13417,11 +11858,11 @@
+@@ -13423,11 +11858,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -9787,7 +9622,7 @@
then
archive_cmds_need_lc=no
else
-@@ -13432,7 +11873,7 @@
+@@ -13438,7 +11873,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -9796,7 +9631,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -13596,7 +12037,7 @@
+@@ -13602,7 +12037,7 @@
@@ -9805,7 +9640,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -14018,11 +12459,7 @@
+@@ -14024,11 +12459,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -9818,7 +9653,7 @@
/* end confdefs.h. */
int
-@@ -14033,41 +12470,13 @@
+@@ -14039,41 +12470,13 @@
return 0;
}
_ACEOF
@@ -9864,7 +9699,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -14076,13 +12485,10 @@
+@@ -14082,13 +12485,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -9879,7 +9714,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14094,6 +12500,18 @@
+@@ -14100,6 +12500,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9898,7 +9733,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14282,7 +12700,7 @@
+@@ -14288,7 +12700,7 @@
dynamic_linker=no
;;
esac
@@ -9907,7 +9742,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -14384,7 +12802,7 @@
+@@ -14390,7 +12802,7 @@
@@ -9916,7 +9751,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -14409,7 +12827,7 @@
+@@ -14415,7 +12827,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -9925,7 +9760,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -14442,123 +12860,27 @@
+@@ -14448,123 +12860,27 @@
lt_cv_dlopen_self=yes
;;
@@ -10064,7 +9899,7 @@
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
-@@ -14566,72 +12888,51 @@
+@@ -14572,72 +12888,51 @@
#ifdef __cplusplus
extern "C"
#endif
@@ -10164,7 +9999,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14649,145 +12950,32 @@
+@@ -14655,145 +12950,32 @@
return 0;
}
_ACEOF
@@ -10321,7 +10156,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14805,57 +12993,28 @@
+@@ -14811,57 +12993,28 @@
return 0;
}
_ACEOF
@@ -10388,7 +10223,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14873,57 +13032,28 @@
+@@ -14879,57 +13032,28 @@
return 0;
}
_ACEOF
@@ -10455,7 +10290,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14941,43 +13071,18 @@
+@@ -14947,43 +13071,18 @@
return 0;
}
_ACEOF
@@ -10505,7 +10340,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -15016,9 +13121,9 @@
+@@ -15022,9 +13121,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -10517,16 +10352,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15027,7 +13132,7 @@
+@@ -15033,7 +13132,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15030 "configure"
+-#line 15036 "configure"
+#line 13135 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15086,11 +13191,11 @@
+@@ -15092,11 +13191,11 @@
return status;
}
_LT_EOF
@@ -10541,7 +10376,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15107,14 +13212,14 @@
+@@ -15113,14 +13212,14 @@
fi
@@ -10559,16 +10394,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15123,7 +13228,7 @@
+@@ -15129,7 +13228,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15126 "configure"
+-#line 15132 "configure"
+#line 13231 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15182,11 +13287,11 @@
+@@ -15188,11 +13287,11 @@
return status;
}
_LT_EOF
@@ -10583,7 +10418,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15203,7 +13308,7 @@
+@@ -15209,7 +13308,7 @@
fi
@@ -10592,7 +10427,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -15242,12 +13347,12 @@
+@@ -15248,12 +13347,12 @@
striplib=
old_striplib=
@@ -10607,7 +10442,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -15256,15 +13361,15 @@
+@@ -15262,15 +13361,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -10626,7 +10461,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -15282,12 +13387,12 @@
+@@ -15288,12 +13387,12 @@
# Report which library types will actually be built
@@ -10642,7 +10477,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -15308,14 +13413,14 @@
+@@ -15314,14 +13413,14 @@
fi
;;
esac
@@ -10660,7 +10495,7 @@
$as_echo "$enable_static" >&6; }
-@@ -15456,7 +13561,7 @@
+@@ -15462,7 +13561,7 @@
# Check whether --with-gnu-ld was given.
@@ -10669,7 +10504,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -15465,7 +13570,7 @@
+@@ -15471,7 +13570,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -10678,7 +10513,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -15495,13 +13600,13 @@
+@@ -15501,13 +13600,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -10695,7 +10530,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -15532,18 +13637,16 @@
+@@ -15538,18 +13637,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -10719,7 +10554,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -15556,7 +13659,7 @@
+@@ -15562,7 +13659,7 @@
;;
esac
fi
@@ -10728,7 +10563,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -15611,7 +13714,7 @@
+@@ -15617,7 +13714,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -10737,7 +10572,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -15712,11 +13815,7 @@
+@@ -15718,11 +13815,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -10750,7 +10585,7 @@
/* end confdefs.h. */
int
-@@ -15727,27 +13826,7 @@
+@@ -15733,27 +13826,7 @@
return 0;
}
_ACEOF
@@ -10779,7 +10614,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15761,16 +13840,9 @@
+@@ -15767,16 +13840,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
@@ -10798,7 +10633,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15784,11 +13856,7 @@
+@@ -15790,11 +13856,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10811,7 +10646,7 @@
/* end confdefs.h. */
int
-@@ -15799,27 +13867,7 @@
+@@ -15805,27 +13867,7 @@
return 0;
}
_ACEOF
@@ -10840,7 +10675,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15833,16 +13881,9 @@
+@@ -15839,16 +13881,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
@@ -10859,7 +10694,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16586,7 +14627,7 @@
+@@ -16592,7 +14627,7 @@
;;
esac
@@ -10868,7 +10703,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -16614,11 +14655,11 @@
+@@ -16620,11 +14655,11 @@
};
_LT_EOF
@@ -10883,7 +10718,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -16799,7 +14840,7 @@
+@@ -16805,7 +14840,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -10892,7 +10727,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -17019,7 +15060,7 @@
+@@ -17025,7 +15060,7 @@
;;
esac
;;
@@ -10901,7 +10736,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17116,7 +15157,7 @@
+@@ -17122,7 +15157,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -10910,7 +10745,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -17125,9 +15166,9 @@
+@@ -17131,9 +15166,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -10922,21 +10757,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -17143,11 +15184,11 @@
+@@ -17149,11 +15184,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17146: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17152: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15187: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17150: \$? = $ac_status" >&5
+- echo "$as_me:17156: \$? = $ac_status" >&5
+ echo "$as_me:15191: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
-@@ -17160,7 +15201,7 @@
+@@ -17166,7 +15201,7 @@
$RM conftest*
fi
@@ -10945,7 +10780,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -17181,9 +15222,9 @@
+@@ -17187,9 +15222,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -10957,7 +10792,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -17209,7 +15250,7 @@
+@@ -17215,7 +15250,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10966,7 +10801,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -17221,9 +15262,9 @@
+@@ -17227,9 +15262,9 @@
@@ -10978,21 +10813,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17242,11 +15283,11 @@
+@@ -17248,11 +15283,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17245: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17251: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17249: \$? = $ac_status" >&5
+- echo "$as_me:17255: \$? = $ac_status" >&5
+ echo "$as_me:15290: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17268,14 +15309,14 @@
+@@ -17274,14 +15309,14 @@
$RM conftest*
fi
@@ -11010,21 +10845,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17294,11 +15335,11 @@
+@@ -17300,11 +15335,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
-- (eval echo "\"\$as_me:17297: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17303: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15338: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17301: \$? = $ac_status" >&5
+- echo "$as_me:17307: \$? = $ac_status" >&5
+ echo "$as_me:15342: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
-@@ -17320,7 +15361,7 @@
+@@ -17326,7 +15361,7 @@
$RM conftest*
fi
@@ -11033,7 +10868,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -17329,7 +15370,7 @@
+@@ -17335,7 +15370,7 @@
hard_links="nottested"
if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
# do not overwrite the value of need_locks provided by the user
@@ -11042,7 +10877,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -17337,10 +15378,10 @@
+@@ -17343,10 +15378,10 @@
touch conftest.a
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
@@ -11055,7 +10890,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -17350,7 +15391,7 @@
+@@ -17356,7 +15391,7 @@
@@ -11064,7 +10899,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -17370,13 +15411,16 @@
+@@ -17376,13 +15411,16 @@
cygwin* | mingw* | cegcc*)
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -11082,7 +10917,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -17404,16 +15448,16 @@
+@@ -17410,16 +15448,16 @@
# Test whether the compiler implicitly links with -lc since on some
# systems, -lgcc has to come before -lc. If gcc already passes -lc
# to ld, don't add -lc before -lgcc.
@@ -11103,7 +10938,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -17427,11 +15471,11 @@
+@@ -17433,11 +15471,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -11118,7 +10953,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -17442,7 +15486,7 @@
+@@ -17448,7 +15486,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11127,7 +10962,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -17513,7 +15557,7 @@
+@@ -17519,7 +15557,7 @@
@@ -11136,7 +10971,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -17878,61 +15922,29 @@
+@@ -17884,61 +15922,29 @@
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -11218,7 +11053,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -17941,13 +15953,10 @@
+@@ -17947,13 +15953,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -11233,7 +11068,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17959,6 +15968,18 @@
+@@ -17965,6 +15968,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11252,7 +11087,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18147,7 +16168,7 @@
+@@ -18153,7 +16168,7 @@
dynamic_linker=no
;;
esac
@@ -11261,7 +11096,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -18198,7 +16219,7 @@
+@@ -18204,7 +16219,7 @@
@@ -11270,7 +11105,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -18223,7 +16244,7 @@
+@@ -18229,7 +16244,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -11279,7 +11114,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -18282,7 +16303,7 @@
+@@ -18288,7 +16303,7 @@
: ${CONFIG_LT=./config.lt}
@@ -11288,7 +11123,7 @@
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
cat >"$CONFIG_LT" <<_LTEOF
#! $SHELL
-@@ -18294,13 +16315,13 @@
+@@ -18300,13 +16315,13 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11306,7 +11141,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -18308,23 +16329,15 @@
+@@ -18314,23 +16329,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -11335,7 +11170,7 @@
as_nl='
'
export as_nl
-@@ -18332,7 +16345,13 @@
+@@ -18338,7 +16345,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
@@ -11350,7 +11185,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -18343,7 +16362,7 @@
+@@ -18349,7 +16362,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -11359,7 +11194,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -18366,13 +16385,6 @@
+@@ -18372,13 +16385,6 @@
}
fi
@@ -11373,7 +11208,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -18382,15 +16394,15 @@
+@@ -18388,15 +16394,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -11392,7 +11227,7 @@
IFS=$as_save_IFS
;;
-@@ -18402,12 +16414,16 @@
+@@ -18408,12 +16414,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -11413,7 +11248,7 @@
done
PS1='$ '
PS2='> '
-@@ -18419,7 +16435,90 @@
+@@ -18425,7 +16435,90 @@
LANGUAGE=C
export LANGUAGE
@@ -11505,7 +11340,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -18433,8 +16532,12 @@
+@@ -18439,8 +16532,12 @@
as_basename=false
fi
@@ -11519,7 +11354,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -18454,77 +16557,25 @@
+@@ -18460,77 +16557,25 @@
}
s/.*/./; q'`
@@ -11608,7 +11443,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -18553,8 +16604,56 @@
+@@ -18559,8 +16604,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -11666,7 +11501,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -18573,10 +16672,10 @@
+@@ -18579,10 +16672,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -11679,16 +11514,16 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -18616,7 +16715,7 @@
+@@ -18622,7 +16715,7 @@
lt_cl_version="\
- totem config.lt 2.28.0
+ totem config.lt 2.28.1
-configured by $0, generated by GNU Autoconf 2.63.
+configured by $0, generated by GNU Autoconf 2.64.
Copyright (C) 2008 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
-@@ -18634,17 +16733,11 @@
+@@ -18640,17 +16733,11 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -11711,7 +11546,7 @@
esac
shift
done
-@@ -19009,7 +17102,7 @@
+@@ -19015,7 +17102,7 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11720,7 +11555,7 @@
$as_echo "$as_me: creating $ofile" >&6;}
-@@ -19813,7 +17906,7 @@
+@@ -19819,7 +17906,7 @@
_LT_EOF
@@ -11729,7 +11564,7 @@
_LTEOF
chmod +x "$CONFIG_LT"
-@@ -19828,7 +17921,7 @@
+@@ -19834,7 +17921,7 @@
exec 5>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
exec 5>>config.log
@@ -11738,7 +11573,7 @@
fi
-@@ -19838,9 +17931,9 @@
+@@ -19844,9 +17931,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -11750,7 +11585,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -19853,14 +17946,14 @@
+@@ -19859,14 +17946,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11768,7 +11603,7 @@
IFS=$as_save_IFS
;;
-@@ -19868,10 +17961,10 @@
+@@ -19874,10 +17961,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11781,7 +11616,7 @@
$as_echo "no" >&6; }
fi
-@@ -19881,9 +17974,9 @@
+@@ -19887,9 +17974,9 @@
ac_pt_PKG_CONFIG=$PKG_CONFIG
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
@@ -11793,7 +11628,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -19896,14 +17989,14 @@
+@@ -19902,14 +17989,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11811,7 +11646,7 @@
IFS=$as_save_IFS
;;
-@@ -19911,10 +18004,10 @@
+@@ -19917,10 +18004,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11824,7 +11659,7 @@
$as_echo "no" >&6; }
fi
-@@ -19923,7 +18016,7 @@
+@@ -19929,7 +18016,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11833,7 +11668,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -19936,13 +18029,13 @@
+@@ -19942,13 +18029,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11850,7 +11685,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -19951,9 +18044,9 @@
+@@ -19957,9 +18044,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -11862,7 +11697,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -19966,14 +18059,14 @@
+@@ -19972,14 +18059,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11880,7 +11715,7 @@
IFS=$as_save_IFS
;;
-@@ -19981,19 +18074,19 @@
+@@ -19987,19 +18074,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11904,7 +11739,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -20006,14 +18099,14 @@
+@@ -20012,14 +18099,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11922,7 +11757,7 @@
IFS=$as_save_IFS
;;
-@@ -20021,10 +18114,10 @@
+@@ -20027,10 +18114,10 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -11935,7 +11770,7 @@
$as_echo "no" >&6; }
fi
-@@ -20046,7 +18139,7 @@
+@@ -20052,7 +18139,7 @@
# The full list of plugins
@@ -11944,7 +11779,7 @@
PLUGINDIR='${libdir}/totem/plugins'
-@@ -20057,10 +18150,10 @@
+@@ -20063,10 +18150,10 @@
HAVE_GSTREAMER=no
@@ -11957,7 +11792,7 @@
enableval=$enable_easy_codec_installation;
case "${enableval}" in
yes) enable_easy_codec_installation=yes ;;
-@@ -20075,46 +18168,50 @@
+@@ -20081,46 +18168,50 @@
fi
@@ -12028,7 +11863,7 @@
fi
-@@ -20127,25 +18224,14 @@
+@@ -20133,25 +18224,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12057,7 +11892,7 @@
$MISSING_PLUGINS_PKG_ERRORS
-@@ -20155,22 +18241,11 @@
+@@ -20161,22 +18241,11 @@
Alternatively, you may set the environment variables MISSING_PLUGINS_CFLAGS
and MISSING_PLUGINS_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12083,7 +11918,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20179,19 +18254,16 @@
+@@ -20185,19 +18254,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12106,7 +11941,7 @@
fi
-@@ -20200,40 +18272,44 @@
+@@ -20206,40 +18272,44 @@
MM="gstreamer-0.10 >= $GST_REQS gstreamer-base-0.10 >= $GST_REQS gstreamer-plugins-base-0.10 >= $GSTPLUG_REQS gstreamer-tag-0.10 >= $GSTPLUG_REQS gconf-2.0"
pkg_failed=no
@@ -12170,7 +12005,7 @@
fi
-@@ -20246,25 +18322,14 @@
+@@ -20252,25 +18322,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12199,7 +12034,7 @@
$GST_PKG_ERRORS
-@@ -20274,22 +18339,11 @@
+@@ -20280,22 +18339,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.
@@ -12225,7 +12060,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20298,12 +18352,11 @@
+@@ -20304,12 +18352,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12240,7 +12075,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20314,94 +18367,79 @@
+@@ -20320,94 +18367,79 @@
gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
@@ -12357,7 +12192,7 @@
$as_echo "no" >&6; }
fi
-@@ -20422,11 +18460,11 @@
+@@ -20428,11 +18460,11 @@
GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
SMCLIENT_PKGS=
@@ -12371,7 +12206,7 @@
withval=$with_smclient;
else
case "$GDK_TARGET" in
-@@ -20436,46 +18474,50 @@
+@@ -20442,46 +18474,50 @@
esac
fi
@@ -12442,7 +12277,7 @@
fi
-@@ -20488,25 +18530,14 @@
+@@ -20494,25 +18530,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12471,7 +12306,7 @@
$SMCLIENT_PKG_ERRORS
-@@ -20516,22 +18547,11 @@
+@@ -20522,22 +18547,11 @@
Alternatively, you may set the environment variables SMCLIENT_CFLAGS
and SMCLIENT_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12497,7 +12332,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20540,19 +18560,16 @@
+@@ -20546,19 +18560,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12520,7 +12355,7 @@
fi
-@@ -20592,21 +18609,22 @@
+@@ -20598,21 +18609,22 @@
pkg_failed=no
@@ -12550,7 +12385,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20616,8 +18634,8 @@
+@@ -20622,8 +18634,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12561,7 +12396,7 @@
pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20629,21 +18647,23 @@
+@@ -20635,21 +18647,23 @@
else
pkg_failed=yes
fi
@@ -12593,7 +12428,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20653,8 +18673,8 @@
+@@ -20659,8 +18673,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12604,7 +12439,7 @@
pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20666,8 +18686,9 @@
+@@ -20672,8 +18686,9 @@
else
pkg_failed=yes
fi
@@ -12616,7 +12451,7 @@
fi
-@@ -20680,46 +18701,28 @@
+@@ -20686,46 +18701,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12668,7 +12503,7 @@
glib-2.0 >= $GLIB_REQS
gio-2.0
gtk+-2.0 >= $GTK_REQS
-@@ -20736,22 +18739,11 @@
+@@ -20742,22 +18739,11 @@
Alternatively, you may set the environment variables DEPENDENCY_CFLAGS
and DEPENDENCY_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12694,7 +12529,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20760,52 +18752,55 @@
+@@ -20766,52 +18752,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12772,7 +12607,7 @@
fi
-@@ -20818,25 +18813,14 @@
+@@ -20824,25 +18813,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12801,7 +12636,7 @@
$MM_PKG_ERRORS
-@@ -20846,22 +18830,11 @@
+@@ -20852,22 +18830,11 @@
Alternatively, you may set the environment variables MM_CFLAGS
and MM_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12827,7 +12662,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20870,52 +18843,55 @@
+@@ -20876,52 +18843,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12905,7 +12740,7 @@
fi
-@@ -20928,25 +18904,14 @@
+@@ -20934,25 +18904,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12934,7 +12769,7 @@
$GTK_PKG_ERRORS
-@@ -20956,22 +18921,11 @@
+@@ -20962,22 +18921,11 @@
Alternatively, you may set the environment variables GTK_CFLAGS
and GTK_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12960,7 +12795,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20980,12 +18934,11 @@
+@@ -20986,12 +18934,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12975,7 +12810,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20995,54 +18948,58 @@
+@@ -21001,54 +18948,58 @@
if test -n "$PKG_CONFIG" && \
@@ -13057,7 +12892,7 @@
fi
-@@ -21055,25 +19012,14 @@
+@@ -21061,25 +19012,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13086,7 +12921,7 @@
$UNIQUE_PKG_ERRORS
-@@ -21083,22 +19029,11 @@
+@@ -21089,22 +19029,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.
@@ -13112,7 +12947,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -21107,24 +19042,23 @@
+@@ -21113,24 +19042,23 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13141,7 +12976,7 @@
withval=$with_x;
fi
-@@ -21134,10 +19068,8 @@
+@@ -21140,10 +19068,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13154,7 +12989,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -21185,21 +19117,25 @@
+@@ -21191,21 +19117,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13180,7 +13015,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -21221,37 +19157,14 @@
+@@ -21227,37 +19157,14 @@
if test "$ac_x_includes" = no; then
# Guess where to find include files, by looking for Xlib.h.
# First, try using that file with no special directory specified.
@@ -13220,7 +13055,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -21259,7 +19172,6 @@
+@@ -21265,7 +19172,6 @@
fi
done
fi
@@ -13228,7 +13063,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -21269,11 +19181,7 @@
+@@ -21275,11 +19181,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13241,7 +13076,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -21284,35 +19192,12 @@
+@@ -21290,35 +19192,12 @@
return 0;
}
_ACEOF
@@ -13279,7 +13114,7 @@
for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
do
# Don't even attempt the hair of trying to link an X program!
-@@ -21324,10 +19209,8 @@
+@@ -21330,10 +19209,8 @@
done
done
fi
@@ -13292,7 +13127,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -21348,7 +19231,7 @@
+@@ -21354,7 +19231,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -13301,7 +13136,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -21359,7 +19242,7 @@
+@@ -21365,7 +19242,7 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -13310,7 +13145,7 @@
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
-@@ -21377,18 +19260,14 @@
+@@ -21383,18 +19260,14 @@
XTEST_LIBS=""
enable_xtest=no
@@ -13332,7 +13167,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21406,49 +19285,22 @@
+@@ -21412,49 +19285,22 @@
return 0;
}
_ACEOF
@@ -13389,7 +13224,7 @@
fi
-@@ -21456,40 +19308,44 @@
+@@ -21462,40 +19308,44 @@
pkg_failed=no
@@ -13453,7 +13288,7 @@
fi
-@@ -21502,14 +19358,14 @@
+@@ -21508,14 +19358,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13471,7 +13306,7 @@
$as_echo "no" >&6; }
have_xvidmode=no
elif test $pkg_failed = untried; then
-@@ -21517,16 +19373,14 @@
+@@ -21523,16 +19373,14 @@
else
XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS
XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS
@@ -13490,7 +13325,7 @@
fi
-@@ -21536,7 +19390,8 @@
+@@ -21542,7 +19390,8 @@
have_xfree=no
@@ -13500,7 +13335,7 @@
#include <X11/XF86keysym.h>
int main(int argc,char **argv) {
-@@ -21544,43 +19399,18 @@
+@@ -21550,43 +19399,18 @@
}
_ACEOF
@@ -13548,7 +13383,7 @@
fi
fi
-@@ -21594,26 +19424,24 @@
+@@ -21600,26 +19424,24 @@
@@ -13580,7 +13415,7 @@
$as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}
fi
fi
-@@ -21625,7 +19453,7 @@
+@@ -21631,7 +19453,7 @@
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
@@ -13589,7 +13424,7 @@
$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
-@@ -21640,22 +19468,19 @@
+@@ -21646,22 +19468,19 @@
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13617,7 +13452,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -21674,13 +19499,12 @@
+@@ -21680,13 +19499,12 @@
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13633,7 +13468,7 @@
$as_echo "$am_cv_pathless_PYTHON" >&6; }
# Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON.
if test "$am_cv_pathless_PYTHON" = none; then
-@@ -21688,9 +19512,9 @@
+@@ -21694,9 +19512,9 @@
else
# Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args.
set dummy $am_cv_pathless_PYTHON; ac_word=$2
@@ -13645,7 +13480,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -21703,14 +19527,14 @@
+@@ -21709,14 +19527,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13663,7 +13498,7 @@
IFS=$as_save_IFS
;;
-@@ -21718,10 +19542,10 @@
+@@ -21724,10 +19542,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -13676,7 +13511,7 @@
$as_echo "no" >&6; }
fi
-@@ -21736,14 +19560,14 @@
+@@ -21742,14 +19560,14 @@
else
@@ -13694,7 +13529,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -21755,23 +19579,23 @@
+@@ -21761,23 +19579,23 @@
@@ -13723,7 +13558,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -21790,7 +19614,7 @@
+@@ -21796,7 +19614,7 @@
esac
fi
@@ -13732,7 +13567,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -21799,9 +19623,9 @@
+@@ -21805,9 +19623,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -13744,7 +13579,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -21820,7 +19644,7 @@
+@@ -21826,7 +19644,7 @@
esac
fi
@@ -13753,7 +13588,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -21863,52 +19687,56 @@
+@@ -21869,52 +19687,56 @@
pkg_failed=no
@@ -13831,7 +13666,7 @@
fi
-@@ -21921,30 +19749,28 @@
+@@ -21927,30 +19749,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13870,7 +13705,7 @@
$as_echo "$as_me: WARNING: Disabling python support" >&2;}
fi
-@@ -21952,21 +19778,19 @@
+@@ -21958,21 +19778,19 @@
have_python=no
if test "x$enable_python" = "xyes"; then
@@ -13896,7 +13731,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -21976,22 +19800,22 @@
+@@ -21982,22 +19800,22 @@
fi
if test "x$have_python" != "xno"; then
@@ -13925,7 +13760,7 @@
$as_echo "$PYGTK_H2DEF" >&6; }
-@@ -22002,13 +19826,9 @@
+@@ -22008,13 +19826,9 @@
FLAGS="-fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $FLAGS"
@@ -13941,7 +13776,7 @@
/* end confdefs.h. */
int
-@@ -22019,35 +19839,14 @@
+@@ -22025,35 +19839,14 @@
return 0;
}
_ACEOF
@@ -13980,7 +13815,7 @@
$as_echo "$compiler_has_option" >&6; }
if test $compiler_has_option = yes; then
NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-@@ -22058,9 +19857,7 @@
+@@ -22064,9 +19857,7 @@
if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
enable_python=yes
@@ -13991,7 +13826,7 @@
fi
-@@ -22073,54 +19870,58 @@
+@@ -22079,54 +19870,58 @@
fi
@@ -14072,7 +13907,7 @@
fi
-@@ -22133,14 +19934,14 @@
+@@ -22139,14 +19934,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14090,7 +13925,7 @@
$as_echo "no" >&6; }
with_vala=no
elif test $pkg_failed = untried; then
-@@ -22148,7 +19949,7 @@
+@@ -22154,7 +19949,7 @@
else
VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
VALA_LIBS=$pkg_cv_VALA_LIBS
@@ -14099,7 +13934,7 @@
$as_echo "yes" >&6; }
with_vala=yes
fi
-@@ -22156,9 +19957,7 @@
+@@ -22162,9 +19957,7 @@
VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
elif test "x$enable_vala" = "xyes"; then
@@ -14110,7 +13945,7 @@
fi
fi
if test "x$with_vala" = "xyes"; then
-@@ -22177,18 +19976,16 @@
+@@ -22183,18 +19976,16 @@
plugin_error_or_ignore()
{
if test "${error_on_bad_plugin}" = "1" ; then
@@ -14132,7 +13967,7 @@
withval=$with_plugins;
else
with_plugins=autodetect
-@@ -22235,40 +20032,44 @@
+@@ -22241,40 +20032,44 @@
screensaver)
pkg_failed=no
@@ -14196,7 +14031,7 @@
fi
-@@ -22281,25 +20082,14 @@
+@@ -22287,25 +20082,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14225,7 +14060,7 @@
$SCREENSAVER_PKG_ERRORS
-@@ -22309,22 +20099,11 @@
+@@ -22315,22 +20099,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.
@@ -14253,7 +14088,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22333,12 +20112,11 @@
+@@ -22339,12 +20112,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14268,7 +14103,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22346,40 +20124,44 @@
+@@ -22352,40 +20124,44 @@
galago)
pkg_failed=no
@@ -14332,7 +14167,7 @@
fi
-@@ -22392,14 +20174,14 @@
+@@ -22398,14 +20174,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14350,7 +14185,7 @@
$as_echo "no" >&6; }
HAVE_LIBGALAGO=no
elif test $pkg_failed = untried; then
-@@ -22407,7 +20189,7 @@
+@@ -22413,7 +20189,7 @@
else
LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS
LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS
@@ -14359,7 +14194,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGALAGO=yes
fi
-@@ -22425,40 +20207,44 @@
+@@ -22431,40 +20207,44 @@
media-player-keys)
pkg_failed=no
@@ -14423,7 +14258,7 @@
fi
-@@ -22471,14 +20257,14 @@
+@@ -22477,14 +20257,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14441,7 +14276,7 @@
$as_echo "no" >&6; }
HAVE_MEDIA_PLAYER_KEYS=no
elif test $pkg_failed = untried; then
-@@ -22486,7 +20272,7 @@
+@@ -22492,7 +20272,7 @@
else
MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS
MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS
@@ -14450,7 +14285,7 @@
$as_echo "yes" >&6; }
HAVE_MEDIA_PLAYER_KEYS=yes
fi
-@@ -22496,18 +20282,14 @@
+@@ -22502,18 +20282,14 @@
fi
;;
lirc)
@@ -14472,7 +14307,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -22525,176 +20307,20 @@
+@@ -22531,176 +20307,20 @@
return 0;
}
_ACEOF
@@ -14657,7 +14492,7 @@
LIRC_LIBS="-llirc_client"
HAVE_LIRC=yes
else
-@@ -22715,40 +20341,44 @@
+@@ -22721,40 +20341,44 @@
mythtv)
pkg_failed=no
@@ -14721,7 +14556,7 @@
fi
-@@ -22761,14 +20391,14 @@
+@@ -22767,14 +20391,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14739,7 +14574,7 @@
$as_echo "no" >&6; }
HAVE_GMYTH=no
elif test $pkg_failed = untried; then
-@@ -22776,7 +20406,7 @@
+@@ -22782,7 +20406,7 @@
else
GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
@@ -14748,7 +14583,7 @@
$as_echo "yes" >&6; }
HAVE_GMYTH=yes
fi
-@@ -22785,43 +20415,141 @@
+@@ -22791,43 +20415,141 @@
add_plugin="0"
fi
;;
@@ -14909,7 +14744,7 @@
fi
-@@ -22834,14 +20562,14 @@
+@@ -22840,14 +20562,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14927,7 +14762,7 @@
$as_echo "no" >&6; }
HAVE_BLUEZ=no
elif test $pkg_failed = untried; then
-@@ -22849,7 +20577,7 @@
+@@ -22855,7 +20577,7 @@
else
BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS
BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS
@@ -14936,7 +14771,7 @@
$as_echo "yes" >&6; }
HAVE_BLUEZ=yes
fi
-@@ -22861,40 +20589,44 @@
+@@ -22867,40 +20589,44 @@
publish)
pkg_failed=no
@@ -15000,7 +14835,7 @@
fi
-@@ -22907,14 +20639,14 @@
+@@ -22913,14 +20639,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15018,7 +14853,7 @@
$as_echo "no" >&6; }
HAVE_LIBEPC=no
elif test $pkg_failed = untried; then
-@@ -22922,7 +20654,7 @@
+@@ -22928,7 +20654,7 @@
else
LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
@@ -15027,7 +14862,7 @@
$as_echo "yes" >&6; }
HAVE_LIBEPC=yes
fi
-@@ -22934,40 +20666,44 @@
+@@ -22940,40 +20666,44 @@
tracker)
pkg_failed=no
@@ -15091,7 +14926,7 @@
fi
-@@ -22980,14 +20716,14 @@
+@@ -22986,14 +20716,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15109,7 +14944,7 @@
$as_echo "no" >&6; }
HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -22995,7 +20731,7 @@
+@@ -23001,7 +20731,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -15118,7 +14953,7 @@
$as_echo "yes" >&6; }
HAVE_TRACKER=yes
fi
-@@ -23013,40 +20749,44 @@
+@@ -23019,40 +20749,44 @@
thumbnail)
pkg_failed=no
@@ -15182,7 +15017,7 @@
fi
-@@ -23059,14 +20799,14 @@
+@@ -23065,14 +20799,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15200,7 +15035,7 @@
$as_echo "no" >&6; }
HAVE_GLIB_2_15=no
elif test $pkg_failed = untried; then
-@@ -23074,7 +20814,7 @@
+@@ -23080,7 +20814,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -15209,7 +15044,7 @@
$as_echo "yes" >&6; }
HAVE_GLIB_2_15=yes
fi
-@@ -23086,40 +20826,44 @@
+@@ -23092,40 +20826,44 @@
brasero-disc-recorder)
pkg_failed=no
@@ -15273,7 +15108,7 @@
fi
-@@ -23132,14 +20876,14 @@
+@@ -23138,14 +20876,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15291,7 +15126,7 @@
$as_echo "no" >&6; }
BUILD_RECORDER=no
elif test $pkg_failed = untried; then
-@@ -23147,7 +20891,7 @@
+@@ -23153,7 +20891,7 @@
else
DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
@@ -15300,7 +15135,7 @@
$as_echo "yes" >&6; }
BUILD_RECORDER=yes
fi
-@@ -23159,40 +20903,44 @@
+@@ -23165,40 +20903,44 @@
youtube)
pkg_failed=no
@@ -15364,7 +15199,7 @@
fi
-@@ -23205,14 +20953,14 @@
+@@ -23211,14 +20953,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15382,7 +15217,7 @@
$as_echo "no" >&6; }
HAVE_LIBGDATA=no
elif test $pkg_failed = untried; then
-@@ -23220,7 +20968,7 @@
+@@ -23226,7 +20968,7 @@
else
LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
@@ -15391,7 +15226,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGDATA=yes
fi
-@@ -23229,23 +20977,18 @@
+@@ -23235,23 +20977,18 @@
add_plugin="0"
fi
@@ -15420,7 +15255,7 @@
fi
;;
esac
-@@ -23259,9 +21002,9 @@
+@@ -23265,9 +21002,9 @@
ALL_PLUGINS=$allowed_plugins
PLUGINS=$used_plugins2
@@ -15432,7 +15267,7 @@
$as_echo "$PLUGINS" >&6; }
-@@ -23271,24 +21014,22 @@
+@@ -23277,24 +21014,22 @@
# Browser plugins
# ***************
@@ -15461,7 +15296,7 @@
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23296,24 +21037,25 @@
+@@ -23302,24 +21037,25 @@
pkg_failed=no
@@ -15496,7 +15331,7 @@
pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
gio-2.0
x11
-@@ -23321,24 +21063,26 @@
+@@ -23327,24 +21063,26 @@
else
pkg_failed=yes
fi
@@ -15533,7 +15368,7 @@
pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
gio-2.0
x11
-@@ -23346,8 +21090,9 @@
+@@ -23352,8 +21090,9 @@
else
pkg_failed=yes
fi
@@ -15545,7 +15380,7 @@
fi
-@@ -23360,20 +21105,20 @@
+@@ -23366,20 +21105,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15571,7 +15406,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23381,7 +21126,7 @@
+@@ -23387,7 +21126,7 @@
else
BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
@@ -15580,7 +15415,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23391,58 +21136,58 @@
+@@ -23397,58 +21136,58 @@
# Earlier versions misdetect playlists
if test -n "$PKG_CONFIG" && \
@@ -15667,7 +15502,7 @@
fi
-@@ -23455,14 +21200,14 @@
+@@ -23461,14 +21200,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15685,7 +15520,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23470,7 +21215,7 @@
+@@ -23476,7 +21215,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15694,7 +15529,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23478,9 +21223,9 @@
+@@ -23484,9 +21223,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
@@ -15706,7 +15541,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BIND in
-@@ -23494,14 +21239,14 @@
+@@ -23500,14 +21239,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15724,7 +15559,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23510,16 +21255,16 @@
+@@ -23516,16 +21255,16 @@
fi
DBUS_BIND=$ac_cv_path_DBUS_BIND
if test -n "$DBUS_BIND"; then
@@ -15744,7 +15579,7 @@
$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
enable_browser_plugins=no
fi
-@@ -23535,13 +21280,9 @@
+@@ -23541,13 +21280,9 @@
__SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-fno-rtti $CXXFLAGS"
@@ -15760,7 +15595,7 @@
/* end confdefs.h. */
int
-@@ -23552,34 +21293,13 @@
+@@ -23558,34 +21293,13 @@
return 0;
}
_ACEOF
@@ -15798,7 +15633,7 @@
$as_echo "$have_no_rtti_flag" >&6; }
CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23608,64 +21328,64 @@
+@@ -23614,64 +21328,64 @@
if test "$enable_browser_plugins" = "yes"; then
@@ -15878,7 +15713,7 @@
$as_echo "$enable_cone_plugin" >&6; }
fi
-@@ -23713,13 +21433,11 @@
+@@ -23719,13 +21433,11 @@
# Check whether --enable-nautilus was given.
@@ -15894,7 +15729,7 @@
esac
else
ENABLE_NAUTILUS=yes
-@@ -23728,40 +21446,44 @@
+@@ -23734,40 +21446,44 @@
if test x$ENABLE_NAUTILUS = "xyes" ; then
pkg_failed=no
@@ -15958,7 +15793,7 @@
fi
-@@ -23774,14 +21496,14 @@
+@@ -23780,14 +21496,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15976,7 +15811,7 @@
$as_echo "no" >&6; }
HAVE_NAUTILUS=no
elif test $pkg_failed = untried; then
-@@ -23789,7 +21511,7 @@
+@@ -23795,7 +21511,7 @@
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -15985,7 +15820,7 @@
$as_echo "yes" >&6; }
HAVE_NAUTILUS=yes
fi
-@@ -23800,9 +21522,7 @@
+@@ -23806,9 +21522,7 @@
if test x$HAVE_NAUTILUS = "xyes"; then
@@ -15996,7 +15831,7 @@
NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
-@@ -23818,7 +21538,7 @@
+@@ -23824,7 +21538,7 @@
# Check whether --with-dbus was given.
@@ -16005,7 +15840,7 @@
withval=$with_dbus;
else
with_dbus=auto
-@@ -23827,40 +21547,44 @@
+@@ -23833,40 +21547,44 @@
if test "x$with_dbus" != "xno"; then
pkg_failed=no
@@ -16069,7 +15904,7 @@
fi
-@@ -23873,14 +21597,14 @@
+@@ -23879,14 +21597,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16087,7 +15922,7 @@
$as_echo "no" >&6; }
enable_dbus=no
elif test $pkg_failed = untried; then
-@@ -23888,20 +21612,16 @@
+@@ -23894,20 +21612,16 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -16111,7 +15946,7 @@
fi
fi
-@@ -23916,9 +21636,9 @@
+@@ -23922,9 +21636,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -16123,7 +15958,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -23931,14 +21651,14 @@
+@@ -23937,14 +21651,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16141,7 +15976,7 @@
IFS=$as_save_IFS
;;
-@@ -23946,10 +21666,10 @@
+@@ -23952,10 +21666,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -16154,7 +15989,7 @@
$as_echo "no" >&6; }
fi
-@@ -23963,13 +21683,13 @@
+@@ -23969,13 +21683,13 @@
# Check whether --with-gconf-source was given.
@@ -16170,7 +16005,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -23978,22 +21698,20 @@
+@@ -23984,22 +21698,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -16197,7 +16032,7 @@
esac
fi
-@@ -24019,7 +21737,7 @@
+@@ -24025,7 +21737,7 @@
# Check whether --enable-debug was given.
@@ -16206,7 +16041,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -24028,16 +21746,14 @@
+@@ -24034,16 +21746,14 @@
if test x$enable_debug = xyes ; then
@@ -16225,7 +16060,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -24068,13 +21784,9 @@
+@@ -24074,13 +21784,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16241,7 +16076,7 @@
/* end confdefs.h. */
int
-@@ -24085,35 +21797,14 @@
+@@ -24091,35 +21797,14 @@
return 0;
}
_ACEOF
@@ -16280,7 +16115,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -24127,26 +21818,24 @@
+@@ -24133,26 +21818,24 @@
fi
;;
*)
@@ -16312,7 +16147,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
-@@ -24161,7 +21850,7 @@
+@@ -24167,7 +21850,7 @@
esac
fi
fi
@@ -16321,7 +16156,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24169,14 +21858,14 @@
+@@ -24175,14 +21858,14 @@
# Check whether --enable-cxx-warnings was given.
@@ -16338,7 +16173,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -24196,18 +21885,18 @@
+@@ -24202,18 +21885,18 @@
fi
fi
fi
@@ -16360,7 +16195,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
-@@ -24223,23 +21912,23 @@
+@@ -24229,23 +21912,23 @@
esac
fi
fi
@@ -16388,7 +16223,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -24265,7 +21954,7 @@
+@@ -24271,7 +21954,7 @@
# Check whether --with-html-dir was given.
@@ -16397,7 +16232,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -24275,7 +21964,7 @@
+@@ -24281,7 +21964,7 @@
# Check whether --enable-gtk-doc was given.
@@ -16406,7 +16241,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -24284,31 +21973,29 @@
+@@ -24290,31 +21973,29 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -16446,7 +16281,7 @@
$as_echo_n "(cached) " >&6
else
case $GTKDOC_CHECK in
-@@ -24321,14 +22008,14 @@
+@@ -24327,14 +22008,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16464,7 +16299,7 @@
IFS=$as_save_IFS
;;
-@@ -24336,10 +22023,10 @@
+@@ -24342,10 +22023,10 @@
fi
GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
if test -n "$GTKDOC_CHECK"; then
@@ -16477,7 +16312,7 @@
$as_echo "no" >&6; }
fi
-@@ -24382,22 +22069,18 @@
+@@ -24388,22 +22069,18 @@
# Check whether --enable-run-in-source-tree was given.
@@ -16503,7 +16338,7 @@
fi
-@@ -24416,7 +22099,7 @@
+@@ -24422,7 +22099,7 @@
@@ -16512,7 +16347,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -24445,13 +22128,13 @@
+@@ -24451,13 +22128,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16528,7 +16363,7 @@
esac ;;
esac
done
-@@ -24459,8 +22142,8 @@
+@@ -24465,8 +22142,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16539,7 +16374,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24483,11 +22166,11 @@
+@@ -24489,11 +22166,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" &&
@@ -16553,7 +16388,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -24507,8 +22190,8 @@
+@@ -24513,8 +22190,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.
@@ -16564,7 +16399,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -24524,192 +22207,118 @@
+@@ -24530,192 +22207,118 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -16810,7 +16645,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -24719,17 +22328,18 @@
+@@ -24725,17 +22328,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16836,7 +16671,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -24737,23 +22347,15 @@
+@@ -24743,23 +22347,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16865,7 +16700,7 @@
as_nl='
'
export as_nl
-@@ -24761,7 +22363,13 @@
+@@ -24767,7 +22363,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
@@ -16880,7 +16715,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -24772,7 +22380,7 @@
+@@ -24778,7 +22380,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16889,7 +16724,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24795,13 +22403,6 @@
+@@ -24801,13 +22403,6 @@
}
fi
@@ -16903,7 +16738,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -24811,15 +22412,15 @@
+@@ -24817,15 +22412,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16922,7 +16757,7 @@
IFS=$as_save_IFS
;;
-@@ -24831,12 +22432,16 @@
+@@ -24837,12 +22432,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -16943,7 +16778,7 @@
done
PS1='$ '
PS2='> '
-@@ -24848,7 +22453,89 @@
+@@ -24854,7 +22453,89 @@
LANGUAGE=C
export LANGUAGE
@@ -17034,7 +16869,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -24862,8 +22549,12 @@
+@@ -24868,8 +22549,12 @@
as_basename=false
fi
@@ -17048,7 +16883,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -24883,76 +22574,25 @@
+@@ -24889,76 +22574,25 @@
}
s/.*/./; q'`
@@ -17136,7 +16971,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -24981,8 +22621,56 @@
+@@ -24987,8 +22621,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17194,7 +17029,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -25001,10 +22689,10 @@
+@@ -25007,10 +22689,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17207,7 +17042,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -25019,13 +22707,19 @@
+@@ -25025,13 +22707,19 @@
exec 6>&1
@@ -17223,13 +17058,13 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
- This file was extended by totem $as_me 2.28.0, which was
+ This file was extended by totem $as_me 2.28.1, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25057,10 +22751,11 @@
+@@ -25063,10 +22751,11 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17244,7 +17079,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -25082,16 +22777,16 @@
+@@ -25088,16 +22777,16 @@
Configuration commands:
$config_commands
@@ -17254,7 +17089,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
- totem config.status 2.28.0
+ totem config.status 2.28.1
-configured by $0, generated by GNU Autoconf 2.63,
+configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -17264,7 +17099,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25134,20 +22829,19 @@
+@@ -25140,20 +22829,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17289,7 +17124,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25155,11 +22849,10 @@
+@@ -25161,11 +22849,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -17304,7 +17139,7 @@
ac_need_defaults=false ;;
esac
-@@ -25572,6 +23265,7 @@
+@@ -25578,6 +23265,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" ;;
@@ -17312,7 +17147,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" ;;
-@@ -25620,9 +23314,7 @@
+@@ -25626,9 +23314,7 @@
"docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17323,7 +17158,7 @@
esac
done
-@@ -25649,7 +23341,7 @@
+@@ -25655,7 +23341,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17332,7 +17167,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -25660,11 +23352,7 @@
+@@ -25666,11 +23352,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17345,7 +17180,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25672,10 +23360,16 @@
+@@ -25678,10 +23360,16 @@
if test -n "$CONFIG_FILES"; then
@@ -17364,7 +17199,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25689,24 +23383,18 @@
+@@ -25695,24 +23383,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17392,7 +17227,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25795,9 +23483,7 @@
+@@ -25801,9 +23483,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17403,7 +17238,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25838,9 +23524,7 @@
+@@ -25844,9 +23524,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17414,7 +17249,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25925,9 +23609,7 @@
+@@ -25931,9 +23609,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17425,7 +17260,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -25940,9 +23622,7 @@
+@@ -25946,9 +23622,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17436,7 +17271,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25970,12 +23650,10 @@
+@@ -25976,12 +23650,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17451,7 +17286,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -25986,7 +23664,7 @@
+@@ -25992,7 +23664,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17460,7 +17295,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -25999,9 +23677,7 @@
+@@ -26005,9 +23677,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17471,7 +17306,7 @@
esac
;;
esac
-@@ -26029,47 +23705,7 @@
+@@ -26035,47 +23705,7 @@
q
}
s/.*/./; q'`
@@ -17520,7 +17355,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -26126,7 +23762,6 @@
+@@ -26132,7 +23762,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=
@@ -17528,7 +17363,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -26136,12 +23771,11 @@
+@@ -26142,12 +23771,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17543,7 +17378,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
-@@ -26151,7 +23785,7 @@
+@@ -26157,7 +23785,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17552,7 +17387,7 @@
esac
_ACEOF
-@@ -26180,14 +23814,12 @@
+@@ -26186,14 +23814,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -17569,7 +17404,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;}
-@@ -26197,9 +23829,7 @@
+@@ -26203,9 +23829,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17580,7 +17415,7 @@
;;
:H)
#
-@@ -26210,25 +23840,19 @@
+@@ -26216,25 +23840,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17610,7 +17445,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26266,7 +23890,7 @@
+@@ -26272,7 +23890,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17619,7 +17454,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -26361,47 +23985,7 @@
+@@ -26367,47 +23985,7 @@
q
}
s/.*/./; q'`
@@ -17668,7 +17503,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -27215,9 +24799,7 @@
+@@ -27221,9 +24799,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17679,7 +17514,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -27240,15 +24822,12 @@
+@@ -27246,15 +24822,12 @@
done # for ac_tag
@@ -17697,7 +17532,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27269,37 +24848,37 @@
+@@ -27275,37 +24848,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.
@@ -17745,7 +17580,7 @@
$as_echo "$as_me: Vala binding support disabled" >&6;}
fi
if test "x${PLUGINS}" != "x" ; then
-@@ -27307,112 +24886,112 @@
+@@ -27313,112 +24886,112 @@
for plugin in ${PLUGINS}; do
case ${allowed_plugin} in
${plugin})
@@ -17888,9 +17723,9 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5
$as_echo "$as_me: End options" >&6;}
-diff -Naur totem-2.28.0.old/data/icons/16x16/Makefile.in totem-2.28.0/data/icons/16x16/Makefile.in
---- totem-2.28.0.old/data/icons/16x16/Makefile.in 2009-09-21 13:52:13.000000000 +0200
-+++ totem-2.28.0/data/icons/16x16/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/16x16/Makefile.in totem-2.28.1/data/icons/16x16/Makefile.in
+--- totem-2.28.1.old/data/icons/16x16/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/16x16/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17908,9 +17743,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/22x22/Makefile.in totem-2.28.0/data/icons/22x22/Makefile.in
---- totem-2.28.0.old/data/icons/22x22/Makefile.in 2009-09-21 13:52:13.000000000 +0200
-+++ totem-2.28.0/data/icons/22x22/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/22x22/Makefile.in totem-2.28.1/data/icons/22x22/Makefile.in
+--- totem-2.28.1.old/data/icons/22x22/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/22x22/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17928,9 +17763,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/24x24/Makefile.in totem-2.28.0/data/icons/24x24/Makefile.in
---- totem-2.28.0.old/data/icons/24x24/Makefile.in 2009-09-21 13:52:13.000000000 +0200
-+++ totem-2.28.0/data/icons/24x24/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/24x24/Makefile.in totem-2.28.1/data/icons/24x24/Makefile.in
+--- totem-2.28.1.old/data/icons/24x24/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/24x24/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17948,9 +17783,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/32x32/Makefile.in totem-2.28.0/data/icons/32x32/Makefile.in
---- totem-2.28.0.old/data/icons/32x32/Makefile.in 2009-09-21 13:52:13.000000000 +0200
-+++ totem-2.28.0/data/icons/32x32/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/32x32/Makefile.in totem-2.28.1/data/icons/32x32/Makefile.in
+--- totem-2.28.1.old/data/icons/32x32/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/32x32/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17968,9 +17803,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/48x48/Makefile.in totem-2.28.0/data/icons/48x48/Makefile.in
---- totem-2.28.0.old/data/icons/48x48/Makefile.in 2009-09-21 13:52:14.000000000 +0200
-+++ totem-2.28.0/data/icons/48x48/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/48x48/Makefile.in totem-2.28.1/data/icons/48x48/Makefile.in
+--- totem-2.28.1.old/data/icons/48x48/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/48x48/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17988,9 +17823,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/Makefile.in totem-2.28.0/data/icons/Makefile.in
---- totem-2.28.0.old/data/icons/Makefile.in 2009-09-21 13:52:14.000000000 +0200
-+++ totem-2.28.0/data/icons/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/Makefile.in totem-2.28.1/data/icons/Makefile.in
+--- totem-2.28.1.old/data/icons/Makefile.in 2009-09-29 13:39:58.000000000 +0200
++++ totem-2.28.1/data/icons/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18008,9 +17843,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/icons/scalable/Makefile.in totem-2.28.0/data/icons/scalable/Makefile.in
---- totem-2.28.0.old/data/icons/scalable/Makefile.in 2009-09-21 13:52:14.000000000 +0200
-+++ totem-2.28.0/data/icons/scalable/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/icons/scalable/Makefile.in totem-2.28.1/data/icons/scalable/Makefile.in
+--- totem-2.28.1.old/data/icons/scalable/Makefile.in 2009-09-29 13:39:59.000000000 +0200
++++ totem-2.28.1/data/icons/scalable/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18028,9 +17863,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/data/Makefile.in totem-2.28.0/data/Makefile.in
---- totem-2.28.0.old/data/Makefile.in 2009-09-21 13:52:13.000000000 +0200
-+++ totem-2.28.0/data/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/data/Makefile.in totem-2.28.1/data/Makefile.in
+--- totem-2.28.1.old/data/Makefile.in 2009-09-29 13:39:57.000000000 +0200
++++ totem-2.28.1/data/Makefile.in 2009-09-29 17:18:07.000000000 +0200
@@ -141,6 +141,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18048,9 +17883,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/docs/Makefile.in totem-2.28.0/docs/Makefile.in
---- totem-2.28.0.old/docs/Makefile.in 2009-09-21 13:52:14.000000000 +0200
-+++ totem-2.28.0/docs/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/docs/Makefile.in totem-2.28.1/docs/Makefile.in
+--- totem-2.28.1.old/docs/Makefile.in 2009-09-29 13:39:59.000000000 +0200
++++ totem-2.28.1/docs/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18068,9 +17903,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/docs/reference/Makefile.in totem-2.28.0/docs/reference/Makefile.in
---- totem-2.28.0.old/docs/reference/Makefile.in 2009-09-21 13:52:15.000000000 +0200
-+++ totem-2.28.0/docs/reference/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/docs/reference/Makefile.in totem-2.28.1/docs/reference/Makefile.in
+--- totem-2.28.1.old/docs/reference/Makefile.in 2009-09-29 13:39:59.000000000 +0200
++++ totem-2.28.1/docs/reference/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -76,6 +76,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18088,341 +17923,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/gnome-doc-utils.make totem-2.28.0/gnome-doc-utils.make
---- totem-2.28.0.old/gnome-doc-utils.make 2009-09-21 13:52:00.000000000 +0200
-+++ totem-2.28.0/gnome-doc-utils.make 2009-09-21 17:05:02.000000000 +0200
-@@ -92,6 +92,14 @@
- ## The name of the document being built
- DOC_MODULE ?=
-
-+## @ DOC_ID
-+## The unique identifier for a Mallard document
-+DOC_ID ?=
-+
-+## @ DOC_PAGES
-+## Page files in a Mallard document
-+DOC_PAGES ?=
-+
- ## @ DOC_ENTITIES
- ## Files included with a SYSTEM entity
- DOC_ENTITIES ?=
-@@ -123,9 +131,11 @@
- ## Variables for Bootstrapping
-
- _xml2po ?= `which xml2po`
-+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
-
- _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
- _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
- _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
- _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
- _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -205,6 +215,10 @@
- ## The top-level documentation file in the C locale
- _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-
-+## @ _DOC_C_PAGES
-+## Page files in a Mallard document in the C locale
-+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
-+
- ## @ _DOC_C_ENTITIES
- ## Files included with a SYSTEM entity in the C locale
- _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
-@@ -217,13 +231,14 @@
- ## All documentation files in the C locale
- _DOC_C_DOCS = \
- $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
-- $(_DOC_C_MODULE)
-+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
-
- ## @ _DOC_C_DOCS_NOENT
- ## All documentation files in the C locale,
- ## except files included with a SYSTEM entity
- _DOC_C_DOCS_NOENT = \
-- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
-+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
-+ $(_DOC_C_PAGES)
-
- ## @ _DOC_C_FIGURES
- ## All figures and other external data in the C locale
-@@ -245,7 +260,7 @@
-
- ## @ _DOC_POFILES
- ## The .po files used for translating the document
--_DOC_POFILES = $(if $(DOC_MODULE), \
-+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
- .PHONY: po
-@@ -256,6 +271,12 @@
- _DOC_LC_MODULES = $(if $(DOC_MODULE), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-+## @ _DOC_LC_PAGES
-+## Page files in a Mallard document in all other locales
-+_DOC_LC_PAGES = \
-+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
-+ $(lc)/$(notdir $(page)) ))
-+
- ## @ _DOC_LC_XINCLUDES
- ## Files included with XInclude in all other locales
- _DOC_LC_INCLUDES = \
-@@ -272,7 +293,7 @@
- ## @ _DOC_LC_DOCS
- ## All documentation files in all other locales
- _DOC_LC_DOCS = \
-- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
-+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
- ## @ _DOC_LC_FIGURES
-@@ -299,16 +320,16 @@
- done; \
- if ! test -f $@; then \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
- else \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs); \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
- # FIXME: fix the dependancy
-@@ -317,9 +338,10 @@
- $(_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; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -p \
-- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
-+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
- "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
-
-@@ -329,7 +351,7 @@
- .PHONY: pot
- pot: $(_DOC_POT)
- $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-- $(_xml2po) -e -o $@ $^
-+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
-
- ################################################################################
-@@ -347,6 +369,7 @@
-
-
- ################################################################################
-+## All
-
- all: \
- $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
-@@ -354,6 +377,9 @@
- $(_DOC_HTML_ALL) $(_DOC_POFILES)
-
-
-+################################################################################
-+## Clean
-+
- .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
- clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-@@ -385,7 +411,7 @@
- _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
- _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
- _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
--_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
-+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-
- clean-local: \
- $(_clean_omf) $(_clean_dsk) \
-@@ -401,10 +427,14 @@
- $(_clean_lc) $(_clean_dir)
-
-
--.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
--doc-dist-hook: \
-- $(if $(DOC_MODULE),dist-doc-docs) \
-- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
-+
-+################################################################################
-+## Dist
-+
-+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-+doc-dist-hook: \
-+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
-+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
- $(if $(_DOC_OMF_IN),dist-doc-omf)
- # $(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-@@ -451,9 +481,14 @@
- $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-
-+
-+################################################################################
-+## Check
-+
- .PHONY: check-doc-docs check-doc-omf
- check: \
- $(if $(DOC_MODULE),check-doc-docs) \
-+ $(if $(DOC_ID),check-doc-pages) \
- $(if $(_DOC_OMF_IN),check-doc-omf)
-
- check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -469,6 +504,21 @@
- xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
- done
-
-+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-+ for lc in C $(_DOC_REAL_LINGUAS); do \
-+ if test -f "$$lc"; \
-+ then d=; \
-+ xmlpath="$$lc"; \
-+ else \
-+ d="$(srcdir)/"; \
-+ xmlpath="$$lc:$(srcdir)/$$lc"; \
-+ fi; \
-+ for page in $(DOC_PAGES); do \
-+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-+ done; \
-+ done
-+
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
-@@ -476,9 +526,16 @@
- done
-
-
-+
-+################################################################################
-+## Install
-+
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-+
-+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
-+
- install-data-local: \
-- $(if $(DOC_MODULE),install-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
- $(if $(_DOC_HTML_ALL),install-doc-html) \
- $(if $(_DOC_C_FIGURES),install-doc-figs) \
- $(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -486,19 +543,19 @@
-
- install-doc-docs:
- @for lc in C $(_DOC_REAL_LINGUAS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
- if ! test -d "$$docdir"; then \
- echo "$(mkinstalldirs) $$docdir"; \
- $(mkinstalldirs) "$$docdir"; \
- fi; \
-- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
-+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
- done
-
- install-doc-figs:
-@@ -513,7 +570,7 @@
- figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
- if ! test -d "$$figdir"; then \
- echo "$(mkinstalldirs) $$figdir"; \
- $(mkinstalldirs) "$$figdir"; \
-@@ -533,23 +590,27 @@
- echo install-html
-
- install-doc-omf:
-- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
-+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
-+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
- done
- @if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- fi;
-
- install-doc-dsk:
- echo install-dsk
-
-
-+
-+################################################################################
-+## Uninstall
-+
- .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
- uninstall-local: \
-- $(if $(DOC_MODULE),uninstall-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
- $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
- $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
- $(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -557,22 +618,22 @@
-
- uninstall-doc-docs:
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- done
-
- uninstall-doc-figs:
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- done;
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- fi; \
-- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- done
-diff -Naur totem-2.28.0.old/help/bg/Makefile.in totem-2.28.0/help/bg/Makefile.in
---- totem-2.28.0.old/help/bg/Makefile.in 2009-09-21 13:52:15.000000000 +0200
-+++ totem-2.28.0/help/bg/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/help/bg/Makefile.in totem-2.28.1/help/bg/Makefile.in
+--- totem-2.28.1.old/help/bg/Makefile.in 2009-09-29 13:40:00.000000000 +0200
++++ totem-2.28.1/help/bg/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18440,9 +17943,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/help/Makefile.in totem-2.28.0/help/Makefile.in
---- totem-2.28.0.old/help/Makefile.in 2009-09-21 13:52:15.000000000 +0200
-+++ totem-2.28.0/help/Makefile.in 2009-09-21 17:05:09.000000000 +0200
+diff -Naur totem-2.28.1.old/help/Makefile.in totem-2.28.1/help/Makefile.in
+--- totem-2.28.1.old/help/Makefile.in 2009-09-29 13:39:59.000000000 +0200
++++ totem-2.28.1/help/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18460,305 +17963,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-@@ -363,6 +366,7 @@
- $(DOC_LINGUAS))
-
- _DOC_ABS_SRCDIR = @abs_srcdir@
-+_xml2po_mode = $(if $(DOC_ID),mallard,docbook)
- @ENABLE_SK_TRUE at _ENABLE_SK = true
-
- ################################################################################
-@@ -396,14 +400,16 @@
-
- ################################################################################
- _DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
-+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page))
- _DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
- _DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
- _DOC_C_DOCS = \
- $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
-- $(_DOC_C_MODULE)
-+ $(_DOC_C_PAGES) $(_DOC_C_MODULE)
-
- _DOC_C_DOCS_NOENT = \
-- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
-+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
-+ $(_DOC_C_PAGES)
-
- _DOC_C_FIGURES = $(if $(DOC_FIGURES), \
- $(foreach fig,$(DOC_FIGURES),C/$(fig)), \
-@@ -419,12 +425,16 @@
-
-
- ###############################################################################
--_DOC_POFILES = $(if $(DOC_MODULE), \
-+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po))
-
- _DOC_LC_MODULES = $(if $(DOC_MODULE), \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml))
-
-+_DOC_LC_PAGES = \
-+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \
-+ $(lc)/$(notdir $(page)) ))
-+
- _DOC_LC_INCLUDES = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
- $(lc)/$(notdir $(inc)) ))
-@@ -436,7 +446,7 @@
- $(lc)/$(notdir $(doc)) ))
-
- _DOC_LC_DOCS = \
-- $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
-+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \
- $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
-
- _DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
-@@ -456,7 +466,8 @@
- _clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
- _clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
- _clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
--_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
-+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir)
-+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE))
- DOC_MODULE = totem
- DOC_ENTITIES = legal.xml
- DOC_H_FILE = totem-docs.h
-@@ -886,6 +897,10 @@
-
- DOC_MODULE ?=
-
-+DOC_ID ?=
-+
-+DOC_PAGES ?=
-+
- DOC_ENTITIES ?=
-
- DOC_INCLUDES ?=
-@@ -902,6 +917,7 @@
-
- _db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
- _db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-+_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
- _chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
- _credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
- _ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-@@ -946,16 +962,16 @@
- done; \
- if ! test -f $@; then \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e $$docs > $(notdir $@).tmp && \
-+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \
- else \
- echo "(cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs)"; \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -u $(notdir $@) $$docs); \
-+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \
- fi
-
- # FIXME: fix the dependancy
-@@ -964,15 +980,16 @@
- $(_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; \
- (cd $(dir $@) && \
-- $(_xml2po) -e -p \
-- "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
-+ $(_xml2po) -m $(_xml2po_mode) -e -p "$${po}" \
- "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
- cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
- .PHONY: pot
- pot: $(_DOC_POT)
- $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
-- $(_xml2po) -e -o $@ $^
-+ $(_xml2po) -m $(_xml2po_mode) -e -o $@ $^
-
- $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
- xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
-@@ -984,6 +1001,8 @@
- $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
- $(_DOC_HTML_ALL) $(_DOC_POFILES)
-
-+################################################################################
-+
- .PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-
- clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
-@@ -1025,10 +1044,12 @@
- $(_clean_omf) $(_clean_dsk) \
- $(_clean_lc) $(_clean_dir)
-
--.PHONY: dist-doc-docs dist-doc-figs dist-doc-omf dist-doc-dsk
--doc-dist-hook: \
-- $(if $(DOC_MODULE),dist-doc-docs) \
-- $(if $(_DOC_C_FIGURES),dist-doc-figs) \
-+################################################################################
-+
-+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk
-+doc-dist-hook: \
-+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \
-+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \
- $(if $(_DOC_OMF_IN),dist-doc-omf)
- # $(if $(_DOC_DSK_IN),dist-doc-dsk)
-
-@@ -1074,9 +1095,12 @@
- echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \
- $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))"
-
-+################################################################################
-+
- .PHONY: check-doc-docs check-doc-omf
- check: \
- $(if $(DOC_MODULE),check-doc-docs) \
-+ $(if $(DOC_ID),check-doc-pages) \
- $(if $(_DOC_OMF_IN),check-doc-omf)
-
- check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
-@@ -1092,15 +1116,33 @@
- xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \
- done
-
-+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES)
-+ for lc in C $(_DOC_REAL_LINGUAS); do \
-+ if test -f "$$lc"; \
-+ then d=; \
-+ xmlpath="$$lc"; \
-+ else \
-+ d="$(srcdir)/"; \
-+ xmlpath="$$lc:$(srcdir)/$$lc"; \
-+ fi; \
-+ for page in $(DOC_PAGES); do \
-+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --relaxng $(_malrng) $$d$$lc/$$page"; \
-+ xmllint --noout --noent --path "$$xmlpath" --xinclude --relaxng "$(_malrng)" "$$d$$lc/$$page"; \
-+ done; \
-+ done
-+
- check-doc-omf: $(_DOC_OMF_ALL)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \
- xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \
- done
-
-+################################################################################
-+
- .PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk
-+
- install-data-local: \
-- $(if $(DOC_MODULE),install-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \
- $(if $(_DOC_HTML_ALL),install-doc-html) \
- $(if $(_DOC_C_FIGURES),install-doc-figs) \
- $(if $(_DOC_OMF_IN),install-doc-omf)
-@@ -1108,19 +1150,19 @@
-
- install-doc-docs:
- @for lc in C $(_DOC_REAL_LINGUAS); do \
-- echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc"; \
-- $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$lc; \
-+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \
-+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \
- done
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
- if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \
- docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- docdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$docdir"; \
-+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \
- if ! test -d "$$docdir"; then \
- echo "$(mkinstalldirs) $$docdir"; \
- $(mkinstalldirs) "$$docdir"; \
- fi; \
-- echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc; \
-+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \
- done
-
- install-doc-figs:
-@@ -1135,7 +1177,7 @@
- figsymlink=true; \
- fi; \
- figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \
-- figdir="$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$figdir"; \
-+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \
- if ! test -d "$$figdir"; then \
- echo "$(mkinstalldirs) $$figdir"; \
- $(mkinstalldirs) "$$figdir"; \
-@@ -1155,22 +1197,24 @@
- echo install-html
-
- install-doc-omf:
-- $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)
-+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
-- echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf; \
-+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \
- done
- @if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-- scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)"; \
-+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
-+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \
- fi;
-
- install-doc-dsk:
- echo install-dsk
-
-+################################################################################
-+
- .PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk
- uninstall-local: \
-- $(if $(DOC_MODULE),uninstall-doc-docs) \
-+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \
- $(if $(_DOC_HTML_ALL),uninstall-doc-html) \
- $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \
- $(if $(_DOC_OMF_IN),uninstall-doc-omf)
-@@ -1178,24 +1222,24 @@
-
- uninstall-doc-docs:
- @list='$(_DOC_C_DOCS) $(_DOC_LC_DOCS)'; for doc in $$list; do \
-- echo " rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$doc"; \
-+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \
- done
-
- uninstall-doc-figs:
- @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \
-- echo "rm -f $(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-- rm -f "$(DESTDIR)$(HELP_DIR)/$(DOC_MODULE)/$$fig"; \
-+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
-+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \
- done;
-
- uninstall-doc-omf:
- @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \
- if test "x$(_ENABLE_SK)" = "xtrue"; then \
-- echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- fi; \
-- echo "rm -f $(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-- rm -f "$(DESTDIR)$(OMF_DIR)/$(DOC_MODULE)/$$omf"; \
-+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
-+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \
- done
- dist-hook: doc-dist-hook
-
-diff -Naur totem-2.28.0.old/lib/Makefile.in totem-2.28.0/lib/Makefile.in
---- totem-2.28.0.old/lib/Makefile.in 2009-09-21 13:52:16.000000000 +0200
-+++ totem-2.28.0/lib/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/lib/Makefile.in totem-2.28.1/lib/Makefile.in
+--- totem-2.28.1.old/lib/Makefile.in 2009-09-29 13:40:00.000000000 +0200
++++ totem-2.28.1/lib/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -104,6 +104,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18776,9 +17983,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/ltmain.sh totem-2.28.0/ltmain.sh
---- totem-2.28.0.old/ltmain.sh 2009-09-21 13:51:58.000000000 +0200
-+++ totem-2.28.0/ltmain.sh 2009-09-21 17:05:01.000000000 +0200
+diff -Naur totem-2.28.1.old/ltmain.sh totem-2.28.1/ltmain.sh
+--- totem-2.28.1.old/ltmain.sh 2009-09-29 13:39:45.000000000 +0200
++++ totem-2.28.1/ltmain.sh 2009-09-29 17:17:58.000000000 +0200
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -18857,9 +18064,9 @@
esac
;;
no)
-diff -Naur totem-2.28.0.old/Makefile.in totem-2.28.0/Makefile.in
---- totem-2.28.0.old/Makefile.in 2009-09-21 13:52:24.000000000 +0200
-+++ totem-2.28.0/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/Makefile.in totem-2.28.1/Makefile.in
+--- totem-2.28.1.old/Makefile.in 2009-09-29 13:40:09.000000000 +0200
++++ totem-2.28.1/Makefile.in 2009-09-29 17:18:12.000000000 +0200
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18877,9 +18084,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/po/Makefile.in.in totem-2.28.0/po/Makefile.in.in
---- totem-2.28.0.old/po/Makefile.in.in 2009-09-21 13:52:00.000000000 +0200
-+++ totem-2.28.0/po/Makefile.in.in 2009-09-21 17:05:02.000000000 +0200
+diff -Naur totem-2.28.1.old/po/Makefile.in.in totem-2.28.1/po/Makefile.in.in
+--- totem-2.28.1.old/po/Makefile.in.in 2009-09-29 13:39:46.000000000 +0200
++++ totem-2.28.1/po/Makefile.in.in 2009-09-29 17:17:59.000000000 +0200
@@ -129,7 +129,7 @@
done
@@ -18889,9 +18096,9 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
-diff -Naur totem-2.28.0.old/src/backend/Makefile.in totem-2.28.0/src/backend/Makefile.in
---- totem-2.28.0.old/src/backend/Makefile.in 2009-09-21 13:52:17.000000000 +0200
-+++ totem-2.28.0/src/backend/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/backend/Makefile.in totem-2.28.1/src/backend/Makefile.in
+--- totem-2.28.1.old/src/backend/Makefile.in 2009-09-29 13:40:01.000000000 +0200
++++ totem-2.28.1/src/backend/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -121,6 +121,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18909,9 +18116,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/Makefile.in totem-2.28.0/src/Makefile.in
---- totem-2.28.0.old/src/Makefile.in 2009-09-21 13:52:17.000000000 +0200
-+++ totem-2.28.0/src/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/Makefile.in totem-2.28.1/src/Makefile.in
+--- totem-2.28.1.old/src/Makefile.in 2009-09-29 13:40:01.000000000 +0200
++++ totem-2.28.1/src/Makefile.in 2009-09-29 17:18:08.000000000 +0200
@@ -343,6 +343,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18929,9 +18136,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/bbc/Makefile.in totem-2.28.0/src/plugins/bbc/Makefile.in
---- totem-2.28.0.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ totem-2.28.0/src/plugins/bbc/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/bbc/Makefile.in totem-2.28.1/src/plugins/bbc/Makefile.in
+--- totem-2.28.1.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ totem-2.28.1/src/plugins/bbc/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -0,0 +1,594 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
@@ -19527,9 +18734,9 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -Naur totem-2.28.0.old/src/plugins/bemused/Makefile.in totem-2.28.0/src/plugins/bemused/Makefile.in
---- totem-2.28.0.old/src/plugins/bemused/Makefile.in 2009-09-21 13:52:18.000000000 +0200
-+++ totem-2.28.0/src/plugins/bemused/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/bemused/Makefile.in totem-2.28.1/src/plugins/bemused/Makefile.in
+--- totem-2.28.1.old/src/plugins/bemused/Makefile.in 2009-09-29 13:40:01.000000000 +0200
++++ totem-2.28.1/src/plugins/bemused/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19547,9 +18754,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.28.0/src/plugins/brasero-disc-recorder/Makefile.in
---- totem-2.28.0.old/src/plugins/brasero-disc-recorder/Makefile.in 2009-09-21 13:52:18.000000000 +0200
-+++ totem-2.28.0/src/plugins/brasero-disc-recorder/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.28.1/src/plugins/brasero-disc-recorder/Makefile.in
+--- totem-2.28.1.old/src/plugins/brasero-disc-recorder/Makefile.in 2009-09-29 13:40:02.000000000 +0200
++++ totem-2.28.1/src/plugins/brasero-disc-recorder/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -128,6 +128,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19567,9 +18774,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/coherence_upnp/Makefile.in totem-2.28.0/src/plugins/coherence_upnp/Makefile.in
---- totem-2.28.0.old/src/plugins/coherence_upnp/Makefile.in 2009-09-21 13:52:18.000000000 +0200
-+++ totem-2.28.0/src/plugins/coherence_upnp/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/coherence_upnp/Makefile.in totem-2.28.1/src/plugins/coherence_upnp/Makefile.in
+--- totem-2.28.1.old/src/plugins/coherence_upnp/Makefile.in 2009-09-29 13:40:02.000000000 +0200
++++ totem-2.28.1/src/plugins/coherence_upnp/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19587,9 +18794,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/dbus-service/Makefile.in totem-2.28.0/src/plugins/dbus-service/Makefile.in
---- totem-2.28.0.old/src/plugins/dbus-service/Makefile.in 2009-09-21 13:52:18.000000000 +0200
-+++ totem-2.28.0/src/plugins/dbus-service/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/dbus-service/Makefile.in totem-2.28.1/src/plugins/dbus-service/Makefile.in
+--- totem-2.28.1.old/src/plugins/dbus-service/Makefile.in 2009-09-29 13:40:02.000000000 +0200
++++ totem-2.28.1/src/plugins/dbus-service/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19607,9 +18814,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/galago/Makefile.in totem-2.28.0/src/plugins/galago/Makefile.in
---- totem-2.28.0.old/src/plugins/galago/Makefile.in 2009-09-21 13:52:19.000000000 +0200
-+++ totem-2.28.0/src/plugins/galago/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/galago/Makefile.in totem-2.28.1/src/plugins/galago/Makefile.in
+--- totem-2.28.1.old/src/plugins/galago/Makefile.in 2009-09-29 13:40:02.000000000 +0200
++++ totem-2.28.1/src/plugins/galago/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19627,9 +18834,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/gromit/Makefile.in totem-2.28.0/src/plugins/gromit/Makefile.in
---- totem-2.28.0.old/src/plugins/gromit/Makefile.in 2009-09-21 13:52:19.000000000 +0200
-+++ totem-2.28.0/src/plugins/gromit/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/gromit/Makefile.in totem-2.28.1/src/plugins/gromit/Makefile.in
+--- totem-2.28.1.old/src/plugins/gromit/Makefile.in 2009-09-29 13:40:03.000000000 +0200
++++ totem-2.28.1/src/plugins/gromit/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19647,9 +18854,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/iplayer/Makefile.in totem-2.28.0/src/plugins/iplayer/Makefile.in
---- totem-2.28.0.old/src/plugins/iplayer/Makefile.in 2009-09-21 13:52:19.000000000 +0200
-+++ totem-2.28.0/src/plugins/iplayer/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/iplayer/Makefile.in totem-2.28.1/src/plugins/iplayer/Makefile.in
+--- totem-2.28.1.old/src/plugins/iplayer/Makefile.in 2009-09-29 13:40:03.000000000 +0200
++++ totem-2.28.1/src/plugins/iplayer/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19667,9 +18874,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/jamendo/Makefile.in totem-2.28.0/src/plugins/jamendo/Makefile.in
---- totem-2.28.0.old/src/plugins/jamendo/Makefile.in 2009-09-21 13:52:19.000000000 +0200
-+++ totem-2.28.0/src/plugins/jamendo/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/jamendo/Makefile.in totem-2.28.1/src/plugins/jamendo/Makefile.in
+--- totem-2.28.1.old/src/plugins/jamendo/Makefile.in 2009-09-29 13:40:03.000000000 +0200
++++ totem-2.28.1/src/plugins/jamendo/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19687,9 +18894,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/lirc/Makefile.in totem-2.28.0/src/plugins/lirc/Makefile.in
---- totem-2.28.0.old/src/plugins/lirc/Makefile.in 2009-09-21 13:52:19.000000000 +0200
-+++ totem-2.28.0/src/plugins/lirc/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/lirc/Makefile.in totem-2.28.1/src/plugins/lirc/Makefile.in
+--- totem-2.28.1.old/src/plugins/lirc/Makefile.in 2009-09-29 13:40:04.000000000 +0200
++++ totem-2.28.1/src/plugins/lirc/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19707,9 +18914,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/Makefile.in totem-2.28.0/src/plugins/Makefile.in
---- totem-2.28.0.old/src/plugins/Makefile.in 2009-09-21 13:52:17.000000000 +0200
-+++ totem-2.28.0/src/plugins/Makefile.in 2009-09-21 17:05:10.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/Makefile.in totem-2.28.1/src/plugins/Makefile.in
+--- totem-2.28.1.old/src/plugins/Makefile.in 2009-09-29 13:40:01.000000000 +0200
++++ totem-2.28.1/src/plugins/Makefile.in 2009-09-29 17:18:09.000000000 +0200
@@ -167,6 +167,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19727,9 +18934,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/media-player-keys/Makefile.in totem-2.28.0/src/plugins/media-player-keys/Makefile.in
---- totem-2.28.0.old/src/plugins/media-player-keys/Makefile.in 2009-09-21 13:52:20.000000000 +0200
-+++ totem-2.28.0/src/plugins/media-player-keys/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/media-player-keys/Makefile.in totem-2.28.1/src/plugins/media-player-keys/Makefile.in
+--- totem-2.28.1.old/src/plugins/media-player-keys/Makefile.in 2009-09-29 13:40:04.000000000 +0200
++++ totem-2.28.1/src/plugins/media-player-keys/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -130,6 +130,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19747,9 +18954,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/mythtv/Makefile.in totem-2.28.0/src/plugins/mythtv/Makefile.in
---- totem-2.28.0.old/src/plugins/mythtv/Makefile.in 2009-09-21 13:52:20.000000000 +0200
-+++ totem-2.28.0/src/plugins/mythtv/Makefile.in 2009-09-21 17:05:11.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/mythtv/Makefile.in totem-2.28.1/src/plugins/mythtv/Makefile.in
+--- totem-2.28.1.old/src/plugins/mythtv/Makefile.in 2009-09-29 13:40:04.000000000 +0200
++++ totem-2.28.1/src/plugins/mythtv/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19767,9 +18974,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/ontop/Makefile.in totem-2.28.0/src/plugins/ontop/Makefile.in
---- totem-2.28.0.old/src/plugins/ontop/Makefile.in 2009-09-21 13:52:20.000000000 +0200
-+++ totem-2.28.0/src/plugins/ontop/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/ontop/Makefile.in totem-2.28.1/src/plugins/ontop/Makefile.in
+--- totem-2.28.1.old/src/plugins/ontop/Makefile.in 2009-09-29 13:40:04.000000000 +0200
++++ totem-2.28.1/src/plugins/ontop/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19787,9 +18994,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/opensubtitles/Makefile.in totem-2.28.0/src/plugins/opensubtitles/Makefile.in
---- totem-2.28.0.old/src/plugins/opensubtitles/Makefile.in 2009-09-21 13:52:21.000000000 +0200
-+++ totem-2.28.0/src/plugins/opensubtitles/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/opensubtitles/Makefile.in totem-2.28.1/src/plugins/opensubtitles/Makefile.in
+--- totem-2.28.1.old/src/plugins/opensubtitles/Makefile.in 2009-09-29 13:40:05.000000000 +0200
++++ totem-2.28.1/src/plugins/opensubtitles/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19807,9 +19014,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/properties/Makefile.in totem-2.28.0/src/plugins/properties/Makefile.in
---- totem-2.28.0.old/src/plugins/properties/Makefile.in 2009-09-21 13:52:21.000000000 +0200
-+++ totem-2.28.0/src/plugins/properties/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/properties/Makefile.in totem-2.28.1/src/plugins/properties/Makefile.in
+--- totem-2.28.1.old/src/plugins/properties/Makefile.in 2009-09-29 13:40:05.000000000 +0200
++++ totem-2.28.1/src/plugins/properties/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -137,6 +137,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19827,9 +19034,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/publish/Makefile.in totem-2.28.0/src/plugins/publish/Makefile.in
---- totem-2.28.0.old/src/plugins/publish/Makefile.in 2009-09-21 13:52:21.000000000 +0200
-+++ totem-2.28.0/src/plugins/publish/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/publish/Makefile.in totem-2.28.1/src/plugins/publish/Makefile.in
+--- totem-2.28.1.old/src/plugins/publish/Makefile.in 2009-09-29 13:40:05.000000000 +0200
++++ totem-2.28.1/src/plugins/publish/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19847,9 +19054,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/pythonconsole/Makefile.in totem-2.28.0/src/plugins/pythonconsole/Makefile.in
---- totem-2.28.0.old/src/plugins/pythonconsole/Makefile.in 2009-09-21 13:52:21.000000000 +0200
-+++ totem-2.28.0/src/plugins/pythonconsole/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/pythonconsole/Makefile.in totem-2.28.1/src/plugins/pythonconsole/Makefile.in
+--- totem-2.28.1.old/src/plugins/pythonconsole/Makefile.in 2009-09-29 13:40:05.000000000 +0200
++++ totem-2.28.1/src/plugins/pythonconsole/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19867,9 +19074,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/sample-python/Makefile.in totem-2.28.0/src/plugins/sample-python/Makefile.in
---- totem-2.28.0.old/src/plugins/sample-python/Makefile.in 2009-09-21 13:52:22.000000000 +0200
-+++ totem-2.28.0/src/plugins/sample-python/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/sample-python/Makefile.in totem-2.28.1/src/plugins/sample-python/Makefile.in
+--- totem-2.28.1.old/src/plugins/sample-python/Makefile.in 2009-09-29 13:40:06.000000000 +0200
++++ totem-2.28.1/src/plugins/sample-python/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -67,6 +67,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19887,9 +19094,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/sample-vala/Makefile.in totem-2.28.0/src/plugins/sample-vala/Makefile.in
---- totem-2.28.0.old/src/plugins/sample-vala/Makefile.in 2009-09-21 13:52:22.000000000 +0200
-+++ totem-2.28.0/src/plugins/sample-vala/Makefile.in 2009-09-21 17:05:12.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/sample-vala/Makefile.in totem-2.28.1/src/plugins/sample-vala/Makefile.in
+--- totem-2.28.1.old/src/plugins/sample-vala/Makefile.in 2009-09-29 13:40:06.000000000 +0200
++++ totem-2.28.1/src/plugins/sample-vala/Makefile.in 2009-09-29 17:18:10.000000000 +0200
@@ -127,6 +127,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19907,9 +19114,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/screensaver/Makefile.in totem-2.28.0/src/plugins/screensaver/Makefile.in
---- totem-2.28.0.old/src/plugins/screensaver/Makefile.in 2009-09-21 13:52:22.000000000 +0200
-+++ totem-2.28.0/src/plugins/screensaver/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/screensaver/Makefile.in totem-2.28.1/src/plugins/screensaver/Makefile.in
+--- totem-2.28.1.old/src/plugins/screensaver/Makefile.in 2009-09-29 13:40:06.000000000 +0200
++++ totem-2.28.1/src/plugins/screensaver/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19927,9 +19134,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/screenshot/Makefile.in totem-2.28.0/src/plugins/screenshot/Makefile.in
---- totem-2.28.0.old/src/plugins/screenshot/Makefile.in 2009-09-21 13:52:23.000000000 +0200
-+++ totem-2.28.0/src/plugins/screenshot/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/screenshot/Makefile.in totem-2.28.1/src/plugins/screenshot/Makefile.in
+--- totem-2.28.1.old/src/plugins/screenshot/Makefile.in 2009-09-29 13:40:06.000000000 +0200
++++ totem-2.28.1/src/plugins/screenshot/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -131,6 +131,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19947,9 +19154,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/sidebar-test/Makefile.in totem-2.28.0/src/plugins/sidebar-test/Makefile.in
---- totem-2.28.0.old/src/plugins/sidebar-test/Makefile.in 2009-09-21 13:52:23.000000000 +0200
-+++ totem-2.28.0/src/plugins/sidebar-test/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/sidebar-test/Makefile.in totem-2.28.1/src/plugins/sidebar-test/Makefile.in
+--- totem-2.28.1.old/src/plugins/sidebar-test/Makefile.in 2009-09-29 13:40:07.000000000 +0200
++++ totem-2.28.1/src/plugins/sidebar-test/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19967,9 +19174,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/skipto/Makefile.in totem-2.28.0/src/plugins/skipto/Makefile.in
---- totem-2.28.0.old/src/plugins/skipto/Makefile.in 2009-09-21 13:52:23.000000000 +0200
-+++ totem-2.28.0/src/plugins/skipto/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/skipto/Makefile.in totem-2.28.1/src/plugins/skipto/Makefile.in
+--- totem-2.28.1.old/src/plugins/skipto/Makefile.in 2009-09-29 13:40:07.000000000 +0200
++++ totem-2.28.1/src/plugins/skipto/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19987,9 +19194,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/thumbnail/Makefile.in totem-2.28.0/src/plugins/thumbnail/Makefile.in
---- totem-2.28.0.old/src/plugins/thumbnail/Makefile.in 2009-09-21 13:52:23.000000000 +0200
-+++ totem-2.28.0/src/plugins/thumbnail/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/thumbnail/Makefile.in totem-2.28.1/src/plugins/thumbnail/Makefile.in
+--- totem-2.28.1.old/src/plugins/thumbnail/Makefile.in 2009-09-29 13:40:07.000000000 +0200
++++ totem-2.28.1/src/plugins/thumbnail/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20007,9 +19214,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/totem/Makefile.in totem-2.28.0/src/plugins/totem/Makefile.in
---- totem-2.28.0.old/src/plugins/totem/Makefile.in 2009-09-21 13:52:23.000000000 +0200
-+++ totem-2.28.0/src/plugins/totem/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/totem/Makefile.in totem-2.28.1/src/plugins/totem/Makefile.in
+--- totem-2.28.1.old/src/plugins/totem/Makefile.in 2009-09-29 13:40:08.000000000 +0200
++++ totem-2.28.1/src/plugins/totem/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20027,9 +19234,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/tracker/Makefile.in totem-2.28.0/src/plugins/tracker/Makefile.in
---- totem-2.28.0.old/src/plugins/tracker/Makefile.in 2009-09-21 13:52:24.000000000 +0200
-+++ totem-2.28.0/src/plugins/tracker/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/tracker/Makefile.in totem-2.28.1/src/plugins/tracker/Makefile.in
+--- totem-2.28.1.old/src/plugins/tracker/Makefile.in 2009-09-29 13:40:08.000000000 +0200
++++ totem-2.28.1/src/plugins/tracker/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20047,9 +19254,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.0.old/src/plugins/youtube/Makefile.in totem-2.28.0/src/plugins/youtube/Makefile.in
---- totem-2.28.0.old/src/plugins/youtube/Makefile.in 2009-09-21 13:52:24.000000000 +0200
-+++ totem-2.28.0/src/plugins/youtube/Makefile.in 2009-09-21 17:05:13.000000000 +0200
+diff -Naur totem-2.28.1.old/src/plugins/youtube/Makefile.in totem-2.28.1/src/plugins/youtube/Makefile.in
+--- totem-2.28.1.old/src/plugins/youtube/Makefile.in 2009-09-29 13:40:09.000000000 +0200
++++ totem-2.28.1/src/plugins/youtube/Makefile.in 2009-09-29 17:18:11.000000000 +0200
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
More information about the pkg-gnome-commits
mailing list