r22871 - in /desktop/experimental/totem/debian: changelog control control.in patches/90_autotools.patch rules totem-mozilla.links
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Wed Jan 27 08:59:17 UTC 2010
Author: slomo
Date: Wed Jan 27 08:59:17 2010
New Revision: 22871
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22871
Log:
* New upstream development release:
+ debian/patches/90_autotools.patch:
- Refreshed for the new version.
+ debian/control.in:
- Update build dependencies and dependencies.
- Drop tracker plugin, it needs tracker 0.7.
+ debian/totem-mozilla.links:
- Drop the complex plugin, it doesn't exist anymore.
Modified:
desktop/experimental/totem/debian/changelog
desktop/experimental/totem/debian/control
desktop/experimental/totem/debian/control.in
desktop/experimental/totem/debian/patches/90_autotools.patch
desktop/experimental/totem/debian/rules
desktop/experimental/totem/debian/totem-mozilla.links
Modified: desktop/experimental/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/changelog?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/changelog [utf-8] (original)
+++ desktop/experimental/totem/debian/changelog [utf-8] Wed Jan 27 08:59:17 2010
@@ -1,3 +1,16 @@
+totem (2.29.4-1) experimental; urgency=low
+
+ * New upstream development release:
+ + debian/patches/90_autotools.patch:
+ - Refreshed for the new version.
+ + debian/control.in:
+ - Update build dependencies and dependencies.
+ - Drop tracker plugin, it needs tracker 0.7.
+ + debian/totem-mozilla.links:
+ - Drop the complex plugin, it doesn't exist anymore.
+
+ -- Sebastian Dröge <slomo at debian.org> Wed, 27 Jan 2010 09:40:18 +0100
+
totem (2.28.5-1) unstable; urgency=low
* New upstream bugfix release.
Modified: desktop/experimental/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control [utf-8] (original)
+++ desktop/experimental/totem/debian/control [utf-8] Wed Jan 27 08:59:17 2010
@@ -13,20 +13,18 @@
quilt,
python-support (>= 0.6),
libepc-ui-dev (>= 0.3.0),
- libgtk2.0-dev (>= 2.16.0),
- libglib2.0-dev (>= 2.15),
+ libgtk2.0-dev (>= 2.19.1),
+ libglib2.0-dev (>= 2.22),
libunique-dev,
- libtotem-plparser-dev (>= 2.27.0),
- libtrackerclient-dev (>= 0.6),
- libtrackerclient-dev (<< 0.7),
+ libtotem-plparser-dev (>= 2.29.1),
liblircclient-dev (>= 0.6.6),
libirman-dev (>= 0.4.2),
gnome-pkg-tools (>= 0.10),
scrollkeeper,
- libgstreamer0.10-dev (>= 0.10.25),
- libgstreamer-plugins-base0.10-dev (>= 0.10.25),
- gstreamer0.10-tools (>= 0.10.25),
- gstreamer0.10-plugins-base (>= 0.10.25),
+ libgstreamer0.10-dev (>= 0.10.25.2),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.25.2),
+ gstreamer0.10-tools (>= 0.10.25.2),
+ gstreamer0.10-plugins-base (>= 0.10.25.2),
gstreamer0.10-plugins-good,
librsvg2-dev (>= 2.16.0-2),
librsvg2-common (>= 2.16.0-2),
@@ -66,7 +64,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- gstreamer0.10-plugins-base (>= 0.10.25-5),
+ gstreamer0.10-plugins-base (>= 0.10.25.2),
gstreamer0.10-alsa | gstreamer0.10-audiosink,
gstreamer0.10-plugins-good (>= 0.10.7),
gstreamer0.10-x,
@@ -192,7 +190,6 @@
* Control totem with a mobile phone using the Bluetooth protocol
* Share the current playlist via HTTP
* Search, browse for and play videos from YouTube
- * Search for videos using tracker
.
Additional plugins can be written in C, Python or Vala.
Modified: desktop/experimental/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/control.in?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/control.in [utf-8] (original)
+++ desktop/experimental/totem/debian/control.in [utf-8] Wed Jan 27 08:59:17 2010
@@ -8,20 +8,18 @@
quilt,
python-support (>= 0.6),
libepc-ui-dev (>= 0.3.0),
- libgtk2.0-dev (>= 2.16.0),
- libglib2.0-dev (>= 2.15),
+ libgtk2.0-dev (>= 2.19.1),
+ libglib2.0-dev (>= 2.22),
libunique-dev,
- libtotem-plparser-dev (>= 2.27.0),
- libtrackerclient-dev (>= 0.6),
- libtrackerclient-dev (<< 0.7),
+ libtotem-plparser-dev (>= 2.29.1),
liblircclient-dev (>= 0.6.6),
libirman-dev (>= 0.4.2),
gnome-pkg-tools (>= 0.10),
scrollkeeper,
- libgstreamer0.10-dev (>= 0.10.25),
- libgstreamer-plugins-base0.10-dev (>= 0.10.25),
- gstreamer0.10-tools (>= 0.10.25),
- gstreamer0.10-plugins-base (>= 0.10.25),
+ libgstreamer0.10-dev (>= 0.10.25.2),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.25.2),
+ gstreamer0.10-tools (>= 0.10.25.2),
+ gstreamer0.10-plugins-base (>= 0.10.25.2),
gstreamer0.10-plugins-good,
librsvg2-dev (>= 2.16.0-2),
librsvg2-common (>= 2.16.0-2),
@@ -61,7 +59,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
${python:Depends},
- gstreamer0.10-plugins-base (>= 0.10.25-5),
+ gstreamer0.10-plugins-base (>= 0.10.25.2),
gstreamer0.10-alsa | gstreamer0.10-audiosink,
gstreamer0.10-plugins-good (>= 0.10.7),
gstreamer0.10-x,
@@ -187,7 +185,6 @@
* Control totem with a mobile phone using the Bluetooth protocol
* Share the current playlist via HTTP
* Search, browse for and play videos from YouTube
- * Search for videos using tracker
.
Additional plugins can be written in C, Python or Vala.
Modified: desktop/experimental/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/patches/90_autotools.patch?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/experimental/totem/debian/patches/90_autotools.patch [utf-8] Wed Jan 27 08:59:17 2010
@@ -1,5 +1,6 @@
---- a/aclocal.m4
-+++ b/aclocal.m4
+diff -Naur totem-2.29.4.old/aclocal.m4 totem-2.29.4/aclocal.m4
+--- totem-2.29.4.old/aclocal.m4 2010-01-26 14:57:22.000000000 +0100
++++ totem-2.29.4/aclocal.m4 2010-01-27 09:57:09.541178437 +0100
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
@@ -252,8 +253,9 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
---- a/bindings/Makefile.in
-+++ b/bindings/Makefile.in
+diff -Naur totem-2.29.4.old/bindings/Makefile.in totem-2.29.4/bindings/Makefile.in
+--- totem-2.29.4.old/bindings/Makefile.in 2010-01-26 14:57:28.000000000 +0100
++++ totem-2.29.4/bindings/Makefile.in 2010-01-27 09:57:12.997175011 +0100
@@ -109,6 +109,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -280,8 +282,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/bindings/python/Makefile.in
-+++ b/bindings/python/Makefile.in
+diff -Naur totem-2.29.4.old/bindings/python/Makefile.in totem-2.29.4/bindings/python/Makefile.in
+--- totem-2.29.4.old/bindings/python/Makefile.in 2010-01-26 14:57:28.000000000 +0100
++++ totem-2.29.4/bindings/python/Makefile.in 2010-01-27 09:57:13.101176142 +0100
@@ -106,6 +106,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -308,8 +311,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/bindings/vala/Makefile.in
-+++ b/bindings/vala/Makefile.in
+diff -Naur totem-2.29.4.old/bindings/vala/Makefile.in totem-2.29.4/bindings/vala/Makefile.in
+--- totem-2.29.4.old/bindings/vala/Makefile.in 2010-01-26 14:57:28.000000000 +0100
++++ totem-2.29.4/bindings/vala/Makefile.in 2010-01-27 09:57:13.169175002 +0100
@@ -70,6 +70,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -336,9 +340,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/browser-plugin/Makefile.in
-+++ b/browser-plugin/Makefile.in
-@@ -333,6 +333,8 @@
+diff -Naur totem-2.29.4.old/browser-plugin/Makefile.in totem-2.29.4/browser-plugin/Makefile.in
+--- totem-2.29.4.old/browser-plugin/Makefile.in 2010-01-26 14:57:28.000000000 +0100
++++ totem-2.29.4/browser-plugin/Makefile.in 2010-01-27 09:57:13.558175500 +0100
+@@ -304,6 +304,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
@@ -347,7 +352,7 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -389,6 +391,8 @@
+@@ -360,6 +362,8 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -356,7 +361,7 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-@@ -448,6 +452,7 @@
+@@ -419,6 +423,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -364,8 +369,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/config.h.in
-+++ b/config.h.in
+diff -Naur totem-2.29.4.old/config.h.in totem-2.29.4/config.h.in
+--- totem-2.29.4.old/config.h.in 2010-01-26 14:57:26.000000000 +0100
++++ totem-2.29.4/config.h.in 2010-01-27 09:57:11.682178959 +0100
@@ -100,6 +100,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -376,13 +382,14 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
---- a/configure
-+++ b/configure
+diff -Naur totem-2.29.4.old/configure totem-2.29.4/configure
+--- totem-2.29.4.old/configure 2010-01-26 14:57:26.000000000 +0100
++++ totem-2.29.4/configure 2010-01-27 09:57:11.229175645 +0100
@@ -1,20 +1,24 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for totem 2.28.5.
-+# Generated by GNU Autoconf 2.65 for totem 2.28.5.
+-# Generated by GNU Autoconf 2.63 for totem 2.29.4.
++# Generated by GNU Autoconf 2.65 for totem 2.29.4.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=totem>.
#
@@ -1188,8 +1195,8 @@
# Identity of this package.
PACKAGE_NAME='totem'
@@ -748,6 +705,7 @@
- PACKAGE_VERSION='2.28.5'
- PACKAGE_STRING='totem 2.28.5'
+ PACKAGE_VERSION='2.29.4'
+ PACKAGE_STRING='totem 2.29.4'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem'
+PACKAGE_URL=''
@@ -1217,7 +1224,7 @@
DISABLE_DEPRECATED
WARN_CXXFLAGS
WARN_CFLAGS
-@@ -849,6 +815,8 @@
+@@ -847,6 +813,8 @@
LIBEPC_CFLAGS
BEMUSED_LIBS
BEMUSED_CFLAGS
@@ -1226,7 +1233,7 @@
GMYTH_LIBS
GMYTH_CFLAGS
LIRC_LIBS
-@@ -1080,6 +1048,7 @@
+@@ -1078,6 +1046,7 @@
program_transform_name
prefix
exec_prefix
@@ -1234,7 +1241,7 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1130,6 +1099,8 @@
+@@ -1127,6 +1096,8 @@
enable_iso_cxx
with_html_dir
enable_gtk_doc
@@ -1243,7 +1250,7 @@
enable_run_in_source_tree
'
ac_precious_vars='build_alias
-@@ -1175,6 +1146,8 @@
+@@ -1172,6 +1143,8 @@
MEDIA_PLAYER_KEYS_LIBS
GMYTH_CFLAGS
GMYTH_LIBS
@@ -1252,7 +1259,7 @@
BEMUSED_CFLAGS
BEMUSED_LIBS
LIBEPC_CFLAGS
-@@ -1302,8 +1275,7 @@
+@@ -1299,8 +1272,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1262,7 +1269,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1329,8 +1301,7 @@
+@@ -1326,8 +1298,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1272,7 +1279,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1534,8 +1505,7 @@
+@@ -1531,8 +1502,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1282,7 +1289,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1551,8 +1521,7 @@
+@@ -1548,8 +1518,7 @@
ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
@@ -1292,7 +1299,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1582,17 +1551,17 @@
+@@ -1579,17 +1548,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1316,7 +1323,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1609,15 +1578,13 @@
+@@ -1606,15 +1575,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1334,7 +1341,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1640,8 +1607,7 @@
+@@ -1637,8 +1604,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1344,7 +1351,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1671,11 +1637,9 @@
+@@ -1668,11 +1634,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1358,7 +1365,7 @@
# Find the source files, if location was not specified.
-@@ -1714,13 +1678,11 @@
+@@ -1711,13 +1675,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1374,7 +1381,7 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1868,7 +1830,9 @@
+@@ -1864,7 +1826,9 @@
Turn on compiler warnings.
--enable-iso-cxx Try to warn if code is not ISO C++
@@ -1385,7 +1392,7 @@
--disable-run-in-source-tree
disable search for UI files and plugins in local
directory
-@@ -1901,7 +1865,7 @@
+@@ -1897,7 +1861,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
@@ -1394,7 +1401,7 @@
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
-@@ -1954,6 +1918,8 @@
+@@ -1950,6 +1914,8 @@
GMYTH_CFLAGS
C compiler flags for GMYTH, overriding pkg-config
GMYTH_LIBS linker flags for GMYTH, overriding pkg-config
@@ -1403,10 +1410,10 @@
BEMUSED_CFLAGS
C compiler flags for BEMUSED, overriding pkg-config
BEMUSED_LIBS
-@@ -2055,21 +2021,499 @@
+@@ -2051,21 +2017,499 @@
if $ac_init_version; then
cat <<\_ACEOF
- totem configure 2.28.5
+ totem configure 2.29.4
-generated by GNU Autoconf 2.63
+generated by GNU Autoconf 2.65
@@ -1901,13 +1908,13 @@
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.5, which was
+ It was created by totem $as_me 2.29.4, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -2105,8 +2549,8 @@
+@@ -2101,8 +2545,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1918,7 +1925,7 @@
IFS=$as_save_IFS
} >&5
-@@ -2143,9 +2587,9 @@
+@@ -2139,9 +2583,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1930,7 +1937,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2161,13 +2605,13 @@
+@@ -2157,13 +2601,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1947,7 +1954,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2192,13 +2636,13 @@
+@@ -2188,13 +2632,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1963,7 +1970,7 @@
esac ;;
esac
done
-@@ -2270,39 +2714,41 @@
+@@ -2266,39 +2710,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -2010,7 +2017,7 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2320,8 +2766,8 @@
+@@ -2316,8 +2762,8 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
@@ -2021,7 +2028,7 @@
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2329,10 +2775,10 @@
+@@ -2325,10 +2771,10 @@
done
if test -r "$cache_file"; then
@@ -2036,7 +2043,7 @@
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2340,7 +2786,7 @@
+@@ -2336,7 +2782,7 @@
esac
fi
else
@@ -2045,7 +2052,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2355,11 +2801,11 @@
+@@ -2351,11 +2797,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -2059,7 +2066,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2369,17 +2815,17 @@
+@@ -2365,17 +2811,17 @@
ac_old_val_w=`echo x $ac_old_val`
ac_new_val_w=`echo x $ac_new_val`
if test "$ac_old_val_w" != "$ac_new_val_w"; then
@@ -2081,7 +2088,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2391,67 +2837,44 @@
+@@ -2387,63 +2833,40 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -2115,10 +2122,6 @@
-+ac_config_headers="$ac_config_headers config.h"
-
-
-
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+ # Check whether --enable-maintainer-mode was given.
@@ -2144,16 +2147,15 @@
-
-
-
+-
+-
+-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--
--
--
--ac_config_headers="$ac_config_headers config.h"
-
-
-
@@ -2171,7 +2173,7 @@
$as_echo "$USE_MAINTAINER_MODE" >&6; }
if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
-@@ -2468,24 +2891,16 @@
+@@ -2464,24 +2887,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2204,7 +2206,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2511,10 +2926,10 @@
+@@ -2507,10 +2922,10 @@
# OS/2's system install, which has a completely different semantic
# ./install, which can be erroneously created by make from ./install.sh.
# Reject install programs that cannot install multiple files.
@@ -2217,7 +2219,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2522,11 +2937,11 @@
+@@ -2518,11 +2933,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2233,7 +2235,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2563,7 +2978,7 @@
+@@ -2559,7 +2974,7 @@
;;
esac
@@ -2242,7 +2244,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2579,7 +2994,7 @@
+@@ -2575,7 +2990,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2251,7 +2253,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2590,7 +3005,7 @@
+@@ -2586,7 +3001,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2260,7 +2262,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2601,15 +3016,11 @@
+@@ -2597,15 +3012,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2278,7 +2280,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2631,11 +3042,8 @@
+@@ -2627,11 +3038,8 @@
# if, for instance, CONFIG_SHELL is bash and it inherits a
# broken ls alias from the environment. This has actually
# happened. Such a system could not be considered "sane".
@@ -2292,7 +2294,7 @@
fi
test "$2" = conftest.file
-@@ -2644,13 +3052,10 @@
+@@ -2640,13 +3048,10 @@
# Ok.
:
else
@@ -2309,7 +2311,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2678,7 +3083,7 @@
+@@ -2674,7 +3079,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2318,7 +2320,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2699,9 +3104,9 @@
+@@ -2695,9 +3100,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
@@ -2330,7 +2332,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2712,24 +3117,24 @@
+@@ -2708,24 +3113,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2360,7 +2362,7 @@
$as_echo "no" >&6; }
fi
-@@ -2739,9 +3144,9 @@
+@@ -2735,9 +3140,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
@@ -2372,7 +2374,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2752,24 +3157,24 @@
+@@ -2748,24 +3153,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2402,7 +2404,7 @@
$as_echo "no" >&6; }
fi
-@@ -2778,7 +3183,7 @@
+@@ -2774,7 +3179,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2411,7 +2413,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2791,10 +3196,10 @@
+@@ -2787,10 +3192,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2424,7 +2426,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2802,7 +3207,7 @@
+@@ -2798,7 +3203,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2433,7 +2435,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2814,11 +3219,12 @@
+@@ -2810,11 +3215,12 @@
esac
done
done
@@ -2447,7 +2449,7 @@
if test "${ac_cv_path_mkdir+set}" = set; then
MKDIR_P="$ac_cv_path_mkdir -p"
else
-@@ -2826,11 +3232,10 @@
+@@ -2822,11 +3228,10 @@
# value for MKDIR_P within a source directory, because that will
# break other packages using the cache if that directory is
# removed, or if the value is a relative name.
@@ -2460,7 +2462,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2843,9 +3248,9 @@
+@@ -2839,9 +3244,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
@@ -2472,7 +2474,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2856,24 +3261,24 @@
+@@ -2852,24 +3257,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2502,7 +2504,7 @@
$as_echo "no" >&6; }
fi
-@@ -2881,11 +3286,11 @@
+@@ -2877,11 +3282,11 @@
test -n "$AWK" && break
done
@@ -2516,7 +2518,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2903,11 +3308,11 @@
+@@ -2899,11 +3304,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2530,7 +2532,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2927,9 +3332,7 @@
+@@ -2923,9 +3328,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2541,7 +2543,7 @@
fi
fi
-@@ -2988,7 +3391,7 @@
+@@ -2984,7 +3387,7 @@
# Enable silent build when available (Automake 1.11)
# Check whether --enable-silent-rules was given.
@@ -2550,7 +2552,7 @@
enableval=$enable_silent_rules;
fi
-@@ -3019,7 +3422,7 @@
+@@ -3015,7 +3418,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2559,7 +2561,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3047,12 +3450,12 @@
+@@ -3043,12 +3446,12 @@
fi
@@ -2574,7 +2576,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3077,9 +3480,9 @@
+@@ -3073,9 +3476,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -2586,7 +2588,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3090,24 +3493,24 @@
+@@ -3086,24 +3489,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2616,7 +2618,7 @@
$as_echo "no" >&6; }
fi
-@@ -3117,9 +3520,9 @@
+@@ -3113,9 +3516,9 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -2628,7 +2630,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3130,24 +3533,24 @@
+@@ -3126,24 +3529,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2658,7 +2660,7 @@
$as_echo "no" >&6; }
fi
-@@ -3156,7 +3559,7 @@
+@@ -3152,7 +3555,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2667,7 +2669,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3170,9 +3573,9 @@
+@@ -3166,9 +3569,9 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -2679,7 +2681,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3183,24 +3586,24 @@
+@@ -3179,24 +3582,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2709,7 +2711,7 @@
$as_echo "no" >&6; }
fi
-@@ -3210,9 +3613,9 @@
+@@ -3206,9 +3609,9 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
@@ -2721,7 +2723,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3224,18 +3627,18 @@
+@@ -3220,18 +3623,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2743,7 +2745,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3254,10 +3657,10 @@
+@@ -3250,10 +3653,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2756,7 +2758,7 @@
$as_echo "no" >&6; }
fi
-@@ -3269,9 +3672,9 @@
+@@ -3265,9 +3668,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
@@ -2768,7 +2770,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3282,24 +3685,24 @@
+@@ -3278,24 +3681,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2798,7 +2800,7 @@
$as_echo "no" >&6; }
fi
-@@ -3313,9 +3716,9 @@
+@@ -3309,9 +3712,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
@@ -2810,7 +2812,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3326,24 +3729,24 @@
+@@ -3322,24 +3725,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2840,7 +2842,7 @@
$as_echo "no" >&6; }
fi
-@@ -3356,7 +3759,7 @@
+@@ -3352,7 +3755,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2849,7 +2851,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3367,57 +3770,37 @@
+@@ -3363,57 +3766,37 @@
fi
@@ -2927,7 +2929,7 @@
/* end confdefs.h. */
int
-@@ -3433,8 +3816,8 @@
+@@ -3429,8 +3812,8 @@
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
@@ -2938,7 +2940,7 @@
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
-@@ -3450,17 +3833,17 @@
+@@ -3446,17 +3829,17 @@
done
rm -f $ac_rmfiles
@@ -2961,7 +2963,7 @@
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
# in a Makefile. We should not override ac_cv_exeext if it was cached,
-@@ -3477,7 +3860,7 @@
+@@ -3473,7 +3856,7 @@
# certainly right.
break;;
*.* )
@@ -2970,7 +2972,7 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3496,84 +3879,42 @@
+@@ -3492,84 +3875,42 @@
else
ac_file=''
fi
@@ -3076,7 +3078,7 @@
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
# work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3588,32 +3929,83 @@
+@@ -3584,32 +3925,83 @@
esac
done
else
@@ -3176,7 +3178,7 @@
/* end confdefs.h. */
int
-@@ -3625,17 +4017,17 @@
+@@ -3621,17 +4013,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -3199,7 +3201,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3648,31 +4040,23 @@
+@@ -3644,31 +4036,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3238,7 +3240,7 @@
/* end confdefs.h. */
int
-@@ -3686,37 +4070,16 @@
+@@ -3682,37 +4066,16 @@
return 0;
}
_ACEOF
@@ -3279,7 +3281,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3725,20 +4088,16 @@
+@@ -3721,20 +4084,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3303,7 +3305,7 @@
/* end confdefs.h. */
int
-@@ -3749,35 +4108,11 @@
+@@ -3745,35 +4104,11 @@
return 0;
}
_ACEOF
@@ -3342,7 +3344,7 @@
/* end confdefs.h. */
int
-@@ -3788,36 +4123,12 @@
+@@ -3784,36 +4119,12 @@
return 0;
}
_ACEOF
@@ -3383,7 +3385,7 @@
/* end confdefs.h. */
int
-@@ -3828,42 +4139,17 @@
+@@ -3824,42 +4135,17 @@
return 0;
}
_ACEOF
@@ -3428,7 +3430,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3880,18 +4166,14 @@
+@@ -3876,18 +4162,14 @@
CFLAGS=
fi
fi
@@ -3450,7 +3452,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3948,32 +4230,9 @@
+@@ -3944,32 +4226,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3484,7 +3486,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3984,17 +4243,19 @@
+@@ -3980,17 +4239,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3507,7 +3509,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4004,9 +4265,9 @@
+@@ -4000,9 +4261,9 @@
depcc="$CC" am_compiler_list=
@@ -3519,7 +3521,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4114,7 +4375,7 @@
+@@ -4110,7 +4371,7 @@
fi
fi
@@ -3528,7 +3530,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4135,14 +4396,14 @@
+@@ -4131,14 +4392,14 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3545,7 +3547,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4157,11 +4418,7 @@
+@@ -4153,11 +4414,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.
@@ -3558,7 +3560,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4170,78 +4427,34 @@
+@@ -4166,78 +4423,34 @@
#endif
Syntax error
_ACEOF
@@ -3642,7 +3644,7 @@
break
fi
-@@ -4253,7 +4466,7 @@
+@@ -4249,7 +4462,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3651,7 +3653,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4264,11 +4477,7 @@
+@@ -4260,11 +4473,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.
@@ -3664,7 +3666,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4277,87 +4486,40 @@
+@@ -4273,87 +4482,40 @@
#endif
Syntax error
_ACEOF
@@ -3761,7 +3763,7 @@
fi
ac_ext=c
-@@ -4367,9 +4529,9 @@
+@@ -4363,9 +4525,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3773,7 +3775,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4380,7 +4542,7 @@
+@@ -4376,7 +4538,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3782,7 +3784,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-@@ -4400,7 +4562,7 @@
+@@ -4396,7 +4558,7 @@
$as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3791,7 +3793,7 @@
if test $ac_count -gt ${ac_path_GREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_GREP="$ac_path_GREP"
-@@ -4415,26 +4577,24 @@
+@@ -4411,26 +4573,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3823,7 +3825,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4448,7 +4608,7 @@
+@@ -4444,7 +4604,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3832,7 +3834,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-@@ -4468,7 +4628,7 @@
+@@ -4464,7 +4624,7 @@
$as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
@@ -3841,7 +3843,7 @@
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
# Best one so far, save it but keep looking for a better one
ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4483,12 +4643,10 @@
+@@ -4479,12 +4639,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3856,7 +3858,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4496,21 +4654,17 @@
+@@ -4492,21 +4650,17 @@
fi
fi
@@ -3882,7 +3884,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4525,48 +4679,23 @@
+@@ -4521,48 +4675,23 @@
return 0;
}
_ACEOF
@@ -3936,7 +3938,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4576,18 +4705,14 @@
+@@ -4572,18 +4701,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3958,7 +3960,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4597,14 +4722,10 @@
+@@ -4593,14 +4718,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3975,7 +3977,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4631,118 +4752,34 @@
+@@ -4627,118 +4748,34 @@
return 0;
}
_ACEOF
@@ -4107,7 +4109,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4753,151 +4790,12 @@
+@@ -4749,151 +4786,12 @@
@@ -4264,7 +4266,7 @@
_ACEOF
fi
-@@ -4905,16 +4803,12 @@
+@@ -4901,16 +4799,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -4284,7 +4286,7 @@
/* end confdefs.h. */
#include <locale.h>
int
-@@ -4925,46 +4819,19 @@
+@@ -4921,46 +4815,19 @@
return 0;
}
_ACEOF
@@ -4337,7 +4339,7 @@
fi
fi
-@@ -4977,155 +4844,20 @@
+@@ -4973,155 +4840,20 @@
XGETTEXT=:
INTLLIBS=
@@ -4498,7 +4500,7 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -5137,202 +4869,58 @@
+@@ -5133,202 +4865,58 @@
;
return 0;
}
@@ -4730,7 +4732,7 @@
_ACEOF
fi
-@@ -5347,18 +4935,14 @@
+@@ -5343,18 +4931,14 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -4752,7 +4754,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5376,55 +4960,26 @@
+@@ -5372,55 +4956,26 @@
return 0;
}
_ACEOF
@@ -4817,7 +4819,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5442,55 +4997,26 @@
+@@ -5438,55 +4993,26 @@
return 0;
}
_ACEOF
@@ -4882,7 +4884,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5508,43 +5034,18 @@
+@@ -5504,43 +5030,18 @@
return 0;
}
_ACEOF
@@ -4932,7 +4934,7 @@
gt_cv_func_dgettext_libintl=yes
fi
-@@ -5554,22 +5055,18 @@
+@@ -5550,22 +5051,18 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -4960,7 +4962,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5587,55 +5084,26 @@
+@@ -5583,55 +5080,26 @@
return 0;
}
_ACEOF
@@ -5025,7 +5027,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -5653,43 +5121,18 @@
+@@ -5649,43 +5117,18 @@
return 0;
}
_ACEOF
@@ -5075,7 +5077,7 @@
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
else
-@@ -5711,102 +5154,12 @@
+@@ -5707,102 +5150,12 @@
glib_save_LIBS="$LIBS"
LIBS="$LIBS -lintl $libintl_extra_libs"
unset ac_cv_func_bind_textdomain_codeset
@@ -5183,7 +5185,7 @@
_ACEOF
fi
-@@ -5836,15 +5189,13 @@
+@@ -5832,15 +5185,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -5202,7 +5204,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -5869,118 +5220,28 @@
+@@ -5865,118 +5216,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -5332,7 +5334,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -5995,14 +5256,14 @@
+@@ -5991,14 +5252,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -5352,7 +5354,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -6010,9 +5271,9 @@
+@@ -6006,9 +5267,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -5364,7 +5366,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6025,14 +5286,14 @@
+@@ -6021,14 +5282,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5382,7 +5384,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6041,19 +5302,19 @@
+@@ -6037,19 +5298,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5406,7 +5408,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -6078,18 +5339,14 @@
+@@ -6074,18 +5335,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -5428,7 +5430,7 @@
/* end confdefs.h. */
int
-@@ -6101,121 +5358,14 @@
+@@ -6097,121 +5354,14 @@
return 0;
}
_ACEOF
@@ -5554,7 +5556,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -6230,10 +5380,8 @@
+@@ -6226,10 +5376,8 @@
;;
esac
fi
@@ -5567,7 +5569,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -6247,9 +5395,7 @@
+@@ -6243,9 +5391,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -5578,7 +5580,7 @@
fi
-@@ -6257,7 +5403,7 @@
+@@ -6253,7 +5399,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -5587,7 +5589,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -6290,7 +5436,7 @@
+@@ -6286,7 +5432,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -5596,7 +5598,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -6315,7 +5461,7 @@
+@@ -6311,7 +5457,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -5605,7 +5607,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -6348,16 +5494,16 @@
+@@ -6344,16 +5490,16 @@
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -5625,7 +5627,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -6365,35 +5511,31 @@
+@@ -6361,35 +5507,31 @@
case "$am__api_version" in
1.01234)
@@ -5667,7 +5669,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -6406,14 +5548,14 @@
+@@ -6402,14 +5544,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5685,7 +5687,7 @@
IFS=$as_save_IFS
;;
-@@ -6421,19 +5563,19 @@
+@@ -6417,19 +5559,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -5709,7 +5711,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -6446,14 +5588,14 @@
+@@ -6442,14 +5584,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5727,7 +5729,7 @@
IFS=$as_save_IFS
;;
-@@ -6461,19 +5603,19 @@
+@@ -6457,19 +5599,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -5751,7 +5753,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -6486,14 +5628,14 @@
+@@ -6482,14 +5624,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5769,7 +5771,7 @@
IFS=$as_save_IFS
;;
-@@ -6501,18 +5643,16 @@
+@@ -6497,18 +5639,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -5791,7 +5793,7 @@
fi
INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -6634,9 +5774,9 @@
+@@ -6630,9 +5770,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -5803,7 +5805,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -6649,14 +5789,14 @@
+@@ -6645,14 +5785,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5821,7 +5823,7 @@
IFS=$as_save_IFS
;;
-@@ -6664,19 +5804,19 @@
+@@ -6660,19 +5800,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -5845,7 +5847,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -6689,14 +5829,14 @@
+@@ -6685,14 +5825,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5863,7 +5865,7 @@
IFS=$as_save_IFS
;;
-@@ -6704,19 +5844,19 @@
+@@ -6700,19 +5840,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -5887,7 +5889,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -6729,14 +5869,14 @@
+@@ -6725,14 +5865,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5905,7 +5907,7 @@
IFS=$as_save_IFS
;;
-@@ -6744,19 +5884,19 @@
+@@ -6740,19 +5880,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -5929,7 +5931,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6769,14 +5909,14 @@
+@@ -6765,14 +5905,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5947,7 +5949,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6785,33 +5925,29 @@
+@@ -6781,33 +5921,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5987,7 +5989,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -6824,14 +5960,14 @@
+@@ -6820,14 +5956,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6005,7 +6007,7 @@
IFS=$as_save_IFS
;;
-@@ -6839,41 +5975,35 @@
+@@ -6835,41 +5971,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -6056,7 +6058,7 @@
fi
fi
-@@ -6883,11 +6013,7 @@
+@@ -6879,11 +6009,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -6069,7 +6071,7 @@
/* end confdefs.h. */
int
-@@ -6899,120 +6025,13 @@
+@@ -6895,120 +6021,13 @@
return 0;
}
_ACEOF
@@ -6194,7 +6196,7 @@
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -7024,10 +6043,8 @@
+@@ -7020,10 +6039,8 @@
;;
esac
fi
@@ -6207,7 +6209,7 @@
fi
-@@ -7035,14 +6052,14 @@
+@@ -7031,14 +6048,14 @@
@@ -6225,7 +6227,7 @@
$as_echo "no, using $LN_S" >&6; }
fi
-@@ -7052,9 +6069,9 @@
+@@ -7048,9 +6065,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
@@ -6237,7 +6239,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -7067,14 +6084,14 @@
+@@ -7063,14 +6080,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6255,7 +6257,7 @@
IFS=$as_save_IFS
;;
-@@ -7082,10 +6099,10 @@
+@@ -7078,10 +6095,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -6268,7 +6270,7 @@
$as_echo "no" >&6; }
fi
-@@ -7095,9 +6112,9 @@
+@@ -7091,9 +6108,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
@@ -6280,7 +6282,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -7110,14 +6127,14 @@
+@@ -7106,14 +6123,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6298,7 +6300,7 @@
IFS=$as_save_IFS
;;
-@@ -7125,10 +6142,10 @@
+@@ -7121,10 +6138,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -6311,7 +6313,7 @@
$as_echo "no" >&6; }
fi
-@@ -7137,7 +6154,7 @@
+@@ -7133,7 +6150,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6320,7 +6322,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7150,13 +6167,13 @@
+@@ -7146,13 +6163,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -6337,7 +6339,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -7165,35 +6182,33 @@
+@@ -7161,35 +6178,33 @@
gdu_cv_version_required=0.3.2
@@ -6381,7 +6383,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -7204,7 +6219,7 @@
+@@ -7200,7 +6215,7 @@
# Check whether --with-omf-dir was given.
@@ -6390,7 +6392,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -7215,7 +6230,7 @@
+@@ -7211,7 +6226,7 @@
# Check whether --with-help-formats was given.
@@ -6399,7 +6401,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -7225,7 +6240,7 @@
+@@ -7221,7 +6236,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -6408,7 +6410,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -7268,9 +6283,9 @@
+@@ -7264,9 +6279,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
@@ -6420,7 +6422,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -7281,24 +6296,24 @@
+@@ -7277,24 +6292,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6450,7 +6452,7 @@
$as_echo "no" >&6; }
fi
-@@ -7312,9 +6327,9 @@
+@@ -7308,9 +6323,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
@@ -6462,7 +6464,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -7325,24 +6340,24 @@
+@@ -7321,24 +6336,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6492,7 +6494,7 @@
$as_echo "no" >&6; }
fi
-@@ -7355,7 +6370,7 @@
+@@ -7351,7 +6366,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6501,7 +6503,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7366,53 +6381,36 @@
+@@ -7362,53 +6377,36 @@
fi
fi
# Provide some information about the compiler.
@@ -6574,7 +6576,7 @@
/* end confdefs.h. */
int
-@@ -7426,37 +6424,16 @@
+@@ -7422,37 +6420,16 @@
return 0;
}
_ACEOF
@@ -6615,7 +6617,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -7465,20 +6442,16 @@
+@@ -7461,20 +6438,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -6639,7 +6641,7 @@
/* end confdefs.h. */
int
-@@ -7489,35 +6462,11 @@
+@@ -7485,35 +6458,11 @@
return 0;
}
_ACEOF
@@ -6678,7 +6680,7 @@
/* end confdefs.h. */
int
-@@ -7528,82 +6477,33 @@
+@@ -7524,82 +6473,33 @@
return 0;
}
_ACEOF
@@ -6773,7 +6775,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -7628,9 +6528,9 @@
+@@ -7624,9 +6524,9 @@
depcc="$CXX" am_compiler_list=
@@ -6785,7 +6787,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -7738,7 +6638,7 @@
+@@ -7734,7 +6634,7 @@
fi
fi
@@ -6794,7 +6796,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -7754,22 +6654,18 @@
+@@ -7750,22 +6650,18 @@
if test "x$CC" != xcc; then
@@ -6821,7 +6823,7 @@
/* end confdefs.h. */
int
-@@ -7785,63 +6681,63 @@
+@@ -7781,63 +6677,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.*
@@ -6910,7 +6912,7 @@
then
# cc works too.
:
-@@ -7858,15 +6754,13 @@
+@@ -7854,15 +6750,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -6929,7 +6931,7 @@
fi
-@@ -7887,7 +6781,7 @@
+@@ -7883,7 +6777,7 @@
case `pwd` in
*\ * | *\ *)
@@ -6938,7 +6940,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -7912,35 +6806,27 @@
+@@ -7908,35 +6802,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -6981,7 +6983,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -7956,28 +6842,24 @@
+@@ -7952,28 +6838,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -7015,7 +7017,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -7993,9 +6875,9 @@
+@@ -7989,9 +6871,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -7027,7 +7029,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -8003,7 +6885,7 @@
+@@ -7999,7 +6881,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -7036,7 +7038,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -8012,7 +6894,7 @@
+@@ -8008,7 +6890,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7045,7 +7047,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
-@@ -8032,7 +6914,7 @@
+@@ -8028,7 +6910,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
@@ -7054,7 +7056,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"
-@@ -8047,19 +6929,17 @@
+@@ -8043,19 +6925,17 @@
$ac_path_SED_found && break 3
done
done
@@ -7077,7 +7079,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -8077,9 +6957,9 @@
+@@ -8073,9 +6953,9 @@
@@ -7089,7 +7091,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -8093,7 +6973,7 @@
+@@ -8089,7 +6969,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7098,7 +7100,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
-@@ -8113,7 +6993,7 @@
+@@ -8109,7 +6989,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
@@ -7107,7 +7109,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"
-@@ -8128,12 +7008,10 @@
+@@ -8124,12 +7004,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -7122,7 +7124,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -8141,7 +7019,7 @@
+@@ -8137,7 +7015,7 @@
fi
fi
@@ -7131,7 +7133,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -8167,7 +7045,7 @@
+@@ -8163,7 +7041,7 @@
# Check whether --with-gnu-ld was given.
@@ -7140,7 +7142,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -8176,7 +7054,7 @@
+@@ -8172,7 +7050,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -7149,7 +7151,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -8206,13 +7084,13 @@
+@@ -8202,13 +7080,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -7166,7 +7168,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -8243,18 +7121,16 @@
+@@ -8239,18 +7117,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -7190,7 +7192,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -8267,7 +7143,7 @@
+@@ -8263,7 +7139,7 @@
;;
esac
fi
@@ -7199,7 +7201,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -8279,9 +7155,9 @@
+@@ -8275,9 +7151,9 @@
@@ -7211,7 +7213,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -8328,7 +7204,7 @@
+@@ -8324,7 +7200,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -7220,7 +7222,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -8339,9 +7215,9 @@
+@@ -8335,9 +7211,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
@@ -7232,7 +7234,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -8352,24 +7228,24 @@
+@@ -8348,24 +7224,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7262,7 +7264,7 @@
$as_echo "no" >&6; }
fi
-@@ -8383,9 +7259,9 @@
+@@ -8379,9 +7255,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
@@ -7274,7 +7276,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -8396,24 +7272,24 @@
+@@ -8392,24 +7268,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7304,7 +7306,7 @@
$as_echo "no" >&6; }
fi
-@@ -8426,7 +7302,7 @@
+@@ -8422,7 +7298,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7313,7 +7315,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8446,33 +7322,33 @@
+@@ -8442,33 +7318,33 @@
@@ -7326,16 +7328,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:8456: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:7332: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:8452: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:7328: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8459: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:7335: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:8455: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:7331: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8462: output\"" >&5)
-+ (eval echo "\"\$as_me:7338: output\"" >&5)
+- (eval echo "\"\$as_me:8458: output\"" >&5)
++ (eval echo "\"\$as_me:7334: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7355,7 +7357,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -8590,10 +7466,10 @@
+@@ -8586,10 +7462,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7368,7 +7370,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -8607,7 +7483,7 @@
+@@ -8603,7 +7479,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -7377,7 +7379,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -8617,17 +7493,17 @@
+@@ -8613,17 +7489,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -7398,7 +7400,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -8662,14 +7538,14 @@
+@@ -8658,14 +7534,14 @@
@@ -7416,7 +7418,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -8698,9 +7574,9 @@
+@@ -8694,9 +7570,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
@@ -7428,7 +7430,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -8711,24 +7587,24 @@
+@@ -8707,24 +7583,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7458,7 +7460,7 @@
$as_echo "no" >&6; }
fi
-@@ -8738,9 +7614,9 @@
+@@ -8734,9 +7610,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
@@ -7470,7 +7472,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -8751,24 +7627,24 @@
+@@ -8747,24 +7623,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7500,7 +7502,7 @@
$as_echo "no" >&6; }
fi
-@@ -8777,7 +7653,7 @@
+@@ -8773,7 +7649,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7509,7 +7511,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8797,9 +7673,9 @@
+@@ -8793,9 +7669,9 @@
@@ -7521,7 +7523,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -8914,11 +7790,11 @@
+@@ -8910,11 +7786,11 @@
;;
# This must be Linux ELF.
@@ -7535,7 +7537,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
-@@ -8993,7 +7869,7 @@
+@@ -8989,7 +7865,7 @@
esac
fi
@@ -7544,7 +7546,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
-@@ -9013,9 +7889,9 @@
+@@ -9009,9 +7885,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
@@ -7556,7 +7558,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -9026,24 +7902,24 @@
+@@ -9022,24 +7898,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7586,7 +7588,7 @@
$as_echo "no" >&6; }
fi
-@@ -9053,9 +7929,9 @@
+@@ -9049,9 +7925,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
@@ -7598,7 +7600,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -9066,24 +7942,24 @@
+@@ -9062,24 +7938,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7628,7 +7630,7 @@
$as_echo "no" >&6; }
fi
-@@ -9092,7 +7968,7 @@
+@@ -9088,7 +7964,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7637,7 +7639,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9118,9 +7994,9 @@
+@@ -9114,9 +7990,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
@@ -7649,7 +7651,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -9131,24 +8007,24 @@
+@@ -9127,24 +8003,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7679,7 +7681,7 @@
$as_echo "no" >&6; }
fi
-@@ -9158,9 +8034,9 @@
+@@ -9154,9 +8030,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
@@ -7691,7 +7693,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -9171,24 +8047,24 @@
+@@ -9167,24 +8043,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7721,7 +7723,7 @@
$as_echo "no" >&6; }
fi
-@@ -9197,7 +8073,7 @@
+@@ -9193,7 +8069,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7730,7 +7732,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9217,9 +8093,9 @@
+@@ -9213,9 +8089,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
@@ -7742,7 +7744,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -9230,24 +8106,24 @@
+@@ -9226,24 +8102,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7772,7 +7774,7 @@
$as_echo "no" >&6; }
fi
-@@ -9257,9 +8133,9 @@
+@@ -9253,9 +8129,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
@@ -7784,7 +7786,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -9270,24 +8146,24 @@
+@@ -9266,24 +8142,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7814,7 +7816,7 @@
$as_echo "no" >&6; }
fi
-@@ -9296,7 +8172,7 @@
+@@ -9292,7 +8168,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7823,7 +7825,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9374,9 +8250,9 @@
+@@ -9370,9 +8246,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -7835,7 +7837,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -9492,18 +8368,18 @@
+@@ -9488,18 +8364,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -7860,7 +7862,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -9556,11 +8432,11 @@
+@@ -9552,11 +8428,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -7875,7 +7877,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -9594,10 +8470,10 @@
+@@ -9590,10 +8466,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
@@ -7888,7 +7890,7 @@
$as_echo "ok" >&6; }
fi
-@@ -9623,7 +8499,7 @@
+@@ -9619,7 +8495,7 @@
# Check whether --enable-libtool-lock was given.
@@ -7897,7 +7899,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -9635,11 +8511,11 @@
+@@ -9631,11 +8507,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7912,13 +7914,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -9653,12 +8529,12 @@
+@@ -9649,12 +8525,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 9656 "configure"' > conftest.$ac_ext
+- echo '#line 9652 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 8532 "configure"' > conftest.$ac_ext
++ echo '#line 8528 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7929,7 +7931,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -9692,11 +8568,11 @@
+@@ -9688,11 +8564,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7944,7 +7946,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -9745,9 +8621,9 @@
+@@ -9741,9 +8617,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -7956,7 +7958,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -9756,11 +8632,7 @@
+@@ -9752,11 +8628,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7969,7 +7971,7 @@
/* end confdefs.h. */
int
-@@ -9771,38 +8643,13 @@
+@@ -9767,38 +8639,13 @@
return 0;
}
_ACEOF
@@ -8012,7 +8014,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9810,7 +8657,7 @@
+@@ -9806,7 +8653,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -8021,7 +8023,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
-@@ -9820,11 +8667,11 @@
+@@ -9816,11 +8663,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -8036,7 +8038,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -9850,9 +8697,9 @@
+@@ -9846,9 +8693,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
@@ -8048,7 +8050,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -9863,24 +8710,24 @@
+@@ -9859,24 +8706,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8078,7 +8080,7 @@
$as_echo "no" >&6; }
fi
-@@ -9890,9 +8737,9 @@
+@@ -9886,9 +8733,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
@@ -8090,7 +8092,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -9903,24 +8750,24 @@
+@@ -9899,24 +8746,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8120,7 +8122,7 @@
$as_echo "no" >&6; }
fi
-@@ -9929,7 +8776,7 @@
+@@ -9925,7 +8772,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8129,7 +8131,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9942,9 +8789,9 @@
+@@ -9938,9 +8785,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
@@ -8141,7 +8143,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -9955,24 +8802,24 @@
+@@ -9951,24 +8798,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8171,7 +8173,7 @@
$as_echo "no" >&6; }
fi
-@@ -9982,9 +8829,9 @@
+@@ -9978,9 +8825,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
@@ -8183,7 +8185,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -9995,24 +8842,24 @@
+@@ -9991,24 +8838,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8213,7 +8215,7 @@
$as_echo "no" >&6; }
fi
-@@ -10021,7 +8868,7 @@
+@@ -10017,7 +8864,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8222,7 +8224,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10034,9 +8881,9 @@
+@@ -10030,9 +8877,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
@@ -8234,7 +8236,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -10047,24 +8894,24 @@
+@@ -10043,24 +8890,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8264,7 +8266,7 @@
$as_echo "no" >&6; }
fi
-@@ -10074,9 +8921,9 @@
+@@ -10070,9 +8917,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
@@ -8276,7 +8278,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -10087,24 +8934,24 @@
+@@ -10083,24 +8930,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8306,7 +8308,7 @@
$as_echo "no" >&6; }
fi
-@@ -10113,7 +8960,7 @@
+@@ -10109,7 +8956,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8315,7 +8317,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10126,9 +8973,9 @@
+@@ -10122,9 +8969,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
@@ -8327,7 +8329,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -10139,24 +8986,24 @@
+@@ -10135,24 +8982,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8357,7 +8359,7 @@
$as_echo "no" >&6; }
fi
-@@ -10166,9 +9013,9 @@
+@@ -10162,9 +9009,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
@@ -8369,7 +8371,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -10179,24 +9026,24 @@
+@@ -10175,24 +9022,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8399,7 +8401,7 @@
$as_echo "no" >&6; }
fi
-@@ -10205,7 +9052,7 @@
+@@ -10201,7 +9048,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8408,7 +8410,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10218,9 +9065,9 @@
+@@ -10214,9 +9061,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
@@ -8420,7 +8422,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -10231,24 +9078,24 @@
+@@ -10227,24 +9074,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8450,7 +8452,7 @@
$as_echo "no" >&6; }
fi
-@@ -10258,9 +9105,9 @@
+@@ -10254,9 +9101,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
@@ -8462,7 +8464,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -10271,24 +9118,24 @@
+@@ -10267,24 +9114,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8492,7 +8494,7 @@
$as_echo "no" >&6; }
fi
-@@ -10297,7 +9144,7 @@
+@@ -10293,7 +9140,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8501,7 +8503,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10333,9 +9180,9 @@
+@@ -10329,9 +9176,9 @@
@@ -8513,7 +8515,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -10360,22 +9207,18 @@
+@@ -10356,22 +9203,18 @@
rm -f conftest.*
fi
fi
@@ -8540,7 +8542,7 @@
/* end confdefs.h. */
int
-@@ -10386,42 +9229,17 @@
+@@ -10382,42 +9225,17 @@
return 0;
}
_ACEOF
@@ -8588,7 +8590,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -10458,62 +9276,13 @@
+@@ -10454,62 +9272,13 @@
;;
esac
@@ -8656,7 +8658,7 @@
_ACEOF
fi
-@@ -10536,9 +9305,9 @@
+@@ -10532,9 +9301,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
@@ -8668,7 +8670,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -10549,24 +9318,24 @@
+@@ -10545,24 +9314,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8698,7 +8700,7 @@
$as_echo "no" >&6; }
fi
-@@ -10580,9 +9349,9 @@
+@@ -10576,9 +9345,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
@@ -8710,7 +8712,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -10593,24 +9362,24 @@
+@@ -10589,24 +9358,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8740,7 +8742,7 @@
$as_echo "no" >&6; }
fi
-@@ -10623,7 +9392,7 @@
+@@ -10619,7 +9388,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8749,7 +8751,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10634,53 +9403,36 @@
+@@ -10630,53 +9399,36 @@
fi
fi
# Provide some information about the compiler.
@@ -8822,7 +8824,7 @@
/* end confdefs.h. */
int
-@@ -10694,37 +9446,16 @@
+@@ -10690,37 +9442,16 @@
return 0;
}
_ACEOF
@@ -8863,7 +8865,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -10733,20 +9464,16 @@
+@@ -10729,20 +9460,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -8887,7 +8889,7 @@
/* end confdefs.h. */
int
-@@ -10757,35 +9484,11 @@
+@@ -10753,35 +9480,11 @@
return 0;
}
_ACEOF
@@ -8926,7 +8928,7 @@
/* end confdefs.h. */
int
-@@ -10796,36 +9499,12 @@
+@@ -10792,36 +9495,12 @@
return 0;
}
_ACEOF
@@ -8967,7 +8969,7 @@
/* end confdefs.h. */
int
-@@ -10836,42 +9515,17 @@
+@@ -10832,42 +9511,17 @@
return 0;
}
_ACEOF
@@ -9012,7 +9014,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -10896,9 +9550,9 @@
+@@ -10892,9 +9546,9 @@
depcc="$CXX" am_compiler_list=
@@ -9024,7 +9026,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -11006,7 +9660,7 @@
+@@ -11002,7 +9656,7 @@
fi
fi
@@ -9033,7 +9035,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -11029,10 +9683,10 @@
+@@ -11025,10 +9679,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
@@ -9046,7 +9048,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -11047,11 +9701,7 @@
+@@ -11043,11 +9697,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.
@@ -9059,7 +9061,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -11060,78 +9710,34 @@
+@@ -11056,78 +9706,34 @@
#endif
Syntax error
_ACEOF
@@ -9143,7 +9145,7 @@
break
fi
-@@ -11143,7 +9749,7 @@
+@@ -11139,7 +9745,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -9152,7 +9154,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -11154,94 +9760,46 @@
+@@ -11150,94 +9756,46 @@
# <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.
@@ -9262,7 +9264,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -11271,7 +9829,7 @@
+@@ -11267,7 +9825,7 @@
# Check whether --enable-shared was given.
@@ -9271,7 +9273,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -11302,7 +9860,7 @@
+@@ -11298,7 +9856,7 @@
# Check whether --enable-static was given.
@@ -9280,7 +9282,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -11334,7 +9892,7 @@
+@@ -11330,7 +9888,7 @@
# Check whether --with-pic was given.
@@ -9289,7 +9291,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -11350,7 +9908,7 @@
+@@ -11346,7 +9904,7 @@
# Check whether --enable-fast-install was given.
@@ -9298,7 +9300,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -11431,9 +9989,9 @@
+@@ -11427,9 +9985,9 @@
setopt NO_GLOB_SUBST
fi
@@ -9310,7 +9312,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -11446,7 +10004,7 @@
+@@ -11442,7 +10000,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -9319,7 +9321,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -11539,9 +10097,9 @@
+@@ -11535,9 +10093,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -9331,7 +9333,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11592,10 +10150,10 @@
+@@ -11588,10 +10146,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9344,7 +9346,7 @@
$as_echo "no" >&6; }
fi
-@@ -11605,9 +10163,9 @@
+@@ -11601,9 +10159,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -9356,7 +9358,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11658,10 +10216,10 @@
+@@ -11654,10 +10212,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9369,7 +9371,7 @@
$as_echo "no" >&6; }
fi
-@@ -11738,9 +10296,9 @@
+@@ -11734,9 +10292,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -9381,21 +9383,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -11756,11 +10314,11 @@
+@@ -11752,11 +10310,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:11759: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10317: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:11755: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10313: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:11763: \$? = $ac_status" >&5
-+ echo "$as_me:10321: \$? = $ac_status" >&5
+- echo "$as_me:11759: \$? = $ac_status" >&5
++ echo "$as_me:10317: \$? = $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.
-@@ -11773,7 +10331,7 @@
+@@ -11769,7 +10327,7 @@
$RM conftest*
fi
@@ -9404,7 +9406,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -11793,7 +10351,7 @@
+@@ -11789,7 +10347,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -9413,7 +9415,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -11925,7 +10483,7 @@
+@@ -11921,7 +10479,7 @@
lt_prog_compiler_static='-non_shared'
;;
@@ -9422,7 +9424,7 @@
case $cc_basename in
# old Intel for x86_64 which still supported -KPIC.
ecc*)
-@@ -12065,7 +10623,7 @@
+@@ -12061,7 +10619,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -9431,7 +9433,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -12077,9 +10635,9 @@
+@@ -12073,9 +10631,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -9443,21 +9445,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -12095,11 +10653,11 @@
+@@ -12091,11 +10649,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:12098: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10656: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12094: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10652: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12102: \$? = $ac_status" >&5
-+ echo "$as_me:10660: \$? = $ac_status" >&5
+- echo "$as_me:12098: \$? = $ac_status" >&5
++ echo "$as_me:10656: \$? = $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.
-@@ -12112,7 +10670,7 @@
+@@ -12108,7 +10666,7 @@
$RM conftest*
fi
@@ -9466,7 +9468,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -12136,9 +10694,9 @@
+@@ -12132,9 +10690,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -9478,7 +9480,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -12164,7 +10722,7 @@
+@@ -12160,7 +10718,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9487,7 +9489,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -12179,9 +10737,9 @@
+@@ -12175,9 +10733,9 @@
@@ -9499,21 +9501,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12200,11 +10758,11 @@
+@@ -12196,11 +10754,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:12203: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10761: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12199: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10757: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12207: \$? = $ac_status" >&5
-+ echo "$as_me:10765: \$? = $ac_status" >&5
+- echo "$as_me:12203: \$? = $ac_status" >&5
++ echo "$as_me:10761: \$? = $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
-@@ -12226,7 +10784,7 @@
+@@ -12222,7 +10780,7 @@
$RM conftest*
fi
@@ -9522,7 +9524,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12234,9 +10792,9 @@
+@@ -12230,9 +10788,9 @@
@@ -9534,21 +9536,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12255,11 +10813,11 @@
+@@ -12251,11 +10809,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:12258: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10816: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12254: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10812: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12262: \$? = $ac_status" >&5
-+ echo "$as_me:10820: \$? = $ac_status" >&5
+- echo "$as_me:12258: \$? = $ac_status" >&5
++ echo "$as_me:10816: \$? = $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
-@@ -12281,7 +10839,7 @@
+@@ -12277,7 +10835,7 @@
$RM conftest*
fi
@@ -9557,7 +9559,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12290,7 +10848,7 @@
+@@ -12286,7 +10844,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
@@ -9566,7 +9568,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -12298,10 +10856,10 @@
+@@ -12294,10 +10852,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
@@ -9579,7 +9581,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -12314,7 +10872,7 @@
+@@ -12310,7 +10868,7 @@
@@ -9588,7 +9590,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -12374,6 +10932,9 @@
+@@ -12370,6 +10928,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -9598,7 +9600,7 @@
esac
ld_shlibs=yes
-@@ -12395,6 +10956,7 @@
+@@ -12391,6 +10952,7 @@
fi
supports_anon_versioning=no
case `$LD -v 2>&1` in
@@ -9606,7 +9608,7 @@
*\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
*\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-@@ -12486,7 +11048,7 @@
+@@ -12482,7 +11044,7 @@
archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -9615,7 +9617,7 @@
tmp_diet=no
if test "$host_os" = linux-dietlibc; then
case $cc_basename in
-@@ -12556,7 +11118,7 @@
+@@ -12552,7 +11114,7 @@
fi
;;
@@ -9624,7 +9626,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -12731,6 +11293,7 @@
+@@ -12727,6 +11289,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -9632,7 +9634,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12756,11 +11319,7 @@
+@@ -12752,11 +11315,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9645,7 +9647,7 @@
/* end confdefs.h. */
int
-@@ -12771,27 +11330,7 @@
+@@ -12767,27 +11326,7 @@
return 0;
}
_ACEOF
@@ -9674,7 +9676,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12805,16 +11344,9 @@
+@@ -12801,16 +11340,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
@@ -9693,7 +9695,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12827,11 +11359,7 @@
+@@ -12823,11 +11355,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9706,7 +9708,7 @@
/* end confdefs.h. */
int
-@@ -12842,27 +11370,7 @@
+@@ -12838,27 +11366,7 @@
return 0;
}
_ACEOF
@@ -9735,7 +9737,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12876,16 +11384,9 @@
+@@ -12872,16 +11380,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
@@ -9754,7 +9756,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13097,42 +11598,16 @@
+@@ -13093,42 +11594,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -9802,7 +9804,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'
-@@ -13145,7 +11620,7 @@
+@@ -13141,7 +11616,7 @@
link_all_deplibs=yes
;;
@@ -9811,7 +9813,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -13388,7 +11863,7 @@
+@@ -13384,7 +11859,7 @@
fi
fi
@@ -9820,7 +9822,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -13425,16 +11900,16 @@
+@@ -13421,16 +11896,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.
@@ -9841,7 +9843,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -13448,11 +11923,11 @@
+@@ -13444,11 +11919,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -9856,7 +9858,7 @@
then
archive_cmds_need_lc=no
else
-@@ -13463,7 +11938,7 @@
+@@ -13459,7 +11934,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -9865,7 +9867,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -13627,7 +12102,7 @@
+@@ -13623,7 +12098,7 @@
@@ -9874,7 +9876,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -14035,7 +12510,7 @@
+@@ -14031,7 +12506,7 @@
;;
# This must be Linux ELF.
@@ -9883,7 +9885,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -14049,11 +12524,7 @@
+@@ -14045,11 +12520,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -9896,7 +9898,7 @@
/* end confdefs.h. */
int
-@@ -14064,41 +12535,13 @@
+@@ -14060,41 +12531,13 @@
return 0;
}
_ACEOF
@@ -9942,7 +9944,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -14107,13 +12550,10 @@
+@@ -14103,13 +12546,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -9957,7 +9959,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14125,6 +12565,18 @@
+@@ -14121,6 +12561,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9976,7 +9978,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14313,7 +12765,7 @@
+@@ -14309,7 +12761,7 @@
dynamic_linker=no
;;
esac
@@ -9985,7 +9987,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -14415,7 +12867,7 @@
+@@ -14411,7 +12863,7 @@
@@ -9994,7 +9996,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -14440,7 +12892,7 @@
+@@ -14436,7 +12888,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -10003,7 +10005,7 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -14485,18 +12937,14 @@
+@@ -14481,18 +12933,14 @@
darwin*)
# if libdl is installed we need to link against it
@@ -10025,7 +10027,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14514,43 +12962,18 @@
+@@ -14510,43 +12958,18 @@
return 0;
}
_ACEOF
@@ -10075,7 +10077,7 @@
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -14563,106 +12986,18 @@
+@@ -14559,106 +12982,18 @@
;;
*)
@@ -10187,7 +10189,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14680,145 +13015,32 @@
+@@ -14676,145 +13011,32 @@
return 0;
}
_ACEOF
@@ -10347,7 +10349,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14836,57 +13058,28 @@
+@@ -14832,57 +13054,28 @@
return 0;
}
_ACEOF
@@ -10414,7 +10416,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14904,57 +13097,28 @@
+@@ -14900,57 +13093,28 @@
return 0;
}
_ACEOF
@@ -10481,7 +10483,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14972,43 +13136,18 @@
+@@ -14968,43 +13132,18 @@
return 0;
}
_ACEOF
@@ -10531,7 +10533,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -15047,9 +13186,9 @@
+@@ -15043,9 +13182,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -10543,16 +10545,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15058,7 +13197,7 @@
+@@ -15054,7 +13193,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15061 "configure"
-+#line 13200 "configure"
+-#line 15057 "configure"
++#line 13196 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15117,11 +13256,11 @@
+@@ -15113,11 +13252,11 @@
return status;
}
_LT_EOF
@@ -10567,7 +10569,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15138,14 +13277,14 @@
+@@ -15134,14 +13273,14 @@
fi
@@ -10585,16 +10587,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15154,7 +13293,7 @@
+@@ -15150,7 +13289,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15157 "configure"
-+#line 13296 "configure"
+-#line 15153 "configure"
++#line 13292 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15213,11 +13352,11 @@
+@@ -15209,11 +13348,11 @@
return status;
}
_LT_EOF
@@ -10609,7 +10611,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15234,7 +13373,7 @@
+@@ -15230,7 +13369,7 @@
fi
@@ -10618,7 +10620,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -15273,12 +13412,12 @@
+@@ -15269,12 +13408,12 @@
striplib=
old_striplib=
@@ -10633,7 +10635,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -15287,15 +13426,15 @@
+@@ -15283,15 +13422,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -10652,7 +10654,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -15313,12 +13452,12 @@
+@@ -15309,12 +13448,12 @@
# Report which library types will actually be built
@@ -10668,7 +10670,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -15339,14 +13478,14 @@
+@@ -15335,14 +13474,14 @@
fi
;;
esac
@@ -10686,7 +10688,7 @@
$as_echo "$enable_static" >&6; }
-@@ -15487,7 +13626,7 @@
+@@ -15483,7 +13622,7 @@
# Check whether --with-gnu-ld was given.
@@ -10695,7 +10697,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -15496,7 +13635,7 @@
+@@ -15492,7 +13631,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -10704,7 +10706,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -15526,13 +13665,13 @@
+@@ -15522,13 +13661,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -10721,7 +10723,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -15563,18 +13702,16 @@
+@@ -15559,18 +13698,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -10745,7 +10747,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -15587,7 +13724,7 @@
+@@ -15583,7 +13720,7 @@
;;
esac
fi
@@ -10754,7 +10756,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -15642,7 +13779,7 @@
+@@ -15638,7 +13775,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -10763,7 +10765,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -15743,11 +13880,7 @@
+@@ -15739,11 +13876,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -10776,7 +10778,7 @@
/* end confdefs.h. */
int
-@@ -15758,27 +13891,7 @@
+@@ -15754,27 +13887,7 @@
return 0;
}
_ACEOF
@@ -10805,7 +10807,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15792,16 +13905,9 @@
+@@ -15788,16 +13901,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
@@ -10824,7 +10826,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15815,11 +13921,7 @@
+@@ -15811,11 +13917,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10837,7 +10839,7 @@
/* end confdefs.h. */
int
-@@ -15830,27 +13932,7 @@
+@@ -15826,27 +13928,7 @@
return 0;
}
_ACEOF
@@ -10866,7 +10868,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15864,16 +13946,9 @@
+@@ -15860,16 +13942,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
@@ -10885,7 +10887,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16158,7 +14233,7 @@
+@@ -16154,7 +14229,7 @@
inherit_rpath_CXX=yes
;;
@@ -10894,7 +10896,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -16617,7 +14692,7 @@
+@@ -16613,7 +14688,7 @@
;;
esac
@@ -10903,7 +10905,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -16645,11 +14720,11 @@
+@@ -16641,11 +14716,11 @@
};
_LT_EOF
@@ -10918,7 +10920,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -16830,7 +14905,7 @@
+@@ -16826,7 +14901,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -10927,7 +10929,7 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -16986,7 +15061,7 @@
+@@ -16982,7 +15057,7 @@
;;
esac
;;
@@ -10936,7 +10938,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -17050,7 +15125,7 @@
+@@ -17046,7 +15121,7 @@
;;
esac
;;
@@ -10945,7 +10947,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17147,7 +15222,7 @@
+@@ -17143,7 +15218,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -10954,7 +10956,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -17156,9 +15231,9 @@
+@@ -17152,9 +15227,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -10966,21 +10968,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -17174,11 +15249,11 @@
+@@ -17170,11 +15245,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:17177: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15252: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17173: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15248: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17181: \$? = $ac_status" >&5
-+ echo "$as_me:15256: \$? = $ac_status" >&5
+- echo "$as_me:17177: \$? = $ac_status" >&5
++ echo "$as_me:15252: \$? = $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.
-@@ -17191,7 +15266,7 @@
+@@ -17187,7 +15262,7 @@
$RM conftest*
fi
@@ -10989,7 +10991,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -17212,9 +15287,9 @@
+@@ -17208,9 +15283,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\"
@@ -11001,7 +11003,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -17240,7 +15315,7 @@
+@@ -17236,7 +15311,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -11010,7 +11012,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -17252,9 +15327,9 @@
+@@ -17248,9 +15323,9 @@
@@ -11022,21 +11024,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17273,11 +15348,11 @@
+@@ -17269,11 +15344,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:17276: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15351: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17272: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15347: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17280: \$? = $ac_status" >&5
-+ echo "$as_me:15355: \$? = $ac_status" >&5
+- echo "$as_me:17276: \$? = $ac_status" >&5
++ echo "$as_me:15351: \$? = $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
-@@ -17299,14 +15374,14 @@
+@@ -17295,14 +15370,14 @@
$RM conftest*
fi
@@ -11054,21 +11056,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17325,11 +15400,11 @@
+@@ -17321,11 +15396,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:17328: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15403: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17324: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15399: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17332: \$? = $ac_status" >&5
-+ echo "$as_me:15407: \$? = $ac_status" >&5
+- echo "$as_me:17328: \$? = $ac_status" >&5
++ echo "$as_me:15403: \$? = $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
-@@ -17351,7 +15426,7 @@
+@@ -17347,7 +15422,7 @@
$RM conftest*
fi
@@ -11077,7 +11079,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -17360,7 +15435,7 @@
+@@ -17356,7 +15431,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
@@ -11086,7 +11088,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -17368,10 +15443,10 @@
+@@ -17364,10 +15439,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
@@ -11099,7 +11101,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -17381,7 +15456,7 @@
+@@ -17377,7 +15452,7 @@
@@ -11108,7 +11110,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'
-@@ -17401,13 +15476,16 @@
+@@ -17397,13 +15472,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'
;;
@@ -11126,7 +11128,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -17435,16 +15513,16 @@
+@@ -17431,16 +15509,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.
@@ -11147,7 +11149,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -17458,11 +15536,11 @@
+@@ -17454,11 +15532,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -11162,7 +11164,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -17473,7 +15551,7 @@
+@@ -17469,7 +15547,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -11171,7 +11173,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -17544,7 +15622,7 @@
+@@ -17540,7 +15618,7 @@
@@ -11180,7 +11182,7 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -17900,7 +15978,7 @@
+@@ -17896,7 +15974,7 @@
;;
# This must be Linux ELF.
@@ -11189,7 +11191,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17914,11 +15992,7 @@
+@@ -17910,11 +15988,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
@@ -11202,7 +11204,7 @@
/* end confdefs.h. */
int
-@@ -17929,41 +16003,13 @@
+@@ -17925,41 +15999,13 @@
return 0;
}
_ACEOF
@@ -11248,7 +11250,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -17972,13 +16018,10 @@
+@@ -17968,13 +16014,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -11263,7 +11265,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17990,6 +16033,18 @@
+@@ -17986,6 +16029,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11282,7 +11284,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18178,7 +16233,7 @@
+@@ -18174,7 +16229,7 @@
dynamic_linker=no
;;
esac
@@ -11291,7 +11293,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -18229,7 +16284,7 @@
+@@ -18225,7 +16280,7 @@
@@ -11300,7 +11302,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -18254,7 +16309,7 @@
+@@ -18250,7 +16305,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -11309,7 +11311,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -18313,7 +16368,7 @@
+@@ -18309,7 +16364,7 @@
: ${CONFIG_LT=./config.lt}
@@ -11318,7 +11320,7 @@
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
cat >"$CONFIG_LT" <<_LTEOF
#! $SHELL
-@@ -18325,13 +16380,13 @@
+@@ -18321,13 +16376,13 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11336,7 +11338,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -18339,23 +16394,15 @@
+@@ -18335,23 +16390,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -11365,7 +11367,7 @@
as_nl='
'
export as_nl
-@@ -18363,7 +16410,13 @@
+@@ -18359,7 +16406,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
@@ -11380,7 +11382,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -18374,7 +16427,7 @@
+@@ -18370,7 +16423,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -11389,7 +11391,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -18397,13 +16450,6 @@
+@@ -18393,13 +16446,6 @@
}
fi
@@ -11403,7 +11405,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -18413,15 +16459,15 @@
+@@ -18409,15 +16455,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -11422,7 +11424,7 @@
IFS=$as_save_IFS
;;
-@@ -18433,12 +16479,16 @@
+@@ -18429,12 +16475,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -11443,7 +11445,7 @@
done
PS1='$ '
PS2='> '
-@@ -18450,7 +16500,90 @@
+@@ -18446,7 +16496,90 @@
LANGUAGE=C
export LANGUAGE
@@ -11535,7 +11537,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -18464,8 +16597,12 @@
+@@ -18460,8 +16593,12 @@
as_basename=false
fi
@@ -11549,7 +11551,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -18485,77 +16622,25 @@
+@@ -18481,77 +16618,25 @@
}
s/.*/./; q'`
@@ -11638,7 +11640,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -18584,8 +16669,56 @@
+@@ -18580,8 +16665,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -11696,7 +11698,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -18604,10 +16737,10 @@
+@@ -18600,10 +16733,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -11709,16 +11711,16 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -18647,7 +16780,7 @@
+@@ -18643,7 +16776,7 @@
lt_cl_version="\
- totem config.lt 2.28.5
+ totem config.lt 2.29.4
-configured by $0, generated by GNU Autoconf 2.63.
+configured by $0, generated by GNU Autoconf 2.65.
Copyright (C) 2008 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
-@@ -18665,17 +16798,11 @@
+@@ -18661,17 +16794,11 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -11741,7 +11743,7 @@
esac
shift
done
-@@ -19040,7 +17167,7 @@
+@@ -19036,7 +17163,7 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11750,7 +11752,7 @@
$as_echo "$as_me: creating $ofile" >&6;}
-@@ -19844,7 +17971,7 @@
+@@ -19840,7 +17967,7 @@
_LT_EOF
@@ -11759,7 +11761,7 @@
_LTEOF
chmod +x "$CONFIG_LT"
-@@ -19859,7 +17986,7 @@
+@@ -19855,7 +17982,7 @@
exec 5>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
exec 5>>config.log
@@ -11768,7 +11770,7 @@
fi
-@@ -19869,9 +17996,9 @@
+@@ -19865,9 +17992,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
@@ -11780,7 +11782,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -19884,14 +18011,14 @@
+@@ -19880,14 +18007,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11798,7 +11800,7 @@
IFS=$as_save_IFS
;;
-@@ -19899,10 +18026,10 @@
+@@ -19895,10 +18022,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11811,7 +11813,7 @@
$as_echo "no" >&6; }
fi
-@@ -19912,9 +18039,9 @@
+@@ -19908,9 +18035,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
@@ -11823,7 +11825,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -19927,14 +18054,14 @@
+@@ -19923,14 +18050,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11841,7 +11843,7 @@
IFS=$as_save_IFS
;;
-@@ -19942,10 +18069,10 @@
+@@ -19938,10 +18065,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11854,7 +11856,7 @@
$as_echo "no" >&6; }
fi
-@@ -19954,7 +18081,7 @@
+@@ -19950,7 +18077,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11863,7 +11865,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -19967,13 +18094,13 @@
+@@ -19963,13 +18090,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11880,7 +11882,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -19982,9 +18109,9 @@
+@@ -19978,9 +18105,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -11892,7 +11894,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -19997,14 +18124,14 @@
+@@ -19993,14 +18120,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11910,7 +11912,7 @@
IFS=$as_save_IFS
;;
-@@ -20012,19 +18139,19 @@
+@@ -20008,19 +18135,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11934,7 +11936,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -20037,14 +18164,14 @@
+@@ -20033,14 +18160,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11952,7 +11954,7 @@
IFS=$as_save_IFS
;;
-@@ -20052,10 +18179,10 @@
+@@ -20048,10 +18175,10 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -11965,7 +11967,7 @@
$as_echo "no" >&6; }
fi
-@@ -20077,7 +18204,7 @@
+@@ -20073,7 +18200,7 @@
# The full list of plugins
@@ -11974,7 +11976,7 @@
PLUGINDIR='${libdir}/totem/plugins'
-@@ -20088,10 +18215,10 @@
+@@ -20084,10 +18211,10 @@
HAVE_GSTREAMER=no
@@ -11987,7 +11989,7 @@
enableval=$enable_easy_codec_installation;
case "${enableval}" in
yes) enable_easy_codec_installation=yes ;;
-@@ -20106,46 +18233,50 @@
+@@ -20102,46 +18229,50 @@
fi
@@ -12058,7 +12060,7 @@
fi
-@@ -20158,25 +18289,14 @@
+@@ -20154,25 +18285,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12087,7 +12089,7 @@
$MISSING_PLUGINS_PKG_ERRORS
-@@ -20186,22 +18306,11 @@
+@@ -20182,22 +18302,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.
@@ -12113,7 +12115,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20210,19 +18319,16 @@
+@@ -20206,19 +18315,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12136,7 +12138,7 @@
fi
-@@ -20231,40 +18337,44 @@
+@@ -20227,40 +18333,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
@@ -12200,7 +12202,7 @@
fi
-@@ -20277,25 +18387,14 @@
+@@ -20273,25 +18383,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12229,7 +12231,7 @@
$GST_PKG_ERRORS
-@@ -20305,22 +18404,11 @@
+@@ -20301,22 +18400,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.
@@ -12255,7 +12257,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20329,12 +18417,11 @@
+@@ -20325,12 +18413,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12270,7 +12272,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20345,94 +18432,79 @@
+@@ -20341,94 +18428,79 @@
gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
@@ -12387,7 +12389,7 @@
$as_echo "no" >&6; }
fi
-@@ -20453,11 +18525,11 @@
+@@ -20449,11 +18521,11 @@
GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
SMCLIENT_PKGS=
@@ -12401,7 +12403,7 @@
withval=$with_smclient;
else
case "$GDK_TARGET" in
-@@ -20467,46 +18539,50 @@
+@@ -20463,46 +18535,50 @@
esac
fi
@@ -12472,7 +12474,7 @@
fi
-@@ -20519,25 +18595,14 @@
+@@ -20515,25 +18591,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12501,7 +12503,7 @@
$SMCLIENT_PKG_ERRORS
-@@ -20547,22 +18612,11 @@
+@@ -20543,22 +18608,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.
@@ -12527,7 +12529,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20571,19 +18625,16 @@
+@@ -20567,19 +18621,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12550,7 +12552,7 @@
fi
-@@ -20623,21 +18674,22 @@
+@@ -20619,21 +18670,22 @@
pkg_failed=no
@@ -12580,7 +12582,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20647,8 +18699,8 @@
+@@ -20643,8 +18695,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12591,7 +12593,7 @@
pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20660,21 +18712,23 @@
+@@ -20656,21 +18708,23 @@
else
pkg_failed=yes
fi
@@ -12623,7 +12625,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20684,8 +18738,8 @@
+@@ -20680,8 +18734,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12634,7 +12636,7 @@
pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20697,8 +18751,9 @@
+@@ -20693,8 +18747,9 @@
else
pkg_failed=yes
fi
@@ -12646,7 +12648,7 @@
fi
-@@ -20711,46 +18766,28 @@
+@@ -20707,46 +18762,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12698,7 +12700,7 @@
glib-2.0 >= $GLIB_REQS
gio-2.0
gtk+-2.0 >= $GTK_REQS
-@@ -20767,22 +18804,11 @@
+@@ -20763,22 +18800,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.
@@ -12724,7 +12726,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20791,52 +18817,55 @@
+@@ -20787,52 +18813,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12802,7 +12804,7 @@
fi
-@@ -20849,25 +18878,14 @@
+@@ -20845,25 +18874,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12831,7 +12833,7 @@
$MM_PKG_ERRORS
-@@ -20877,22 +18895,11 @@
+@@ -20873,22 +18891,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.
@@ -12857,7 +12859,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20901,52 +18908,55 @@
+@@ -20897,52 +18904,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12935,7 +12937,7 @@
fi
-@@ -20959,25 +18969,14 @@
+@@ -20955,25 +18965,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12964,7 +12966,7 @@
$GTK_PKG_ERRORS
-@@ -20987,22 +18986,11 @@
+@@ -20983,22 +18982,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.
@@ -12990,7 +12992,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -21011,12 +18999,11 @@
+@@ -21007,12 +18995,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13005,7 +13007,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -21026,54 +19013,58 @@
+@@ -21022,54 +19009,58 @@
if test -n "$PKG_CONFIG" && \
@@ -13087,7 +13089,7 @@
fi
-@@ -21086,25 +19077,14 @@
+@@ -21082,25 +19073,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13116,7 +13118,7 @@
$UNIQUE_PKG_ERRORS
-@@ -21114,22 +19094,11 @@
+@@ -21110,22 +19090,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.
@@ -13142,7 +13144,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -21138,24 +19107,23 @@
+@@ -21134,24 +19103,23 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -13171,7 +13173,7 @@
withval=$with_x;
fi
-@@ -21165,10 +19133,8 @@
+@@ -21161,10 +19129,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -13184,7 +13186,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -21216,21 +19182,25 @@
+@@ -21212,21 +19178,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13210,7 +13212,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -21252,37 +19222,14 @@
+@@ -21248,37 +19218,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.
@@ -13250,7 +13252,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -21290,7 +19237,6 @@
+@@ -21286,7 +19233,6 @@
fi
done
fi
@@ -13258,7 +13260,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -21300,11 +19246,7 @@
+@@ -21296,11 +19242,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13271,7 +13273,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -21315,35 +19257,12 @@
+@@ -21311,35 +19253,12 @@
return 0;
}
_ACEOF
@@ -13309,7 +13311,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!
-@@ -21355,10 +19274,8 @@
+@@ -21351,10 +19270,8 @@
done
done
fi
@@ -13322,7 +13324,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -21379,7 +19296,7 @@
+@@ -21375,7 +19292,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -13331,7 +13333,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -21390,7 +19307,7 @@
+@@ -21386,7 +19303,7 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -13340,7 +13342,7 @@
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
-@@ -21408,18 +19325,14 @@
+@@ -21404,18 +19321,14 @@
XTEST_LIBS=""
enable_xtest=no
@@ -13362,7 +13364,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21431,55 +19344,28 @@
+@@ -21427,55 +19340,28 @@
char XTestFakeKeyEvent ();
int
main ()
@@ -13431,7 +13433,7 @@
fi
-@@ -21487,40 +19373,44 @@
+@@ -21483,40 +19369,44 @@
pkg_failed=no
@@ -13495,7 +13497,7 @@
fi
-@@ -21533,14 +19423,14 @@
+@@ -21529,14 +19419,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13513,7 +13515,7 @@
$as_echo "no" >&6; }
have_xvidmode=no
elif test $pkg_failed = untried; then
-@@ -21548,16 +19438,14 @@
+@@ -21544,16 +19434,14 @@
else
XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS
XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS
@@ -13532,7 +13534,7 @@
fi
-@@ -21567,7 +19455,8 @@
+@@ -21563,7 +19451,8 @@
have_xfree=no
@@ -13542,7 +13544,7 @@
#include <X11/XF86keysym.h>
int main(int argc,char **argv) {
-@@ -21575,43 +19464,18 @@
+@@ -21571,43 +19460,18 @@
}
_ACEOF
@@ -13590,7 +13592,7 @@
fi
fi
-@@ -21625,26 +19489,24 @@
+@@ -21621,26 +19485,24 @@
@@ -13622,7 +13624,7 @@
$as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}
fi
fi
-@@ -21656,7 +19518,7 @@
+@@ -21652,7 +19514,7 @@
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
@@ -13631,7 +13633,7 @@
$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
-@@ -21671,22 +19533,19 @@
+@@ -21667,22 +19529,19 @@
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13659,7 +13661,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -21705,13 +19564,12 @@
+@@ -21701,13 +19560,12 @@
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13675,7 +13677,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
-@@ -21719,9 +19577,9 @@
+@@ -21715,9 +19573,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
@@ -13687,7 +13689,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -21734,14 +19592,14 @@
+@@ -21730,14 +19588,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13705,7 +13707,7 @@
IFS=$as_save_IFS
;;
-@@ -21749,10 +19607,10 @@
+@@ -21745,10 +19603,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -13718,7 +13720,7 @@
$as_echo "no" >&6; }
fi
-@@ -21767,14 +19625,14 @@
+@@ -21763,14 +19621,14 @@
else
@@ -13736,7 +13738,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -21786,23 +19644,23 @@
+@@ -21782,23 +19640,23 @@
@@ -13765,7 +13767,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -21821,7 +19679,7 @@
+@@ -21825,7 +19683,7 @@
esac
fi
@@ -13774,7 +13776,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -21830,9 +19688,9 @@
+@@ -21834,9 +19692,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -13786,7 +13788,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -21851,7 +19709,7 @@
+@@ -21863,7 +19721,7 @@
esac
fi
@@ -13795,7 +13797,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -21894,52 +19752,56 @@
+@@ -21905,52 +19763,56 @@
pkg_failed=no
@@ -13873,7 +13875,7 @@
fi
-@@ -21952,30 +19814,28 @@
+@@ -21963,30 +19825,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13912,7 +13914,7 @@
$as_echo "$as_me: WARNING: Disabling python support" >&2;}
fi
-@@ -21983,21 +19843,19 @@
+@@ -21994,21 +19854,19 @@
have_python=no
if test "x$enable_python" = "xyes"; then
@@ -13938,7 +13940,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22007,22 +19865,22 @@
+@@ -22018,22 +19876,22 @@
fi
if test "x$have_python" != "xno"; then
@@ -13967,7 +13969,7 @@
$as_echo "$PYGTK_H2DEF" >&6; }
-@@ -22033,13 +19891,9 @@
+@@ -22044,13 +19902,9 @@
FLAGS="-fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $FLAGS"
@@ -13983,7 +13985,7 @@
/* end confdefs.h. */
int
-@@ -22050,35 +19904,14 @@
+@@ -22061,35 +19915,14 @@
return 0;
}
_ACEOF
@@ -14022,7 +14024,7 @@
$as_echo "$compiler_has_option" >&6; }
if test $compiler_has_option = yes; then
NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-@@ -22089,9 +19922,7 @@
+@@ -22100,9 +19933,7 @@
if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
enable_python=yes
@@ -14033,7 +14035,7 @@
fi
-@@ -22104,54 +19935,58 @@
+@@ -22115,54 +19946,58 @@
fi
@@ -14114,7 +14116,7 @@
fi
-@@ -22164,14 +19999,14 @@
+@@ -22175,14 +20010,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14132,7 +14134,7 @@
$as_echo "no" >&6; }
with_vala=no
elif test $pkg_failed = untried; then
-@@ -22179,7 +20014,7 @@
+@@ -22190,7 +20025,7 @@
else
VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
VALA_LIBS=$pkg_cv_VALA_LIBS
@@ -14141,7 +14143,7 @@
$as_echo "yes" >&6; }
with_vala=yes
fi
-@@ -22187,9 +20022,7 @@
+@@ -22198,9 +20033,7 @@
VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
elif test "x$enable_vala" = "xyes"; then
@@ -14152,7 +14154,7 @@
fi
fi
if test "x$with_vala" = "xyes"; then
-@@ -22208,18 +20041,16 @@
+@@ -22219,18 +20052,16 @@
plugin_error_or_ignore()
{
if test "${error_on_bad_plugin}" = "1" ; then
@@ -14174,7 +14176,7 @@
withval=$with_plugins;
else
with_plugins=autodetect
-@@ -22266,40 +20097,44 @@
+@@ -22277,40 +20108,44 @@
screensaver)
pkg_failed=no
@@ -14238,7 +14240,7 @@
fi
-@@ -22312,25 +20147,14 @@
+@@ -22323,25 +20158,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14267,7 +14269,7 @@
$SCREENSAVER_PKG_ERRORS
-@@ -22340,12 +20164,11 @@
+@@ -22351,12 +20175,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.
@@ -14283,7 +14285,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -22354,22 +20177,11 @@
+@@ -22365,22 +20188,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -14308,7 +14310,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22377,40 +20189,44 @@
+@@ -22388,40 +20200,44 @@
galago)
pkg_failed=no
@@ -14372,7 +14374,7 @@
fi
-@@ -22423,14 +20239,14 @@
+@@ -22434,14 +20250,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14390,7 +14392,7 @@
$as_echo "no" >&6; }
HAVE_LIBGALAGO=no
elif test $pkg_failed = untried; then
-@@ -22438,7 +20254,7 @@
+@@ -22449,7 +20265,7 @@
else
LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS
LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS
@@ -14399,7 +14401,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGALAGO=yes
fi
-@@ -22456,40 +20272,44 @@
+@@ -22467,40 +20283,44 @@
media-player-keys)
pkg_failed=no
@@ -14463,7 +14465,7 @@
fi
-@@ -22502,14 +20322,14 @@
+@@ -22513,14 +20333,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14481,7 +14483,7 @@
$as_echo "no" >&6; }
HAVE_MEDIA_PLAYER_KEYS=no
elif test $pkg_failed = untried; then
-@@ -22517,7 +20337,7 @@
+@@ -22528,7 +20348,7 @@
else
MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS
MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS
@@ -14490,7 +14492,7 @@
$as_echo "yes" >&6; }
HAVE_MEDIA_PLAYER_KEYS=yes
fi
-@@ -22527,18 +20347,14 @@
+@@ -22538,18 +20358,14 @@
fi
;;
lirc)
@@ -14512,7 +14514,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -22556,176 +20372,20 @@
+@@ -22567,176 +20383,20 @@
return 0;
}
_ACEOF
@@ -14697,7 +14699,7 @@
LIRC_LIBS="-llirc_client"
HAVE_LIRC=yes
else
-@@ -22746,40 +20406,123 @@
+@@ -22757,40 +20417,123 @@
mythtv)
pkg_failed=no
@@ -14843,7 +14845,7 @@
fi
-@@ -22792,67 +20535,86 @@
+@@ -22803,67 +20546,86 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14961,7 +14963,7 @@
fi
-@@ -22865,14 +20627,14 @@
+@@ -22876,14 +20638,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14979,7 +14981,7 @@
$as_echo "no" >&6; }
HAVE_BLUEZ=no
elif test $pkg_failed = untried; then
-@@ -22880,7 +20642,7 @@
+@@ -22891,7 +20653,7 @@
else
BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS
BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS
@@ -14988,7 +14990,7 @@
$as_echo "yes" >&6; }
HAVE_BLUEZ=yes
fi
-@@ -22892,40 +20654,44 @@
+@@ -22903,40 +20665,44 @@
publish)
pkg_failed=no
@@ -15052,7 +15054,7 @@
fi
-@@ -22938,14 +20704,14 @@
+@@ -22949,14 +20715,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15070,7 +15072,7 @@
$as_echo "no" >&6; }
HAVE_LIBEPC=no
elif test $pkg_failed = untried; then
-@@ -22953,7 +20719,7 @@
+@@ -22964,7 +20730,7 @@
else
LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
@@ -15079,7 +15081,7 @@
$as_echo "yes" >&6; }
HAVE_LIBEPC=yes
fi
-@@ -22965,40 +20731,44 @@
+@@ -22976,40 +20742,44 @@
tracker)
pkg_failed=no
@@ -15091,20 +15093,20 @@
- pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_CFLAGS"; then
+ pkg_cv_TRACKER_CFLAGS="$TRACKER_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
+ pkg_cv_TRACKER_CFLAGS=`$PKG_CONFIG --cflags "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15118,20 +15120,20 @@
- pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\"") >&5
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\"") >&5
+if test -n "$PKG_CONFIG"; then
+ if test -n "$TRACKER_LIBS"; then
+ pkg_cv_TRACKER_LIBS="$TRACKER_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker >= 0.6 tracker < 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "tracker >= 0.6 tracker < 0.7") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"tracker-client-0.7 >= 0.7.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "tracker-client-0.7 >= 0.7.1") 2>&5
ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker >= 0.6 tracker < 0.7" 2>/dev/null`
+ pkg_cv_TRACKER_LIBS=`$PKG_CONFIG --libs "tracker-client-0.7 >= 0.7.1" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -15143,15 +15145,15 @@
fi
-@@ -23011,14 +20781,14 @@
+@@ -23022,14 +20792,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"`
+- TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tracker-client-0.7 >= 0.7.1" 2>&1`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "tracker-client-0.7 >= 0.7.1"`
else
-- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker >= 0.6 tracker < 0.7" 2>&1`
-+ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker >= 0.6 tracker < 0.7"`
+- TRACKER_PKG_ERRORS=`$PKG_CONFIG --print-errors "tracker-client-0.7 >= 0.7.1" 2>&1`
++ TRACKER_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "tracker-client-0.7 >= 0.7.1"`
fi
# Put the nasty error message in config.log where it belongs
echo "$TRACKER_PKG_ERRORS" >&5
@@ -15161,7 +15163,7 @@
$as_echo "no" >&6; }
HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -23026,7 +20796,7 @@
+@@ -23037,7 +20807,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -15170,7 +15172,7 @@
$as_echo "yes" >&6; }
HAVE_TRACKER=yes
fi
-@@ -23044,40 +20814,44 @@
+@@ -23055,40 +20825,44 @@
thumbnail)
pkg_failed=no
@@ -15234,7 +15236,7 @@
fi
-@@ -23090,14 +20864,14 @@
+@@ -23101,14 +20875,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15252,7 +15254,7 @@
$as_echo "no" >&6; }
HAVE_GLIB_2_15=no
elif test $pkg_failed = untried; then
-@@ -23105,7 +20879,7 @@
+@@ -23116,7 +20890,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -15261,7 +15263,7 @@
$as_echo "yes" >&6; }
HAVE_GLIB_2_15=yes
fi
-@@ -23117,40 +20891,44 @@
+@@ -23128,40 +20902,44 @@
brasero-disc-recorder)
pkg_failed=no
@@ -15325,7 +15327,7 @@
fi
-@@ -23163,14 +20941,14 @@
+@@ -23174,14 +20952,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15343,7 +15345,7 @@
$as_echo "no" >&6; }
BUILD_RECORDER=no
elif test $pkg_failed = untried; then
-@@ -23178,7 +20956,7 @@
+@@ -23189,7 +20967,7 @@
else
DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
@@ -15352,7 +15354,7 @@
$as_echo "yes" >&6; }
BUILD_RECORDER=yes
fi
-@@ -23190,40 +20968,44 @@
+@@ -23201,40 +20979,44 @@
youtube)
pkg_failed=no
@@ -15416,7 +15418,7 @@
fi
-@@ -23236,14 +21018,14 @@
+@@ -23247,14 +21029,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15434,7 +15436,7 @@
$as_echo "no" >&6; }
HAVE_LIBGDATA=no
elif test $pkg_failed = untried; then
-@@ -23251,7 +21033,7 @@
+@@ -23262,7 +21044,7 @@
else
LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
@@ -15443,7 +15445,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGDATA=yes
fi
-@@ -23260,23 +21042,18 @@
+@@ -23271,23 +21053,18 @@
add_plugin="0"
fi
@@ -15472,7 +15474,7 @@
fi
;;
esac
-@@ -23290,9 +21067,9 @@
+@@ -23301,9 +21078,9 @@
ALL_PLUGINS=$allowed_plugins
PLUGINS=$used_plugins2
@@ -15484,7 +15486,7 @@
$as_echo "$PLUGINS" >&6; }
-@@ -23302,24 +21079,22 @@
+@@ -23313,24 +21090,22 @@
# Browser plugins
# ***************
@@ -15513,7 +15515,7 @@
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23327,24 +21102,25 @@
+@@ -23338,24 +21113,25 @@
pkg_failed=no
@@ -15548,7 +15550,7 @@
pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
gio-2.0
x11
-@@ -23352,24 +21128,26 @@
+@@ -23363,24 +21139,26 @@
else
pkg_failed=yes
fi
@@ -15585,7 +15587,7 @@
pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
gio-2.0
x11
-@@ -23377,8 +21155,9 @@
+@@ -23388,8 +21166,9 @@
else
pkg_failed=yes
fi
@@ -15597,7 +15599,7 @@
fi
-@@ -23391,20 +21170,20 @@
+@@ -23402,20 +21181,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15623,7 +15625,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23412,7 +21191,7 @@
+@@ -23423,7 +21202,7 @@
else
BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
@@ -15632,7 +15634,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23422,58 +21201,58 @@
+@@ -23433,58 +21212,58 @@
# Earlier versions misdetect playlists
if test -n "$PKG_CONFIG" && \
@@ -15719,7 +15721,7 @@
fi
-@@ -23486,14 +21265,14 @@
+@@ -23497,14 +21276,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15737,7 +15739,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23501,7 +21280,7 @@
+@@ -23512,7 +21291,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15746,7 +15748,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23509,9 +21288,9 @@
+@@ -23520,9 +21299,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
@@ -15758,7 +15760,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BIND in
-@@ -23525,14 +21304,14 @@
+@@ -23536,14 +21315,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15776,7 +15778,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23541,16 +21320,16 @@
+@@ -23552,16 +21331,16 @@
fi
DBUS_BIND=$ac_cv_path_DBUS_BIND
if test -n "$DBUS_BIND"; then
@@ -15796,7 +15798,7 @@
$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
enable_browser_plugins=no
fi
-@@ -23566,13 +21345,9 @@
+@@ -23577,13 +21356,9 @@
__SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-fno-rtti $CXXFLAGS"
@@ -15812,7 +15814,7 @@
/* end confdefs.h. */
int
-@@ -23583,34 +21358,13 @@
+@@ -23594,34 +21369,13 @@
return 0;
}
_ACEOF
@@ -15850,7 +15852,7 @@
$as_echo "$have_no_rtti_flag" >&6; }
CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23639,64 +21393,64 @@
+@@ -23650,52 +21404,52 @@
if test "$enable_browser_plugins" = "yes"; then
@@ -15869,21 +15871,6 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gmp_plugin" >&5
$as_echo "$enable_gmp_plugin" >&6; }
--{ $as_echo "$as_me:$LINENO: checking whether to enable the Complex browser plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the Complex browser plugin" >&5
- $as_echo_n "checking whether to enable the Complex browser plugin... " >&6; }
- # Check whether --enable-complex-plugin was given.
--if test "${enable_complex_plugin+set}" = set; then
-+if test "${enable_complex_plugin+set}" = set; then :
- enableval=$enable_complex_plugin;
- else
- enable_complex_plugin=no
- fi
-
--{ $as_echo "$as_me:$LINENO: result: $enable_complex_plugin" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_complex_plugin" >&5
- $as_echo "$enable_complex_plugin" >&6; }
-
-{ $as_echo "$as_me:$LINENO: checking whether to enable the NarrowSpace browser plugin" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the NarrowSpace browser plugin" >&5
$as_echo_n "checking whether to enable the NarrowSpace browser plugin... " >&6; }
@@ -15930,7 +15917,7 @@
$as_echo "$enable_cone_plugin" >&6; }
fi
-@@ -23744,13 +21498,11 @@
+@@ -23735,13 +21489,11 @@
# Check whether --enable-nautilus was given.
@@ -15946,7 +15933,7 @@
esac
else
ENABLE_NAUTILUS=yes
-@@ -23759,40 +21511,44 @@
+@@ -23750,40 +21502,44 @@
if test x$ENABLE_NAUTILUS = "xyes" ; then
pkg_failed=no
@@ -16010,7 +15997,7 @@
fi
-@@ -23805,14 +21561,14 @@
+@@ -23796,14 +21552,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16028,7 +16015,7 @@
$as_echo "no" >&6; }
HAVE_NAUTILUS=no
elif test $pkg_failed = untried; then
-@@ -23820,7 +21576,7 @@
+@@ -23811,7 +21567,7 @@
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -16037,7 +16024,7 @@
$as_echo "yes" >&6; }
HAVE_NAUTILUS=yes
fi
-@@ -23828,7 +21584,7 @@
+@@ -23819,7 +21575,7 @@
# Check whether --with-nautilusdir was given.
@@ -16046,7 +16033,7 @@
withval=$with_nautilusdir; ac_with_nautilusdir=$withval
else
ac_with_nautilusdir=""
-@@ -23840,15 +21596,13 @@
+@@ -23831,15 +21587,13 @@
if test x$HAVE_NAUTILUS = "xyes"; then
@@ -16064,7 +16051,7 @@
$as_echo "$as_me: installing nautilus plugin in ${ac_with_nautilusdir}" >&6;}
NAUTILUSDIR=${ac_with_nautilusdir}
-@@ -23865,7 +21619,7 @@
+@@ -23856,7 +21610,7 @@
# Check whether --with-dbus was given.
@@ -16073,7 +16060,7 @@
withval=$with_dbus;
else
with_dbus=auto
-@@ -23874,40 +21628,44 @@
+@@ -23865,40 +21619,44 @@
if test "x$with_dbus" != "xno"; then
pkg_failed=no
@@ -16137,7 +16124,7 @@
fi
-@@ -23920,14 +21678,14 @@
+@@ -23911,14 +21669,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -16155,7 +16142,7 @@
$as_echo "no" >&6; }
enable_dbus=no
elif test $pkg_failed = untried; then
-@@ -23935,20 +21693,16 @@
+@@ -23926,20 +21684,16 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -16179,7 +16166,7 @@
fi
fi
-@@ -23963,9 +21717,9 @@
+@@ -23954,9 +21708,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -16191,7 +16178,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -23978,14 +21732,14 @@
+@@ -23969,14 +21723,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -16209,7 +16196,7 @@
IFS=$as_save_IFS
;;
-@@ -23993,10 +21747,10 @@
+@@ -23984,10 +21738,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -16222,7 +16209,7 @@
$as_echo "no" >&6; }
fi
-@@ -24010,13 +21764,13 @@
+@@ -24001,13 +21755,13 @@
# Check whether --with-gconf-source was given.
@@ -16238,7 +16225,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -24025,22 +21779,20 @@
+@@ -24016,22 +21770,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -16265,7 +16252,7 @@
esac
fi
-@@ -24066,7 +21818,7 @@
+@@ -24057,7 +21809,7 @@
# Check whether --enable-debug was given.
@@ -16274,7 +16261,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -24075,16 +21827,14 @@
+@@ -24066,16 +21818,14 @@
if test x$enable_debug = xyes ; then
@@ -16293,7 +16280,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -24115,13 +21865,9 @@
+@@ -24106,13 +21856,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16309,7 +16296,7 @@
/* end confdefs.h. */
int
-@@ -24132,35 +21878,14 @@
+@@ -24123,35 +21869,14 @@
return 0;
}
_ACEOF
@@ -16348,7 +16335,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -24174,26 +21899,24 @@
+@@ -24165,26 +21890,24 @@
fi
;;
*)
@@ -16380,7 +16367,7 @@
$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; }
complCFLAGS=
if test "x$enable_iso_c" != "xno"; then
-@@ -24208,7 +21931,7 @@
+@@ -24199,7 +21922,7 @@
esac
fi
fi
@@ -16389,7 +16376,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24216,14 +21939,14 @@
+@@ -24207,14 +21930,14 @@
# Check whether --enable-cxx-warnings was given.
@@ -16406,7 +16393,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -24243,18 +21966,18 @@
+@@ -24234,18 +21957,18 @@
fi
fi
fi
@@ -16428,7 +16415,7 @@
$as_echo_n "checking what language compliance flags to pass to the C++ compiler... " >&6; }
complCXXFLAGS=
if test "x$enable_iso_cxx" != "xno"; then
-@@ -24270,7 +21993,7 @@
+@@ -24261,7 +21984,7 @@
esac
fi
fi
@@ -16437,7 +16424,7 @@
$as_echo "$complCXXFLAGS" >&6; }
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-@@ -24291,8 +22014,136 @@
+@@ -24282,8 +22005,136 @@
@@ -16575,7 +16562,7 @@
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -24302,7 +22153,7 @@
+@@ -24293,7 +22144,7 @@
# Check whether --enable-gtk-doc was given.
@@ -16584,7 +16571,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -24311,68 +22162,40 @@
+@@ -24302,68 +22153,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -16671,7 +16658,7 @@
if test x$enable_gtk_doc = xyes; then
-@@ -24383,6 +22206,22 @@
+@@ -24374,6 +22197,22 @@
ENABLE_GTK_DOC_FALSE=
fi
@@ -16694,7 +16681,7 @@
if test -n "$LIBTOOL"; then
GTK_DOC_USE_LIBTOOL_TRUE=
GTK_DOC_USE_LIBTOOL_FALSE='#'
-@@ -24391,6 +22230,14 @@
+@@ -24382,6 +22221,14 @@
GTK_DOC_USE_LIBTOOL_FALSE=
fi
@@ -16709,7 +16696,7 @@
# This macro expands DIR and assigns it to RET.
-@@ -24409,22 +22256,18 @@
+@@ -24400,22 +22247,18 @@
# Check whether --enable-run-in-source-tree was given.
@@ -16735,16 +16722,16 @@
fi
-@@ -24443,7 +22286,7 @@
-
-
-
--ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml"
-+ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bbc/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile help/bg/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml"
+@@ -24434,7 +22277,7 @@
+
+
+
+-ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml"
++ac_config_files="$ac_config_files Makefile totem.spec lib/Makefile src/Makefile src/plugins/Makefile src/plugins/bbc/Makefile src/plugins/bemused/Makefile src/plugins/coherence_upnp/Makefile src/plugins/dbus-service/Makefile src/plugins/screensaver/Makefile src/plugins/screenshot/Makefile src/plugins/ontop/Makefile src/plugins/galago/Makefile src/plugins/gromit/Makefile src/plugins/iplayer/Makefile src/plugins/lirc/Makefile src/plugins/media-player-keys/Makefile src/plugins/mythtv/Makefile src/plugins/opensubtitles/Makefile src/plugins/properties/Makefile src/plugins/sidebar-test/Makefile src/plugins/skipto/Makefile src/plugins/sample-python/Makefile src/plugins/sample-vala/Makefile src/plugins/thumbnail/Makefile src/plugins/totem/Makefile src/plugins/tracker/Makefile src/plugins/youtube/Makefile src/plugins/pythonconsole/Makefile src/plugins/publish/Makefile src/plugins/jamendo/Makefile src/plugins/brasero-disc-recorder/Makefile src/backend/Makefile browser-plugin/Makefile data/Makefile data/totem.desktop.in.in data/icons/Makefile data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/24x24/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile data/icons/scalable/Makefile po/Makefile.in help/Makefile bindings/Makefile bindings/python/Makefile bindings/vala/Makefile docs/Makefile docs/reference/Makefile docs/reference/version.xml"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -24472,13 +22315,13 @@
+@@ -24463,13 +22306,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16760,7 +16747,7 @@
esac ;;
esac
done
-@@ -24486,8 +22329,8 @@
+@@ -24477,8 +22320,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16771,7 +16758,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24510,11 +22353,11 @@
+@@ -24501,11 +22344,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" &&
@@ -16785,7 +16772,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -24534,8 +22377,8 @@
+@@ -24525,8 +22368,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.
@@ -16796,7 +16783,7 @@
done
LIBOBJS=$ac_libobjs
-@@ -24543,11 +22386,8 @@
+@@ -24534,11 +22377,8 @@
if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
@@ -16810,7 +16797,7 @@
fi
if test -n "$EXEEXT"; then
am__EXEEXT_TRUE=
-@@ -24558,185 +22398,126 @@
+@@ -24549,178 +22389,122 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -16950,15 +16937,6 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_GMP_PLUGIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${ENABLE_COMPLEX_PLUGIN_TRUE}" && test -z "${ENABLE_COMPLEX_PLUGIN_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"ENABLE_COMPLEX_PLUGIN\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${ENABLE_NARROWSPACE_PLUGIN_TRUE}" && test -z "${ENABLE_NARROWSPACE_PLUGIN_FALSE}"; then
@@ -17059,7 +17037,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -24746,17 +22527,18 @@
+@@ -24730,17 +22514,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -17085,7 +17063,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -24764,23 +22546,15 @@
+@@ -24748,23 +22533,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -17114,7 +17092,7 @@
as_nl='
'
export as_nl
-@@ -24788,7 +22562,13 @@
+@@ -24772,7 +22549,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
@@ -17129,7 +17107,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -24799,7 +22579,7 @@
+@@ -24783,7 +22566,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -17138,7 +17116,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24822,13 +22602,6 @@
+@@ -24806,13 +22589,6 @@
}
fi
@@ -17152,7 +17130,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -24838,15 +22611,15 @@
+@@ -24822,15 +22598,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -17171,7 +17149,7 @@
IFS=$as_save_IFS
;;
-@@ -24858,12 +22631,16 @@
+@@ -24842,12 +22618,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -17192,7 +17170,7 @@
done
PS1='$ '
PS2='> '
-@@ -24875,7 +22652,89 @@
+@@ -24859,7 +22639,89 @@
LANGUAGE=C
export LANGUAGE
@@ -17283,7 +17261,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -24889,8 +22748,12 @@
+@@ -24873,8 +22735,12 @@
as_basename=false
fi
@@ -17297,7 +17275,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -24910,76 +22773,25 @@
+@@ -24894,76 +22760,25 @@
}
s/.*/./; q'`
@@ -17385,7 +17363,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -25008,8 +22820,56 @@
+@@ -24992,8 +22807,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17443,7 +17421,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -25028,10 +22888,10 @@
+@@ -25012,10 +22875,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17456,7 +17434,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -25046,13 +22906,19 @@
+@@ -25030,13 +22893,19 @@
exec 6>&1
@@ -17472,13 +17450,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.5, which was
+ This file was extended by totem $as_me 2.29.4, which was
-generated by GNU Autoconf 2.63. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25084,13 +22950,15 @@
+@@ -25068,13 +22937,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17497,7 +17475,7 @@
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
-@@ -25109,16 +22977,17 @@
+@@ -25093,16 +22964,17 @@
Configuration commands:
$config_commands
@@ -17508,7 +17486,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
- totem config.status 2.28.5
+ totem config.status 2.29.4
-configured by $0, generated by GNU Autoconf 2.63,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
@@ -17519,7 +17497,7 @@
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25154,6 +23023,8 @@
+@@ -25138,6 +23010,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
@@ -17528,7 +17506,7 @@
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
-@@ -25161,20 +23032,19 @@
+@@ -25145,20 +23019,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17553,7 +17531,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25182,11 +23052,10 @@
+@@ -25166,11 +23039,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -17568,7 +17546,7 @@
ac_need_defaults=false ;;
esac
-@@ -25599,6 +23468,7 @@
+@@ -25583,6 +23455,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" ;;
@@ -17576,7 +17554,7 @@
"src/plugins/bemused/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/bemused/Makefile" ;;
"src/plugins/coherence_upnp/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/coherence_upnp/Makefile" ;;
"src/plugins/dbus-service/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugins/dbus-service/Makefile" ;;
-@@ -25647,9 +23517,7 @@
+@@ -25630,9 +23503,7 @@
"docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17587,7 +17565,7 @@
esac
done
-@@ -25676,7 +23544,7 @@
+@@ -25659,7 +23530,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17596,7 +17574,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -25687,11 +23555,7 @@
+@@ -25670,11 +23541,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17609,7 +17587,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25699,10 +23563,16 @@
+@@ -25682,10 +23549,16 @@
if test -n "$CONFIG_FILES"; then
@@ -17628,7 +17606,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25716,24 +23586,18 @@
+@@ -25699,24 +23572,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17656,7 +17634,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25755,7 +23619,7 @@
+@@ -25738,7 +23605,7 @@
t delim
:nl
h
@@ -17665,7 +17643,7 @@
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
-@@ -25769,7 +23633,7 @@
+@@ -25752,7 +23619,7 @@
t nl
:delim
h
@@ -17674,7 +17652,7 @@
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
-@@ -25822,9 +23686,7 @@
+@@ -25805,9 +23672,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17685,7 +17663,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25865,9 +23727,7 @@
+@@ -25848,9 +23713,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17696,7 +17674,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25952,9 +23812,7 @@
+@@ -25935,9 +23798,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17707,7 +17685,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -25967,9 +23825,7 @@
+@@ -25950,9 +23811,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17718,7 +17696,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25997,12 +23853,10 @@
+@@ -25980,12 +23839,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17733,7 +17711,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -26013,7 +23867,7 @@
+@@ -25996,7 +23853,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17742,7 +17720,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -26026,9 +23880,7 @@
+@@ -26009,9 +23866,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17753,7 +17731,7 @@
esac
;;
esac
-@@ -26056,47 +23908,7 @@
+@@ -26039,47 +23894,7 @@
q
}
s/.*/./; q'`
@@ -17802,7 +17780,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -26153,7 +23965,6 @@
+@@ -26136,7 +23951,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=
@@ -17810,7 +17788,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -26163,12 +23974,11 @@
+@@ -26146,12 +23960,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17825,7 +17803,7 @@
$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -26178,7 +23988,7 @@
+@@ -26161,7 +23974,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17834,7 +17812,7 @@
esac
_ACEOF
-@@ -26207,14 +24017,12 @@
+@@ -26190,14 +24003,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -17851,7 +17829,7 @@
which seems to be undefined. Please make sure it is defined." >&5
$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
-@@ -26224,9 +24032,7 @@
+@@ -26207,9 +24018,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17862,7 +17840,7 @@
;;
:H)
#
-@@ -26237,25 +24043,19 @@
+@@ -26220,25 +24029,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17892,7 +17870,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26293,7 +24093,7 @@
+@@ -26276,7 +24079,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17901,7 +17879,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -26388,47 +24188,7 @@
+@@ -26371,47 +24174,7 @@
q
}
s/.*/./; q'`
@@ -17950,7 +17928,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -27242,9 +25002,7 @@
+@@ -27225,9 +24988,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17961,7 +17939,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -27267,15 +25025,12 @@
+@@ -27250,15 +25011,12 @@
done # for ac_tag
@@ -17979,7 +17957,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27296,37 +25051,37 @@
+@@ -27279,37 +25037,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.
@@ -18027,7 +18005,7 @@
$as_echo "$as_me: Vala binding support disabled" >&6;}
fi
if test "x${PLUGINS}" != "x" ; then
-@@ -27334,112 +25089,112 @@
+@@ -27317,105 +25075,105 @@
for plugin in ${PLUGINS}; do
case ${allowed_plugin} in
${plugin})
@@ -18060,15 +18038,6 @@
- { $as_echo "$as_me:$LINENO: GMP (Windows Media) plugin disabled" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: GMP (Windows Media) plugin disabled" >&5
$as_echo "$as_me: GMP (Windows Media) plugin disabled" >&6;}
- fi
- if test x$enable_complex_plugin = xyes ; then
-- { $as_echo "$as_me:$LINENO: ** Complex (Real) plugin enabled" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: ** Complex (Real) plugin enabled" >&5
- $as_echo "$as_me: ** Complex (Real) plugin enabled" >&6;}
- else
-- { $as_echo "$as_me:$LINENO: Complex (Real) plugin disabled" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: Complex (Real) plugin disabled" >&5
- $as_echo "$as_me: Complex (Real) plugin disabled" >&6;}
fi
if test x$enable_narrowspace_plugin = xyes ; then
- { $as_echo "$as_me:$LINENO: ** NarrowSpace (QuickTime) plugin enabled" >&5
@@ -18170,8 +18139,9 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5
$as_echo "$as_me: End options" >&6;}
---- a/data/icons/16x16/Makefile.in
-+++ b/data/icons/16x16/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/16x16/Makefile.in totem-2.29.4/data/icons/16x16/Makefile.in
+--- totem-2.29.4.old/data/icons/16x16/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/16x16/Makefile.in 2010-01-27 09:57:13.814175206 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18198,8 +18168,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/22x22/Makefile.in
-+++ b/data/icons/22x22/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/22x22/Makefile.in totem-2.29.4/data/icons/22x22/Makefile.in
+--- totem-2.29.4.old/data/icons/22x22/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/22x22/Makefile.in 2010-01-27 09:57:13.914174584 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18226,8 +18197,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/24x24/Makefile.in
-+++ b/data/icons/24x24/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/24x24/Makefile.in totem-2.29.4/data/icons/24x24/Makefile.in
+--- totem-2.29.4.old/data/icons/24x24/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/24x24/Makefile.in 2010-01-27 09:57:14.022175534 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18254,8 +18226,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/32x32/Makefile.in
-+++ b/data/icons/32x32/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/32x32/Makefile.in totem-2.29.4/data/icons/32x32/Makefile.in
+--- totem-2.29.4.old/data/icons/32x32/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/32x32/Makefile.in 2010-01-27 09:57:14.154174841 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18282,8 +18255,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/48x48/Makefile.in
-+++ b/data/icons/48x48/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/48x48/Makefile.in totem-2.29.4/data/icons/48x48/Makefile.in
+--- totem-2.29.4.old/data/icons/48x48/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/48x48/Makefile.in 2010-01-27 09:57:14.278175030 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18310,8 +18284,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/Makefile.in
-+++ b/data/icons/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/Makefile.in totem-2.29.4/data/icons/Makefile.in
+--- totem-2.29.4.old/data/icons/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/icons/Makefile.in 2010-01-27 09:57:14.402177319 +0100
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18338,8 +18313,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/icons/scalable/Makefile.in
-+++ b/data/icons/scalable/Makefile.in
+diff -Naur totem-2.29.4.old/data/icons/scalable/Makefile.in totem-2.29.4/data/icons/scalable/Makefile.in
+--- totem-2.29.4.old/data/icons/scalable/Makefile.in 2010-01-26 14:57:30.000000000 +0100
++++ totem-2.29.4/data/icons/scalable/Makefile.in 2010-01-27 09:57:14.494174770 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18366,8 +18342,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/data/Makefile.in
-+++ b/data/Makefile.in
+diff -Naur totem-2.29.4.old/data/Makefile.in totem-2.29.4/data/Makefile.in
+--- totem-2.29.4.old/data/Makefile.in 2010-01-26 14:57:29.000000000 +0100
++++ totem-2.29.4/data/Makefile.in 2010-01-27 09:57:13.722187115 +0100
@@ -141,6 +141,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18394,8 +18371,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
+diff -Naur totem-2.29.4.old/docs/Makefile.in totem-2.29.4/docs/Makefile.in
+--- totem-2.29.4.old/docs/Makefile.in 2010-01-26 14:57:30.000000000 +0100
++++ totem-2.29.4/docs/Makefile.in 2010-01-27 09:57:14.582174777 +0100
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18422,8 +18400,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/docs/reference/Makefile.in
-+++ b/docs/reference/Makefile.in
+diff -Naur totem-2.29.4.old/docs/reference/Makefile.in totem-2.29.4/docs/reference/Makefile.in
+--- totem-2.29.4.old/docs/reference/Makefile.in 2010-01-26 14:57:30.000000000 +0100
++++ totem-2.29.4/docs/reference/Makefile.in 2010-01-27 09:57:14.726174775 +0100
@@ -76,6 +76,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18450,9 +18429,412 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/help/bg/Makefile.in
-+++ b/help/bg/Makefile.in
-@@ -132,6 +132,8 @@
+@@ -408,10 +413,10 @@
+ $(DEPENDENCY_LIBS)
+
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ @GTK_DOC_USE_LIBTOOL_FALSE at GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+- at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN = sh -c
++ at GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++ at GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_RUN =
+ @GTK_DOC_USE_LIBTOOL_TRUE at GTKDOC_RUN = $(LIBTOOL) --mode=execute
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -430,7 +435,9 @@
+ $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt \
+ version.xml.in
+ DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -445,6 +452,10 @@
+ $(DOC_MODULE)-unused.txt
+
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_FALSE at HTML_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_HTML_TRUE at HTML_BUILD_STAMP = html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_FALSE at PDF_BUILD_STAMP =
++ at ENABLE_GTK_DOC_TRUE@@GTK_DOC_BUILD_PDF_TRUE at PDF_BUILD_STAMP = pdf-build.stamp
+ @ENABLE_GTK_DOC_TRUE at TESTS_ENVIRONMENT = cd $(srcdir) &&
+ @ENABLE_GTK_DOC_TRUE at TESTS = $(GTKDOC_CHECK)
+ all: all-am
+@@ -735,10 +746,10 @@
+ uninstall-local
+
+
+- at ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
++ at ENABLE_GTK_DOC_TRUE@all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ @ENABLE_GTK_DOC_FALSE at all-local:
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -747,9 +758,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -757,7 +768,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -767,23 +778,23 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -793,18 +804,37 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
+- rm -rf $(srcdir)/html
+- mkdir $(srcdir)/html
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+- fi
+- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -814,14 +844,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -841,12 +871,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -863,16 +892,14 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+
+diff -Naur totem-2.29.4.old/gtk-doc.make totem-2.29.4/gtk-doc.make
+--- totem-2.29.4.old/gtk-doc.make 2010-01-26 14:57:14.000000000 +0100
++++ totem-2.29.4/gtk-doc.make 2010-01-27 09:57:05.277176301 +0100
+@@ -5,13 +5,13 @@
+ ####################################
+
+ if GTK_DOC_USE_LIBTOOL
+-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
++GTKDOC_CC = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++GTKDOC_LD = $(LIBTOOL) --tag=CC --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+ GTKDOC_RUN = $(LIBTOOL) --mode=execute
+ else
+ GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS)
+-GTKDOC_RUN = sh -c
++GTKDOC_RUN =
+ endif
+
+ # We set GPATH here; this gives us semantics for GNU make
+@@ -31,7 +31,9 @@
+ $(DOC_MODULE)-overrides.txt
+
+ DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
+- $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
++ pdf-build.stamp \
++ $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp \
++ $(srcdir)/pdf.stamp
+
+ SCANOBJ_FILES = \
+ $(DOC_MODULE).args \
+@@ -48,12 +50,23 @@
+ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_FILES) $(DOC_STAMPS)
+
+ if ENABLE_GTK_DOC
+-all-local: html-build.stamp
++if GTK_DOC_BUILD_HTML
++HTML_BUILD_STAMP=html-build.stamp
++else
++HTML_BUILD_STAMP=
++endif
++if GTK_DOC_BUILD_PDF
++PDF_BUILD_STAMP=pdf-build.stamp
++else
++PDF_BUILD_STAMP=
++endif
++
++all-local: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+ else
+ all-local:
+ endif
+
+-docs: html-build.stamp
++docs: $(HTML_BUILD_STAMP) $(PDF_BUILD_STAMP)
+
+ $(REPORT_FILES): sgml-build.stamp
+
+@@ -62,9 +75,9 @@
+ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
+ @echo 'gtk-doc: Scanning header files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
+- if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
++ @if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
+ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
+ else \
+ cd $(srcdir) ; \
+@@ -72,7 +85,7 @@
+ test -f $$i || touch $$i ; \
+ done \
+ fi
+- touch scan-build.stamp
++ @touch scan-build.stamp
+
+ $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt: scan-build.stamp
+ @true
+@@ -82,24 +95,23 @@
+ tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
+ @echo 'gtk-doc: Rebuilding template files'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
+- touch tmpl-build.stamp
++ @cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
++ @touch tmpl-build.stamp
+
+ tmpl.stamp: tmpl-build.stamp
+ @true
+
+-tmpl/*.sgml:
++$(srcdir)/tmpl/*.sgml:
+ @true
+
+-
+ #### xml ####
+
+-sgml-build.stamp: tmpl.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
++sgml-build.stamp: tmpl.stamp $(DOC_MODULE)-sections.txt $(srcdir)/tmpl/*.sgml $(expand_content_files)
+ @echo 'gtk-doc: Building XML'
+ @-chmod -R u+w $(srcdir)
+- cd $(srcdir) && \
++ @cd $(srcdir) && \
+ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS)
+- touch sgml-build.stamp
++ @touch sgml-build.stamp
+
+ sgml.stamp: sgml-build.stamp
+ @true
+@@ -109,18 +121,37 @@
+ html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
+ @echo 'gtk-doc: Building HTML'
+ @-chmod -R u+w $(srcdir)
+- rm -rf $(srcdir)/html
+- mkdir $(srcdir)/html
+- mkhtml_options=""; \
++ @rm -rf $(srcdir)/html
++ @mkdir $(srcdir)/html
++ @mkhtml_options=""; \
+ gtkdoc-mkhtml 2>&1 --help | grep >/dev/null "\-\-path"; \
+ if test "$(?)" = "0"; then \
+ mkhtml_options=--path="$(srcdir)"; \
+- fi
+- cd $(srcdir)/html && gtkdoc-mkhtml $(mkhtml_options) $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
+- test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
++ fi; \
++ cd $(srcdir)/html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
++ @test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
+ @echo 'gtk-doc: Fixing cross-references'
+- cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+- touch html-build.stamp
++ @cd $(srcdir) && gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
++ @touch html-build.stamp
++
++#### pdf ####
++
++pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
++ @echo 'gtk-doc: Building PDF'
++ @-chmod -R u+w $(srcdir)
++ @rm -rf $(srcdir)/$(DOC_MODULE).pdf
++ @mkpdf_imgdirs=""; \
++ if test "x$(HTML_IMAGES)" != "x"; then \
++ for img in $(HTML_IMAGES); do \
++ part=`dirname $$img`; \
++ echo $$mkpdf_imgdirs | grep >/dev/null "\-\-imgdir=$$part "; \
++ if test $$? != 0; then \
++ mkpdf_imgdirs="$$mkpdf_imgdirs --imgdir=$$part"; \
++ fi; \
++ done; \
++ fi; \
++ cd $(srcdir) && gtkdoc-mkpdf --path="$(abs_srcdir)" $$mkpdf_imgdirs $(DOC_MODULE) $(DOC_MAIN_SGML_FILE) $(MKPDF_OPTIONS)
++ @touch pdf-build.stamp
+
+ ##############
+
+@@ -130,14 +161,14 @@
+
+ distclean-local:
+ cd $(srcdir) && \
+- rm -rf xml $(REPORT_FILES) \
++ rm -rf xml $(REPORT_FILES) $(DOC_MODULE).pdf \
+ $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
+
+ maintainer-clean-local: clean
+ cd $(srcdir) && rm -rf xml html
+
+ install-data-local:
+- installfiles=`echo $(srcdir)/html/*`; \
++ @installfiles=`echo $(srcdir)/html/*`; \
+ if test "$$installfiles" = '$(srcdir)/html/*'; \
+ then echo '-- Nothing to install' ; \
+ else \
+@@ -157,12 +188,11 @@
+ mv -f $${installdir}/$(DOC_MODULE).devhelp \
+ $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
+ fi; \
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
++ $(GTKDOC_REBASE) --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir}; \
+ fi
+
+ uninstall-local:
+- if test -n "$(DOC_MODULE_VERSION)"; then \
++ @if test -n "$(DOC_MODULE_VERSION)"; then \
+ installdir="$(DESTDIR)$(TARGET_DIR)-$(DOC_MODULE_VERSION)"; \
+ else \
+ installdir="$(DESTDIR)$(TARGET_DIR)"; \
+@@ -182,15 +212,13 @@
+
+ dist-hook: dist-check-gtkdoc dist-hook-local
+ mkdir $(distdir)/tmpl
+- mkdir $(distdir)/xml
+ mkdir $(distdir)/html
+ -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
+- -cp $(srcdir)/xml/*.xml $(distdir)/xml
+ cp $(srcdir)/html/* $(distdir)/html
++ -cp $(srcdir)/$(DOC_MODULE).pdf $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
+ -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
+ cd $(distdir) && rm -f $(DISTCLEANFILES)
+- ! which gtkdoc-rebase >/dev/null 2>&1 || \
+- gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
++ $(GTKDOC_REBASE) --online --relative --html-dir=$(distdir)/html
+
+ .PHONY : dist-hook-local docs
+diff -Naur totem-2.29.4.old/help/Makefile.in totem-2.29.4/help/Makefile.in
+--- totem-2.29.4.old/help/Makefile.in 2010-01-26 14:57:30.000000000 +0100
++++ totem-2.29.4/help/Makefile.in 2010-01-27 09:57:14.902175155 +0100
+@@ -92,6 +92,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
@@ -18461,7 +18843,7 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -188,6 +190,8 @@
+@@ -148,6 +150,8 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -18470,7 +18852,7 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-@@ -247,6 +251,7 @@
+@@ -207,6 +211,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18478,36 +18860,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/help/Makefile.in
-+++ b/help/Makefile.in
-@@ -132,6 +132,8 @@
- AUTOHEADER = @AUTOHEADER@
- AUTOMAKE = @AUTOMAKE@
- AWK = @AWK@
-+BBC_CFLAGS = @BBC_CFLAGS@
-+BBC_LIBS = @BBC_LIBS@
- BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
- BEMUSED_LIBS = @BEMUSED_LIBS@
- BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -188,6 +190,8 @@
- GST_CFLAGS = @GST_CFLAGS@
- GST_LIBS = @GST_LIBS@
- GTKDOC_CHECK = @GTKDOC_CHECK@
-+GTKDOC_MKPDF = @GTKDOC_MKPDF@
-+GTKDOC_REBASE = @GTKDOC_REBASE@
- GTK_CFLAGS = @GTK_CFLAGS@
- GTK_LIBS = @GTK_LIBS@
- HELP_DIR = @HELP_DIR@
-@@ -247,6 +251,7 @@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
---- a/lib/Makefile.in
-+++ b/lib/Makefile.in
+diff -Naur totem-2.29.4.old/lib/Makefile.in totem-2.29.4/lib/Makefile.in
+--- totem-2.29.4.old/lib/Makefile.in 2010-01-26 14:57:30.000000000 +0100
++++ totem-2.29.4/lib/Makefile.in 2010-01-27 09:57:15.046175023 +0100
@@ -104,6 +104,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18534,8 +18889,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/ltmain.sh
-+++ b/ltmain.sh
+diff -Naur totem-2.29.4.old/ltmain.sh totem-2.29.4/ltmain.sh
+--- totem-2.29.4.old/ltmain.sh 2010-01-26 14:57:13.000000000 +0100
++++ totem-2.29.4/ltmain.sh 2010-01-27 09:57:03.809176666 +0100
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
@@ -18614,8 +18970,9 @@
esac
;;
no)
---- a/Makefile.in
-+++ b/Makefile.in
+diff -Naur totem-2.29.4.old/Makefile.in totem-2.29.4/Makefile.in
+--- totem-2.29.4.old/Makefile.in 2010-01-26 14:57:37.000000000 +0100
++++ totem-2.29.4/Makefile.in 2010-01-27 09:57:20.025175636 +0100
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18642,8 +18999,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/po/Makefile.in.in
-+++ b/po/Makefile.in.in
+diff -Naur totem-2.29.4.old/po/Makefile.in.in totem-2.29.4/po/Makefile.in.in
+--- totem-2.29.4.old/po/Makefile.in.in 2010-01-26 14:57:14.000000000 +0100
++++ totem-2.29.4/po/Makefile.in.in 2010-01-27 09:57:05.229175017 +0100
@@ -129,7 +129,7 @@
done
@@ -18653,8 +19011,9 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
---- a/src/backend/Makefile.in
-+++ b/src/backend/Makefile.in
+diff -Naur totem-2.29.4.old/src/backend/Makefile.in totem-2.29.4/src/backend/Makefile.in
+--- totem-2.29.4.old/src/backend/Makefile.in 2010-01-26 14:57:31.000000000 +0100
++++ totem-2.29.4/src/backend/Makefile.in 2010-01-27 09:57:15.666174969 +0100
@@ -121,6 +121,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18681,8 +19040,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/Makefile.in
-+++ b/src/Makefile.in
+diff -Naur totem-2.29.4.old/src/Makefile.in totem-2.29.4/src/Makefile.in
+--- totem-2.29.4.old/src/Makefile.in 2010-01-26 14:57:31.000000000 +0100
++++ totem-2.29.4/src/Makefile.in 2010-01-27 09:57:15.486176057 +0100
@@ -343,6 +343,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18709,10 +19069,11 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- /dev/null
-+++ b/src/plugins/bbc/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/bbc/Makefile.in totem-2.29.4/src/plugins/bbc/Makefile.in
+--- totem-2.29.4.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100
++++ totem-2.29.4/src/plugins/bbc/Makefile.in 2010-01-27 09:57:15.966175051 +0100
@@ -0,0 +1,596 @@
-+# Makefile.in generated by automake 1.11 from Makefile.am.
++# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -19308,8 +19669,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:
---- a/src/plugins/bemused/Makefile.in
-+++ b/src/plugins/bemused/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/bemused/Makefile.in totem-2.29.4/src/plugins/bemused/Makefile.in
+--- totem-2.29.4.old/src/plugins/bemused/Makefile.in 2010-01-26 14:57:32.000000000 +0100
++++ totem-2.29.4/src/plugins/bemused/Makefile.in 2010-01-27 09:57:16.214179046 +0100
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19336,8 +19698,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/brasero-disc-recorder/Makefile.in
-+++ b/src/plugins/brasero-disc-recorder/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.29.4/src/plugins/brasero-disc-recorder/Makefile.in
+--- totem-2.29.4.old/src/plugins/brasero-disc-recorder/Makefile.in 2010-01-26 14:57:32.000000000 +0100
++++ totem-2.29.4/src/plugins/brasero-disc-recorder/Makefile.in 2010-01-27 09:57:16.354174496 +0100
@@ -128,6 +128,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19364,8 +19727,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/coherence_upnp/Makefile.in
-+++ b/src/plugins/coherence_upnp/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/coherence_upnp/Makefile.in totem-2.29.4/src/plugins/coherence_upnp/Makefile.in
+--- totem-2.29.4.old/src/plugins/coherence_upnp/Makefile.in 2010-01-26 14:57:32.000000000 +0100
++++ totem-2.29.4/src/plugins/coherence_upnp/Makefile.in 2010-01-27 09:57:16.430174735 +0100
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19392,8 +19756,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/dbus-service/Makefile.in
-+++ b/src/plugins/dbus-service/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/dbus-service/Makefile.in totem-2.29.4/src/plugins/dbus-service/Makefile.in
+--- totem-2.29.4.old/src/plugins/dbus-service/Makefile.in 2010-01-26 14:57:32.000000000 +0100
++++ totem-2.29.4/src/plugins/dbus-service/Makefile.in 2010-01-27 09:57:16.510174988 +0100
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19420,8 +19785,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/galago/Makefile.in
-+++ b/src/plugins/galago/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/galago/Makefile.in totem-2.29.4/src/plugins/galago/Makefile.in
+--- totem-2.29.4.old/src/plugins/galago/Makefile.in 2010-01-26 14:57:32.000000000 +0100
++++ totem-2.29.4/src/plugins/galago/Makefile.in 2010-01-27 09:57:16.606174403 +0100
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19448,8 +19814,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/gromit/Makefile.in
-+++ b/src/plugins/gromit/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/gromit/Makefile.in totem-2.29.4/src/plugins/gromit/Makefile.in
+--- totem-2.29.4.old/src/plugins/gromit/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/gromit/Makefile.in 2010-01-27 09:57:16.762175789 +0100
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19476,8 +19843,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/iplayer/Makefile.in
-+++ b/src/plugins/iplayer/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/iplayer/Makefile.in totem-2.29.4/src/plugins/iplayer/Makefile.in
+--- totem-2.29.4.old/src/plugins/iplayer/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/iplayer/Makefile.in 2010-01-27 09:57:16.866174833 +0100
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19504,8 +19872,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/jamendo/Makefile.in
-+++ b/src/plugins/jamendo/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/jamendo/Makefile.in totem-2.29.4/src/plugins/jamendo/Makefile.in
+--- totem-2.29.4.old/src/plugins/jamendo/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/jamendo/Makefile.in 2010-01-27 09:57:17.066176026 +0100
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19532,8 +19901,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/lirc/Makefile.in
-+++ b/src/plugins/lirc/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/lirc/Makefile.in totem-2.29.4/src/plugins/lirc/Makefile.in
+--- totem-2.29.4.old/src/plugins/lirc/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/lirc/Makefile.in 2010-01-27 09:57:17.249174835 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19560,8 +19930,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/Makefile.in
-+++ b/src/plugins/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/Makefile.in totem-2.29.4/src/plugins/Makefile.in
+--- totem-2.29.4.old/src/plugins/Makefile.in 2010-01-26 14:57:31.000000000 +0100
++++ totem-2.29.4/src/plugins/Makefile.in 2010-01-27 09:57:15.814175067 +0100
@@ -167,6 +167,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19588,8 +19959,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/media-player-keys/Makefile.in
-+++ b/src/plugins/media-player-keys/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/media-player-keys/Makefile.in totem-2.29.4/src/plugins/media-player-keys/Makefile.in
+--- totem-2.29.4.old/src/plugins/media-player-keys/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/media-player-keys/Makefile.in 2010-01-27 09:57:17.425174657 +0100
@@ -130,6 +130,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19616,8 +19988,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/mythtv/Makefile.in
-+++ b/src/plugins/mythtv/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/mythtv/Makefile.in totem-2.29.4/src/plugins/mythtv/Makefile.in
+--- totem-2.29.4.old/src/plugins/mythtv/Makefile.in 2010-01-26 14:57:33.000000000 +0100
++++ totem-2.29.4/src/plugins/mythtv/Makefile.in 2010-01-27 09:57:17.677175669 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19644,8 +20017,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/ontop/Makefile.in
-+++ b/src/plugins/ontop/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/ontop/Makefile.in totem-2.29.4/src/plugins/ontop/Makefile.in
+--- totem-2.29.4.old/src/plugins/ontop/Makefile.in 2010-01-26 14:57:34.000000000 +0100
++++ totem-2.29.4/src/plugins/ontop/Makefile.in 2010-01-27 09:57:17.773175373 +0100
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19672,8 +20046,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/opensubtitles/Makefile.in
-+++ b/src/plugins/opensubtitles/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/opensubtitles/Makefile.in totem-2.29.4/src/plugins/opensubtitles/Makefile.in
+--- totem-2.29.4.old/src/plugins/opensubtitles/Makefile.in 2010-01-26 14:57:34.000000000 +0100
++++ totem-2.29.4/src/plugins/opensubtitles/Makefile.in 2010-01-27 09:57:17.946175791 +0100
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19700,8 +20075,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/properties/Makefile.in
-+++ b/src/plugins/properties/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/properties/Makefile.in totem-2.29.4/src/plugins/properties/Makefile.in
+--- totem-2.29.4.old/src/plugins/properties/Makefile.in 2010-01-26 14:57:34.000000000 +0100
++++ totem-2.29.4/src/plugins/properties/Makefile.in 2010-01-27 09:57:18.206174675 +0100
@@ -137,6 +137,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19728,8 +20104,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/publish/Makefile.in
-+++ b/src/plugins/publish/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/publish/Makefile.in totem-2.29.4/src/plugins/publish/Makefile.in
+--- totem-2.29.4.old/src/plugins/publish/Makefile.in 2010-01-26 14:57:34.000000000 +0100
++++ totem-2.29.4/src/plugins/publish/Makefile.in 2010-01-27 09:57:18.306174679 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19756,8 +20133,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/pythonconsole/Makefile.in
-+++ b/src/plugins/pythonconsole/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/pythonconsole/Makefile.in totem-2.29.4/src/plugins/pythonconsole/Makefile.in
+--- totem-2.29.4.old/src/plugins/pythonconsole/Makefile.in 2010-01-26 14:57:34.000000000 +0100
++++ totem-2.29.4/src/plugins/pythonconsole/Makefile.in 2010-01-27 09:57:18.382174775 +0100
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19784,8 +20162,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/sample-python/Makefile.in
-+++ b/src/plugins/sample-python/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/sample-python/Makefile.in totem-2.29.4/src/plugins/sample-python/Makefile.in
+--- totem-2.29.4.old/src/plugins/sample-python/Makefile.in 2010-01-26 14:57:35.000000000 +0100
++++ totem-2.29.4/src/plugins/sample-python/Makefile.in 2010-01-27 09:57:18.557175023 +0100
@@ -67,6 +67,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19812,9 +20191,10 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/sample-vala/Makefile.in
-+++ b/src/plugins/sample-vala/Makefile.in
-@@ -127,6 +127,8 @@
+diff -Naur totem-2.29.4.old/src/plugins/sample-vala/Makefile.in totem-2.29.4/src/plugins/sample-vala/Makefile.in
+--- totem-2.29.4.old/src/plugins/sample-vala/Makefile.in 2010-01-26 14:57:35.000000000 +0100
++++ totem-2.29.4/src/plugins/sample-vala/Makefile.in 2010-01-27 09:57:18.705177412 +0100
+@@ -129,6 +129,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
@@ -19823,7 +20203,7 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -183,6 +185,8 @@
+@@ -185,6 +187,8 @@
GST_CFLAGS = @GST_CFLAGS@
GST_LIBS = @GST_LIBS@
GTKDOC_CHECK = @GTKDOC_CHECK@
@@ -19832,7 +20212,7 @@
GTK_CFLAGS = @GTK_CFLAGS@
GTK_LIBS = @GTK_LIBS@
HELP_DIR = @HELP_DIR@
-@@ -242,6 +246,7 @@
+@@ -244,6 +248,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19840,8 +20220,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/screensaver/Makefile.in
-+++ b/src/plugins/screensaver/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/screensaver/Makefile.in totem-2.29.4/src/plugins/screensaver/Makefile.in
+--- totem-2.29.4.old/src/plugins/screensaver/Makefile.in 2010-01-26 14:57:35.000000000 +0100
++++ totem-2.29.4/src/plugins/screensaver/Makefile.in 2010-01-27 09:57:18.890176562 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19868,8 +20249,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/screenshot/Makefile.in
-+++ b/src/plugins/screenshot/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/screenshot/Makefile.in totem-2.29.4/src/plugins/screenshot/Makefile.in
+--- totem-2.29.4.old/src/plugins/screenshot/Makefile.in 2010-01-26 14:57:35.000000000 +0100
++++ totem-2.29.4/src/plugins/screenshot/Makefile.in 2010-01-27 09:57:19.197176533 +0100
@@ -131,6 +131,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19896,8 +20278,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/sidebar-test/Makefile.in
-+++ b/src/plugins/sidebar-test/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/sidebar-test/Makefile.in totem-2.29.4/src/plugins/sidebar-test/Makefile.in
+--- totem-2.29.4.old/src/plugins/sidebar-test/Makefile.in 2010-01-26 14:57:35.000000000 +0100
++++ totem-2.29.4/src/plugins/sidebar-test/Makefile.in 2010-01-27 09:57:19.298177083 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19924,8 +20307,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/skipto/Makefile.in
-+++ b/src/plugins/skipto/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/skipto/Makefile.in totem-2.29.4/src/plugins/skipto/Makefile.in
+--- totem-2.29.4.old/src/plugins/skipto/Makefile.in 2010-01-26 14:57:36.000000000 +0100
++++ totem-2.29.4/src/plugins/skipto/Makefile.in 2010-01-27 09:57:19.470175210 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19952,8 +20336,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/thumbnail/Makefile.in
-+++ b/src/plugins/thumbnail/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/thumbnail/Makefile.in totem-2.29.4/src/plugins/thumbnail/Makefile.in
+--- totem-2.29.4.old/src/plugins/thumbnail/Makefile.in 2010-01-26 14:57:36.000000000 +0100
++++ totem-2.29.4/src/plugins/thumbnail/Makefile.in 2010-01-27 09:57:19.566175677 +0100
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19980,8 +20365,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/totem/Makefile.in
-+++ b/src/plugins/totem/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/totem/Makefile.in totem-2.29.4/src/plugins/totem/Makefile.in
+--- totem-2.29.4.old/src/plugins/totem/Makefile.in 2010-01-26 14:57:36.000000000 +0100
++++ totem-2.29.4/src/plugins/totem/Makefile.in 2010-01-27 09:57:19.642174923 +0100
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20008,8 +20394,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/tracker/Makefile.in
-+++ b/src/plugins/tracker/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/tracker/Makefile.in totem-2.29.4/src/plugins/tracker/Makefile.in
+--- totem-2.29.4.old/src/plugins/tracker/Makefile.in 2010-01-26 14:57:36.000000000 +0100
++++ totem-2.29.4/src/plugins/tracker/Makefile.in 2010-01-27 09:57:19.746175361 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20036,8 +20423,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/src/plugins/youtube/Makefile.in
-+++ b/src/plugins/youtube/Makefile.in
+diff -Naur totem-2.29.4.old/src/plugins/youtube/Makefile.in totem-2.29.4/src/plugins/youtube/Makefile.in
+--- totem-2.29.4.old/src/plugins/youtube/Makefile.in 2010-01-26 14:57:36.000000000 +0100
++++ totem-2.29.4/src/plugins/youtube/Makefile.in 2010-01-27 09:57:19.846175224 +0100
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -20064,313 +20452,3 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
---- a/config.guess
-+++ b/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
-
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@
- arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- eval $set_cc_for_build
- if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-- | grep __ELF__ >/dev/null
-+ | grep -q __ELF__
- then
- # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- # Return netbsd for either. FIX?
-@@ -656,7 +656,7 @@
- # => hppa64-hp-hpux11.23
-
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-- grep __LP64__ >/dev/null
-+ grep -q __LP64__
- then
- HP_ARCH="hppa2.0w"
- else
-@@ -822,6 +822,9 @@
- [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- echo i${UNAME_MACHINE}-pc-mks
- exit ;;
-+ 8664:Windows_NT:*)
-+ echo x86_64-pc-mks
-+ exit ;;
- i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- # How do we know it's Interix rather than the generic POSIX subsystem?
- # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@
- m68*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit ;;
-- mips:Linux:*:*)
-+ mips:Linux:*:* | mips64:Linux:*:*)
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #undef CPU
-- #undef mips
-- #undef mipsel
-+ #undef ${UNAME_MACHINE}
-+ #undef ${UNAME_MACHINE}el
- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mipsel
-+ CPU=${UNAME_MACHINE}el
- #else
- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips
-- #else
-- CPU=
-- #endif
-- #endif
--EOF
-- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-- /^CPU/{
-- s: ::g
-- p
-- }'`"
-- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-- ;;
-- mips64:Linux:*:*)
-- eval $set_cc_for_build
-- sed 's/^ //' << EOF >$dummy.c
-- #undef CPU
-- #undef mips64
-- #undef mips64el
-- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-- CPU=mips64el
-- #else
-- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-- CPU=mips64
-+ CPU=${UNAME_MACHINE}
- #else
- CPU=
- #endif
-@@ -947,7 +927,7 @@
- EV67) UNAME_MACHINE=alphaev67 ;;
- EV68*) UNAME_MACHINE=alphaev68 ;;
- esac
-- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+ objdump --private-headers /bin/sh | grep -q ld.so.1
- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit ;;
-@@ -1001,14 +981,6 @@
- elf32-i386)
- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- ;;
-- a.out-i386-linux)
-- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-- exit ;;
-- "")
-- # Either a pre-BFD a.out linker (linux-gnuoldld) or
-- # one that does not give us useful --help.
-- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-- exit ;;
- esac
- # Determine whether the default compiler is a.out or elf
- eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@
- i*86:syllable:*:*)
- echo ${UNAME_MACHINE}-pc-syllable
- exit ;;
-- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- echo i386-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@
- rs6000:LynxOS:2.*:*)
- echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit ;;
-- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit ;;
- SM[BE]S:UNIX_SV:*:*)
---- /dev/null
-+++ b/config.h.in~
-@@ -0,0 +1,122 @@
-+/* config.h.in. Generated from configure.in by autoheader. */
-+
-+/* Define to build the browser plugin */
-+#undef ENABLE_BROWSER_PLUGINS
-+
-+/* Whether we can and want to do installation of missing plugins */
-+#undef ENABLE_MISSING_PLUGIN_INSTALLATION
-+
-+/* always defined to indicate that i18n is enabled */
-+#undef ENABLE_NLS
-+
-+/* Define to compile with python plugin support */
-+#undef ENABLE_PYTHON
-+
-+/* Define to the Gettext package name */
-+#undef GETTEXT_PACKAGE
-+
-+/* Enable additional debugging at the expense of performance and size */
-+#undef GNOME_ENABLE_DEBUG
-+
-+/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-+#undef HAVE_BIND_TEXTDOMAIN_CODESET
-+
-+/* Define to 1 if you have the `dcgettext' function. */
-+#undef HAVE_DCGETTEXT
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#undef HAVE_DLFCN_H
-+
-+/* Define if the GNU gettext() function is already present or preinstalled. */
-+#undef HAVE_GETTEXT
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define if your <locale.h> file defines LC_MESSAGES. */
-+#undef HAVE_LC_MESSAGES
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* defined if you build the nautilus plugin */
-+#undef HAVE_NAUTILUS
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* defined if you have X11/XF86keysym.h */
-+#undef HAVE_XFREE
-+
-+/* defined if you have XTest library */
-+#undef HAVE_XTEST
-+
-+/* Define this if you have the XVidMode and XRandR extension installed */
-+#undef HAVE_XVIDMODE
-+
-+/* ISO codes prefix */
-+#undef ISO_CODES_PREFIX
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+ */
-+#undef LT_OBJDIR
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
-+/* Define to the version of this package. */
-+#undef PACKAGE_VERSION
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* enable search for UI files and plugins in local directory */
-+#undef TOTEM_RUN_IN_SOURCE_TREE
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Define if D-BUS is enabled */
-+#undef WITH_DBUS
-+
-+/* Define if smclient is enabled */
-+#undef WITH_SMCLIENT
---- a/config.sub
-+++ b/config.sub
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- # Free Software Foundation, Inc.
-
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
-
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@
- os=
- basic_machine=$1
- ;;
-+ -bluegene*)
-+ os=-cnk
-+ ;;
- -sim | -cisco | -oki | -wec | -winbond)
- os=
- basic_machine=$1
-@@ -467,6 +470,10 @@
- basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- os=-linux
- ;;
-+ bluegene*)
-+ basic_machine=powerpc-ibm
-+ os=-cnk
-+ ;;
- c90)
- basic_machine=c90-cray
- os=-unicos
-@@ -1260,7 +1267,7 @@
- # Each alternative MUST END IN A *, to match a version number.
- # -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -kopensolaris* \
- | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@
- -sunos*)
- vendor=sun
- ;;
-- -aix*)
-+ -cnk*|-aix*)
- vendor=ibm
- ;;
- -beos*)
Modified: desktop/experimental/totem/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/rules?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/rules [utf-8] (original)
+++ desktop/experimental/totem/debian/rules [utf-8] Wed Jan 27 08:59:17 2010
@@ -9,13 +9,13 @@
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_CONFIGURE_EXTRA_FLAGS += \
--enable-vala=no \
--disable-run-in-source-tree \
- --disable-scrollkeeper \
- --enable-complex-plugin
+ --disable-scrollkeeper
DEB_DH_STRIP_ARGS := --dbg-package=totem-dbg
Modified: desktop/experimental/totem/debian/totem-mozilla.links
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/totem/debian/totem-mozilla.links?rev=22871&op=diff
==============================================================================
--- desktop/experimental/totem/debian/totem-mozilla.links [utf-8] (original)
+++ desktop/experimental/totem/debian/totem-mozilla.links [utf-8] Wed Jan 27 08:59:17 2010
@@ -1,4 +1,3 @@
-/usr/lib/mozilla/libtotem-complex-plugin.so /usr/lib/iceweasel/plugins/libtotem-complex-plugin.so
/usr/lib/mozilla/libtotem-cone-plugin.so /usr/lib/iceweasel/plugins/libtotem-cone-plugin.so
/usr/lib/mozilla/libtotem-gmp-plugin.so /usr/lib/iceweasel/plugins/libtotem-gmp-plugin.so
/usr/lib/mozilla/libtotem-mully-plugin.so /usr/lib/iceweasel/plugins/libtotem-mully-plugin.so
More information about the pkg-gnome-commits
mailing list