r22679 - in /desktop/unstable/totem/debian: changelog control control.in patches/70_bbc_plugin.patch patches/90_autotools.patch watch
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Dec 22 23:41:01 UTC 2009
Author: pochu
Date: Tue Dec 22 23:41:01 2009
New Revision: 22679
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22679
Log:
* New upstream bugfix release.
- debian/patches/90_autotools.patch,
debian/patches/70_bbc_plugin.patch:
+ Refreshed for the new version.
* debian/control.in:
- Don't build depend on libbluetooth-dev on Hurd.
* debian/watch:
- Only track stable releases.
Modified:
desktop/unstable/totem/debian/changelog
desktop/unstable/totem/debian/control
desktop/unstable/totem/debian/control.in
desktop/unstable/totem/debian/patches/70_bbc_plugin.patch
desktop/unstable/totem/debian/patches/90_autotools.patch
desktop/unstable/totem/debian/watch
Modified: desktop/unstable/totem/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/changelog?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/changelog [utf-8] (original)
+++ desktop/unstable/totem/debian/changelog [utf-8] Tue Dec 22 23:41:01 2009
@@ -1,3 +1,16 @@
+totem (2.28.5-1) unstable; urgency=low
+
+ * New upstream bugfix release.
+ - debian/patches/90_autotools.patch,
+ debian/patches/70_bbc_plugin.patch:
+ + Refreshed for the new version.
+ * debian/control.in:
+ - Don't build depend on libbluetooth-dev on Hurd.
+ * debian/watch:
+ - Only track stable releases.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Wed, 23 Dec 2009 00:35:07 +0100
+
totem (2.28.4-1) unstable; urgency=low
[ Sebastian Dröge ]
Modified: desktop/unstable/totem/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control [utf-8] (original)
+++ desktop/unstable/totem/debian/control [utf-8] Tue Dec 22 23:41:01 2009
@@ -7,7 +7,7 @@
Section: video
Priority: optional
Maintainer: Sebastien Bacher <seb128 at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 5.0.51~),
cdbs,
quilt,
@@ -55,7 +55,7 @@
python-gst0.10-dev (>= 0.10.11),
python-xdg,
python-rdflib,
- libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libgalago-dev (>= 0.5.2),
libgdata-dev (>= 0.4.0)
Standards-Version: 3.8.3
Modified: desktop/unstable/totem/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/control.in?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/control.in [utf-8] (original)
+++ desktop/unstable/totem/debian/control.in [utf-8] Tue Dec 22 23:41:01 2009
@@ -50,7 +50,7 @@
python-gst0.10-dev (>= 0.10.11),
python-xdg,
python-rdflib,
- libbluetooth-dev [!kfreebsd-i386 !kfreebsd-amd64],
+ libbluetooth-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
libgalago-dev (>= 0.5.2),
libgdata-dev (>= 0.4.0)
Standards-Version: 3.8.3
Modified: desktop/unstable/totem/debian/patches/70_bbc_plugin.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/70_bbc_plugin.patch?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/70_bbc_plugin.patch [utf-8] Tue Dec 22 23:41:01 2009
@@ -1,5 +1,3 @@
-diff --git a/bindings/python/totem.defs b/bindings/python/totem.defs
-index 059b400..33aaf49 100644
--- a/bindings/python/totem.defs
+++ b/bindings/python/totem.defs
@@ -206,6 +206,16 @@
@@ -19,11 +17,9 @@
(define-method action_stop
(of-object "TotemObject")
(c-name "totem_action_stop")
-diff --git a/configure.in b/configure.in
-index d6f24e5..b9d12d7 100644
--- a/configure.in
+++ b/configure.in
-@@ -50,7 +50,7 @@ AC_SUBST(TOTEM_VERSION_MINOR)
+@@ -52,7 +52,7 @@
AC_SUBST(TOTEM_VERSION_MICRO)
# The full list of plugins
@@ -32,7 +28,7 @@
PLUGINDIR='${libdir}/totem/plugins'
AC_SUBST(PLUGINDIR)
-@@ -564,6 +564,32 @@ for plugin in ${used_plugins}; do
+@@ -513,6 +513,32 @@
add_plugin="0"
fi
;;
@@ -65,17 +61,14 @@
bemused)
PKG_CHECK_MODULES(BEMUSED, bluez, [HAVE_BLUEZ=yes], [HAVE_BLUEZ=no])
if test "${HAVE_BLUEZ}" != "yes" ; then
-@@ -852,6 +882,7 @@ totem.spec
+@@ -818,6 +844,7 @@
lib/Makefile
src/Makefile
src/plugins/Makefile
+src/plugins/bbc/Makefile
src/plugins/bemused/Makefile
src/plugins/coherence_upnp/Makefile
- src/plugins/screensaver/Makefile
-diff --git a/src/plugins/bbc/Makefile.am b/src/plugins/bbc/Makefile.am
-new file mode 100644
-index 0000000..f733dd2
+ src/plugins/dbus-service/Makefile
--- /dev/null
+++ b/src/plugins/bbc/Makefile.am
@@ -0,0 +1,26 @@
@@ -105,9 +98,6 @@
+ echo
+
+
-diff --git a/src/plugins/bbc/bbc.py b/src/plugins/bbc/bbc.py
-new file mode 100644
-index 0000000..b2e546b
--- /dev/null
+++ b/src/plugins/bbc/bbc.py
@@ -0,0 +1,95 @@
@@ -206,9 +196,6 @@
+ else:
+ gst.error('No uri for episode ' + episode.title)
+
-diff --git a/src/plugins/bbc/bbc.totem-plugin.in b/src/plugins/bbc/bbc.totem-plugin.in
-new file mode 100644
-index 0000000..69c4995
--- /dev/null
+++ b/src/plugins/bbc/bbc.totem-plugin.in
@@ -0,0 +1,9 @@
@@ -221,9 +208,6 @@
+Authors=Tim-Philipp Müller <tim.muller at collabora.co.uk>
+Copyright=Copyright © 2008 Tim-Philipp Müller and Canonical Ltd.
+Website=http://www.gnome.org/projects/totem/
-diff --git a/src/plugins/bbc/contentview.py b/src/plugins/bbc/contentview.py
-new file mode 100644
-index 0000000..03cab0a
--- /dev/null
+++ b/src/plugins/bbc/contentview.py
@@ -0,0 +1,1019 @@
@@ -1246,9 +1230,6 @@
+ window.show_all()
+ gtk.main()
+
-diff --git a/src/plugins/bbc/genres.py b/src/plugins/bbc/genres.py
-new file mode 100644
-index 0000000..4d8d3b7
--- /dev/null
+++ b/src/plugins/bbc/genres.py
@@ -0,0 +1,251 @@
@@ -1503,9 +1484,6 @@
+if __name__ == "__main__":
+ pass
+
-diff --git a/src/plugins/bbc/installablecodecs.py b/src/plugins/bbc/installablecodecs.py
-new file mode 100644
-index 0000000..6b60a77
--- /dev/null
+++ b/src/plugins/bbc/installablecodecs.py
@@ -0,0 +1,112 @@
Modified: desktop/unstable/totem/debian/patches/90_autotools.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/patches/90_autotools.patch?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] (original)
+++ desktop/unstable/totem/debian/patches/90_autotools.patch [utf-8] Tue Dec 22 23:41:01 2009
@@ -1,18 +1,74 @@
-diff -Naur totem-2.28.4.old/aclocal.m4 totem-2.28.4/aclocal.m4
---- totem-2.28.4.old/aclocal.m4 2009-11-19 16:01:11.000000000 +0100
-+++ totem-2.28.4/aclocal.m4 2009-11-20 08:53:49.000000000 +0100
+--- a/aclocal.m4
++++ b/aclocal.m4
@@ -13,8 +13,8 @@
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
-[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],,
-+[m4_warning([this file was generated for autoconf 2.64.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
++[m4_warning([this file was generated for autoconf 2.65.
You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -3447,13 +3447,10 @@
+@@ -757,6 +757,12 @@
+ [
+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++
++ dnl check for tools we added during development
++ AC_PATH_PROG([GTKDOC_CHECK],[gtkdoc-check])
++ AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true])
++ AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf])
++
+ dnl for overriding the documentation installation directory
+ AC_ARG_WITH([html-dir],
+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
+@@ -775,16 +781,32 @@
+ [PKG_CHECK_EXISTS([gtk-doc],,
+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
+ [PKG_CHECK_EXISTS([gtk-doc >= $1],,
+- AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))])
++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+ fi
+
+ AC_MSG_CHECKING([whether to build gtk-doc documentation])
+ AC_MSG_RESULT($enable_gtk_doc)
+
+- AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,)
++ dnl enable/disable output formats
++ AC_ARG_ENABLE([gtk-doc-html],
++ AS_HELP_STRING([--enable-gtk-doc-html],
++ [build documentation in html format [[default=yes]]]),,
++ [enable_gtk_doc_html=yes])
++ AC_ARG_ENABLE([gtk-doc-pdf],
++ AS_HELP_STRING([--enable-gtk-doc-pdf],
++ [build documentation in pdf format [[default=no]]]),,
++ [enable_gtk_doc_pdf=no])
++
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
++
+
+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes])
++ AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes])
+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"])
++ AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"])
+ ])
+
+
+@@ -3422,7 +3444,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -3447,13 +3469,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -27,7 +83,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -3465,6 +3462,18 @@
+@@ -3465,6 +3484,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -46,7 +102,12 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -4056,7 +4065,7 @@
+@@ -4052,11 +4083,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -55,7 +116,16 @@
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
-@@ -4737,7 +4746,7 @@
+@@ -4673,7 +4704,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -4737,7 +4768,7 @@
;;
esac
;;
@@ -64,7 +134,16 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -5162,6 +5171,9 @@
+@@ -4957,7 +4988,7 @@
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -5162,6 +5193,9 @@
cygwin* | mingw* | cegcc*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -74,7 +153,7 @@
*)
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5226,6 +5238,9 @@
+@@ -5226,6 +5260,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -84,7 +163,24 @@
esac
_LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -5408,7 +5423,7 @@
+@@ -5247,6 +5284,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -5338,7 +5376,7 @@
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -5408,7 +5446,7 @@
fi
;;
@@ -93,7 +189,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -5583,6 +5598,7 @@
+@@ -5583,6 +5621,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -101,7 +197,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -5821,7 +5837,7 @@
+@@ -5821,7 +5860,7 @@
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -110,7 +206,16 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -9030,14 +9046,16 @@
+@@ -6817,7 +6856,7 @@
+ _LT_TAGVAR(inherit_rpath, $1)=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -9030,14 +9069,16 @@
# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
# ---------------------------------------------
m4_define([_PKG_CONFIG],
@@ -135,7 +240,7 @@
fi[]dnl
])# _PKG_CONFIG
-@@ -9081,9 +9099,9 @@
+@@ -9081,9 +9122,9 @@
if test $pkg_failed = yes; then
_PKG_SHORT_ERRORS_SUPPORTED
if test $_pkg_short_errors_supported = yes; then
@@ -147,9 +252,8 @@
fi
# Put the nasty error message in config.log where it belongs
echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-diff -Naur totem-2.28.4.old/bindings/Makefile.in totem-2.28.4/bindings/Makefile.in
---- totem-2.28.4.old/bindings/Makefile.in 2009-11-19 16:01:15.000000000 +0100
-+++ totem-2.28.4/bindings/Makefile.in 2009-11-20 08:53:52.000000000 +0100
+--- a/bindings/Makefile.in
++++ b/bindings/Makefile.in
@@ -109,6 +109,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -159,7 +263,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -224,6 +226,7 @@
+@@ -165,6 +167,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@
+@@ -224,6 +228,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -167,9 +280,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/bindings/python/Makefile.in totem-2.28.4/bindings/python/Makefile.in
---- totem-2.28.4.old/bindings/python/Makefile.in 2009-11-19 16:01:15.000000000 +0100
-+++ totem-2.28.4/bindings/python/Makefile.in 2009-11-20 08:53:52.000000000 +0100
+--- a/bindings/python/Makefile.in
++++ b/bindings/python/Makefile.in
@@ -106,6 +106,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -179,7 +291,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -221,6 +223,7 @@
+@@ -162,6 +164,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@
+@@ -221,6 +225,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -187,9 +308,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/bindings/vala/Makefile.in totem-2.28.4/bindings/vala/Makefile.in
---- totem-2.28.4.old/bindings/vala/Makefile.in 2009-11-19 16:01:15.000000000 +0100
-+++ totem-2.28.4/bindings/vala/Makefile.in 2009-11-20 08:53:52.000000000 +0100
+--- a/bindings/vala/Makefile.in
++++ b/bindings/vala/Makefile.in
@@ -70,6 +70,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -199,7 +319,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -185,6 +187,7 @@
+@@ -126,6 +128,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@
+@@ -185,6 +189,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -207,9 +336,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/browser-plugin/Makefile.in totem-2.28.4/browser-plugin/Makefile.in
---- totem-2.28.4.old/browser-plugin/Makefile.in 2009-11-19 16:01:16.000000000 +0100
-+++ totem-2.28.4/browser-plugin/Makefile.in 2009-11-20 08:53:53.000000000 +0100
+--- a/browser-plugin/Makefile.in
++++ b/browser-plugin/Makefile.in
@@ -333,6 +333,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -219,7 +347,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -448,6 +450,7 @@
+@@ -389,6 +391,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@
+@@ -448,6 +452,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -227,9 +364,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/config.h.in totem-2.28.4/config.h.in
---- totem-2.28.4.old/config.h.in 2009-11-19 16:01:46.000000000 +0100
-+++ totem-2.28.4/config.h.in 2009-11-20 08:53:51.000000000 +0100
+--- a/config.h.in
++++ b/config.h.in
@@ -100,6 +100,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
@@ -240,21 +376,22 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
-diff -Naur totem-2.28.4.old/configure totem-2.28.4/configure
---- totem-2.28.4.old/configure 2009-11-19 16:01:26.000000000 +0100
-+++ totem-2.28.4/configure 2009-11-20 08:53:50.000000000 +0100
-@@ -1,20 +1,22 @@
+--- a/configure
++++ b/configure
+@@ -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.4.
-+# Generated by GNU Autoconf 2.64 for totem 2.28.4.
+-# Generated by GNU Autoconf 2.63 for totem 2.28.5.
++# Generated by GNU Autoconf 2.65 for totem 2.28.5.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=totem>.
#
++#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-+# Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
+#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -272,7 +409,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +24,15 @@
+@@ -22,23 +26,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -301,7 +438,7 @@
as_nl='
'
export as_nl
-@@ -46,7 +40,13 @@
+@@ -46,7 +42,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
@@ -316,7 +453,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -57,7 +57,7 @@
+@@ -57,7 +59,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -325,7 +462,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +80,6 @@
+@@ -80,13 +82,6 @@
}
fi
@@ -339,7 +476,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -96,15 +89,15 @@
+@@ -96,15 +91,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -358,7 +495,7 @@
IFS=$as_save_IFS
;;
-@@ -116,12 +109,16 @@
+@@ -116,12 +111,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -379,7 +516,7 @@
done
PS1='$ '
PS2='> '
-@@ -133,330 +130,301 @@
+@@ -133,330 +132,301 @@
LANGUAGE=C
export LANGUAGE
@@ -481,6 +618,18 @@
-
-if as_func_ret_success; then
- :
+-else
+- exitcode=1
+- echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+- exitcode=1
+- echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+- :
+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
@@ -500,23 +649,11 @@
+ as_have_required=yes
else
- exitcode=1
-- echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
-- exitcode=1
-- echo as_func_ret_failure succeeded.
+- echo positional parameters were not saved.
+ as_have_required=no
fi
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
-- :
- else
-- exitcode=1
-- echo positional parameters were not saved.
--fi
--
-test \$exitcode = 0) || { (exit 1); exit 1; }
-
-(
@@ -526,7 +663,7 @@
- test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
-") 2> /dev/null; then
- :
--else
+ else
- as_candidate_shells=
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -715,7 +852,7 @@
+# Unset more variables known to interfere with behavior of common tools.
+CLICOLOR_FORCE= GREP_OPTIONS=
+unset CLICOLOR_FORCE GREP_OPTIONS
-
++
+## --------------------- ##
+## M4sh Shell Functions. ##
+## --------------------- ##
@@ -751,7 +888,7 @@
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
-+
+
+ case $as_dir in #(
+ -*) as_dir=./$as_dir;;
+ esac
@@ -957,7 +1094,7 @@
sed -n '
p
/[$]LINENO/=
-@@ -473,8 +441,7 @@
+@@ -473,8 +443,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
@@ -967,7 +1104,7 @@
# Don't try to exec as it changes $[0], causing all sort of problems
# (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +451,18 @@
+@@ -484,29 +453,18 @@
exit
}
@@ -1002,7 +1139,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -536,7 +492,7 @@
+@@ -536,7 +494,7 @@
rmdir conf$$.dir 2>/dev/null
if mkdir -p . 2>/dev/null; then
@@ -1011,7 +1148,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -555,10 +511,10 @@
+@@ -555,10 +513,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -1024,7 +1161,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -573,7 +529,6 @@
+@@ -573,7 +531,6 @@
@@ -1032,7 +1169,17 @@
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -740,7 +695,6 @@
+@@ -722,7 +679,8 @@
+
+
+
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -740,7 +698,6 @@
subdirs=
MFLAGS=
MAKEFLAGS=
@@ -1040,15 +1187,37 @@
# Identity of this package.
PACKAGE_NAME='totem'
-@@ -748,6 +702,7 @@
- PACKAGE_VERSION='2.28.4'
- PACKAGE_STRING='totem 2.28.4'
+@@ -748,6 +705,7 @@
+ PACKAGE_VERSION='2.28.5'
+ PACKAGE_STRING='totem 2.28.5'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=totem'
+PACKAGE_URL=''
ac_unique_file="src/totem.c"
# Factoring default headers for most tests.
-@@ -852,6 +807,8 @@
+@@ -795,12 +753,20 @@
+ AM_CFLAGS
+ AM_CPPFLAGS
+ FULL_LIBEXECDIR
++GTK_DOC_USE_REBASE_FALSE
++GTK_DOC_USE_REBASE_TRUE
+ GTK_DOC_USE_LIBTOOL_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
++GTK_DOC_BUILD_PDF_FALSE
++GTK_DOC_BUILD_PDF_TRUE
++GTK_DOC_BUILD_HTML_FALSE
++GTK_DOC_BUILD_HTML_TRUE
+ ENABLE_GTK_DOC_FALSE
+ ENABLE_GTK_DOC_TRUE
+-GTKDOC_CHECK
+ HTML_DIR
++GTKDOC_MKPDF
++GTKDOC_REBASE
++GTKDOC_CHECK
+ DISABLE_DEPRECATED
+ WARN_CXXFLAGS
+ WARN_CFLAGS
+@@ -849,6 +815,8 @@
LIBEPC_CFLAGS
BEMUSED_LIBS
BEMUSED_CFLAGS
@@ -1057,7 +1226,7 @@
GMYTH_LIBS
GMYTH_CFLAGS
LIRC_LIBS
-@@ -1080,6 +1037,7 @@
+@@ -1080,6 +1048,7 @@
program_transform_name
prefix
exec_prefix
@@ -1065,7 +1234,16 @@
PACKAGE_BUGREPORT
PACKAGE_STRING
PACKAGE_VERSION
-@@ -1174,6 +1132,8 @@
+@@ -1130,6 +1099,8 @@
+ enable_iso_cxx
+ with_html_dir
+ enable_gtk_doc
++enable_gtk_doc_html
++enable_gtk_doc_pdf
+ enable_run_in_source_tree
+ '
+ ac_precious_vars='build_alias
+@@ -1175,6 +1146,8 @@
MEDIA_PLAYER_KEYS_LIBS
GMYTH_CFLAGS
GMYTH_LIBS
@@ -1074,7 +1252,7 @@
BEMUSED_CFLAGS
BEMUSED_LIBS
LIBEPC_CFLAGS
-@@ -1301,8 +1261,7 @@
+@@ -1302,8 +1275,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 &&
@@ -1084,7 +1262,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1328,8 +1287,7 @@
+@@ -1329,8 +1301,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 &&
@@ -1094,7 +1272,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1533,8 +1491,7 @@
+@@ -1534,8 +1505,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 &&
@@ -1104,7 +1282,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1550,8 +1507,7 @@
+@@ -1551,8 +1521,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 &&
@@ -1114,7 +1292,7 @@
ac_useropt_orig=$ac_useropt
ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
case $ac_user_opts in
-@@ -1581,17 +1537,17 @@
+@@ -1582,17 +1551,17 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
@@ -1138,7 +1316,7 @@
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
-@@ -1608,15 +1564,13 @@
+@@ -1609,15 +1578,13 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
@@ -1156,7 +1334,7 @@
*) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
esac
fi
-@@ -1639,8 +1593,7 @@
+@@ -1640,8 +1607,7 @@
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
@@ -1166,7 +1344,7 @@
done
# There might be people who depend on the old broken behavior: `$host'
-@@ -1670,11 +1623,9 @@
+@@ -1671,11 +1637,9 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -1180,7 +1358,7 @@
# Find the source files, if location was not specified.
-@@ -1713,13 +1664,11 @@
+@@ -1714,13 +1678,11 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
@@ -1196,7 +1374,27 @@
pwd)`
# When building in place, set srcdir=.
if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1952,6 +1901,8 @@
+@@ -1868,7 +1830,9 @@
+ Turn on compiler warnings.
+
+ --enable-iso-cxx Try to warn if code is not ISO C++
+- --enable-gtk-doc use gtk-doc to build documentation [default=no]
++ --enable-gtk-doc use gtk-doc to build documentation [[default=no]]
++ --enable-gtk-doc-html build documentation in html format [[default=yes]]
++ --enable-gtk-doc-pdf build documentation in pdf format [[default=no]]
+ --disable-run-in-source-tree
+ disable search for UI files and plugins in local
+ directory
+@@ -1901,7 +1865,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>
+- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+ you have headers in a nonstandard directory <include dir>
+ CPP C preprocessor
+ PKG_CONFIG path to pkg-config utility
+@@ -1954,6 +1918,8 @@
GMYTH_CFLAGS
C compiler flags for GMYTH, overriding pkg-config
GMYTH_LIBS linker flags for GMYTH, overriding pkg-config
@@ -1205,50 +1403,21 @@
BEMUSED_CFLAGS
C compiler flags for BEMUSED, overriding pkg-config
BEMUSED_LIBS
-@@ -2034,40 +1985,518 @@
- esac
- ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-
-- cd "$ac_dir" || { ac_status=$?; continue; }
-- # Check for guested configure.
-- if test -f "$ac_srcdir/configure.gnu"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-- elif test -f "$ac_srcdir/configure"; then
-- echo &&
-- $SHELL "$ac_srcdir/configure" --help=recursive
-- else
-- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-- fi || ac_status=$?
-- cd "$ac_pwd" || { ac_status=$?; break; }
-- done
-+ cd "$ac_dir" || { ac_status=$?; continue; }
-+ # Check for guested configure.
-+ if test -f "$ac_srcdir/configure.gnu"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+ elif test -f "$ac_srcdir/configure"; then
-+ echo &&
-+ $SHELL "$ac_srcdir/configure" --help=recursive
-+ else
-+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+ fi || ac_status=$?
-+ cd "$ac_pwd" || { ac_status=$?; break; }
-+ done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+ cat <<\_ACEOF
-+totem configure 2.28.4
-+generated by GNU Autoconf 2.64
-+
+@@ -2055,21 +2021,499 @@
+ if $ac_init_version; then
+ cat <<\_ACEOF
+ totem configure 2.28.5
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.65
+
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+ exit
-+fi
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+ exit
+ fi
+
+## ------------------------ ##
+## Autoconf initialization. ##
@@ -1288,7 +1457,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_compile
+
@@ -1325,7 +1494,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_cpp
+
@@ -1367,7 +1536,7 @@
+fi
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_run
+
@@ -1537,7 +1706,7 @@
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_c_try_link
+
@@ -1642,7 +1811,7 @@
+ ac_retval=1
+fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_compile
+
@@ -1677,23 +1846,12 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
- fi
++fi
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
-
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
-- cat <<\_ACEOF
--totem configure 2.28.4
--generated by GNU Autoconf 2.63
++ as_fn_set_status $ac_retval
++
+} # ac_fn_cxx_try_cpp
-
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
--_ACEOF
-- exit
++
+# ac_fn_cxx_try_link LINENO
+# -------------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
@@ -1729,27 +1887,27 @@
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_retval=1
- fi
++fi
+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
+ # interfere with the next link command; also delete a directory that is
+ # left behind by Apple's compiler. We do this before executing the actions.
+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+ return $ac_retval
++ as_fn_set_status $ac_retval
+
+} # ac_fn_cxx_try_link
cat >config.log <<_ACEOF
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.4, which was
+ It was created by totem $as_me 2.28.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
-@@ -2103,8 +2532,8 @@
+@@ -2105,8 +2549,8 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -1760,7 +1918,7 @@
IFS=$as_save_IFS
} >&5
-@@ -2141,9 +2570,9 @@
+@@ -2143,9 +2587,9 @@
ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
@@ -1772,7 +1930,7 @@
if test $ac_must_keep_next = true; then
ac_must_keep_next=false # Got value, back to normal.
else
-@@ -2159,13 +2588,13 @@
+@@ -2161,13 +2605,13 @@
-* ) ac_must_keep_next=true ;;
esac
fi
@@ -1789,7 +1947,7 @@
# When interrupted or exit'd, cleanup temporary files, and complete
# config.log. We remove comments because anyway the quotes in there
-@@ -2190,13 +2619,13 @@
+@@ -2192,13 +2636,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -1805,7 +1963,7 @@
esac ;;
esac
done
-@@ -2268,39 +2697,41 @@
+@@ -2270,39 +2714,41 @@
exit $exit_status
' 0
for ac_signal in 1 2 13 15; do
@@ -1852,25 +2010,33 @@
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
-@@ -2319,7 +2750,7 @@
+@@ -2320,8 +2766,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+- if test -r "$ac_site_file"; then
- { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
-@@ -2330,7 +2761,7 @@
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+@@ -2329,10 +2775,10 @@
+ done
+
+ if test -r "$cache_file"; then
+- # Some versions of bash will fail to source /dev/null (special
+- # files actually), so we avoid doing that.
+- if test -f "$cache_file"; then
- { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++ # Some versions of bash will fail to source /dev/null (special files
++ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
++ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -2338,7 +2769,7 @@
+@@ -2340,7 +2786,7 @@
esac
fi
else
@@ -1879,7 +2045,7 @@
$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
-@@ -2353,11 +2784,11 @@
+@@ -2355,11 +2801,11 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
@@ -1893,7 +2059,7 @@
$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
-@@ -2367,17 +2798,17 @@
+@@ -2369,17 +2815,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
@@ -1915,7 +2081,7 @@
$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
-@@ -2389,43 +2820,20 @@
+@@ -2391,67 +2837,44 @@
esac
case " $ac_configure_args " in
*" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy.
@@ -1936,37 +2102,76 @@
- { (exit 1); exit 1; }; }
+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
fi
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
+## -------------------- ##
+## Main body of script. ##
+## -------------------- ##
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -2443,24 +2851,16 @@
++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"
+
+
+
++{ $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.
++if test "${enable_maintainer_mode+set}" = set; then :
++ enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
++else
++ USE_MAINTAINER_MODE=no
++fi
+
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-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"
+-
+-
+-
+-{ $as_echo "$as_me:$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.
+-if test "${enable_maintainer_mode+set}" = set; then
+- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+-else
+- USE_MAINTAINER_MODE=no
+-fi
+-
+- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+ $as_echo "$USE_MAINTAINER_MODE" >&6; }
+ if test $USE_MAINTAINER_MODE = yes; then
+ MAINTAINER_MODE_TRUE=
+@@ -2468,24 +2891,16 @@
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -1999,7 +2204,7 @@
fi
# These three variables are undocumented and unsupported,
-@@ -2486,10 +2886,10 @@
+@@ -2511,10 +2926,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.
@@ -2012,7 +2217,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2497,11 +2897,11 @@
+@@ -2522,11 +2937,11 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2028,7 +2233,7 @@
/usr/ucb/* ) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2538,7 +2938,7 @@
+@@ -2563,7 +2978,7 @@
;;
esac
@@ -2037,7 +2242,7 @@
IFS=$as_save_IFS
rm -rf conftest.one conftest.two conftest.dir
-@@ -2554,7 +2954,7 @@
+@@ -2579,7 +2994,7 @@
INSTALL=$ac_install_sh
fi
fi
@@ -2046,7 +2251,7 @@
$as_echo "$INSTALL" >&6; }
# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2565,7 +2965,7 @@
+@@ -2590,7 +3005,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -2055,7 +2260,7 @@
$as_echo_n "checking whether build environment is sane... " >&6; }
# Just in case
sleep 1
-@@ -2576,15 +2976,11 @@
+@@ -2601,15 +3016,11 @@
'
case `pwd` in
*[\\\"\#\$\&\'\`$am_lf]*)
@@ -2073,7 +2278,7 @@
esac
# Do `set' in a subshell so we don't clobber the current shell's
-@@ -2606,11 +3002,8 @@
+@@ -2631,11 +3042,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".
@@ -2087,7 +2292,7 @@
fi
test "$2" = conftest.file
-@@ -2619,13 +3012,10 @@
+@@ -2644,13 +3052,10 @@
# Ok.
:
else
@@ -2104,7 +2309,7 @@
$as_echo "yes" >&6; }
test "$program_prefix" != NONE &&
program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2653,7 +3043,7 @@
+@@ -2678,7 +3083,7 @@
am_missing_run="$MISSING --run "
else
am_missing_run=
@@ -2113,7 +2318,7 @@
$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-@@ -2674,9 +3064,9 @@
+@@ -2699,9 +3104,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
@@ -2125,7 +2330,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -2687,24 +3077,24 @@
+@@ -2712,24 +3117,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2155,7 +2360,7 @@
$as_echo "no" >&6; }
fi
-@@ -2714,9 +3104,9 @@
+@@ -2739,9 +3144,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
@@ -2167,7 +2372,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -2727,24 +3117,24 @@
+@@ -2752,24 +3157,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2197,7 +2402,7 @@
$as_echo "no" >&6; }
fi
-@@ -2753,7 +3143,7 @@
+@@ -2778,7 +3183,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2206,7 +2411,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -2766,10 +3156,10 @@
+@@ -2791,10 +3196,10 @@
fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
@@ -2219,7 +2424,7 @@
$as_echo_n "(cached) " >&6
else
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2777,7 +3167,7 @@
+@@ -2802,7 +3207,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2228,7 +2433,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 #(
-@@ -2789,7 +3179,7 @@
+@@ -2814,11 +3219,12 @@
esac
done
done
@@ -2237,7 +2442,16 @@
IFS=$as_save_IFS
fi
-@@ -2805,7 +3195,7 @@
+
++ test -d ./--version && rmdir ./--version
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
+ else
+@@ -2826,11 +3232,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.
+- test -d ./--version && rmdir ./--version
MKDIR_P="$ac_install_sh -d"
fi
fi
@@ -2246,7 +2460,7 @@
$as_echo "$MKDIR_P" >&6; }
mkdir_p="$MKDIR_P"
-@@ -2818,9 +3208,9 @@
+@@ -2843,9 +3248,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
@@ -2258,7 +2472,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AWK"; then
-@@ -2831,24 +3221,24 @@
+@@ -2856,24 +3261,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2288,7 +2502,7 @@
$as_echo "no" >&6; }
fi
-@@ -2856,11 +3246,11 @@
+@@ -2881,11 +3286,11 @@
test -n "$AWK" && break
done
@@ -2302,7 +2516,7 @@
$as_echo_n "(cached) " >&6
else
cat >conftest.make <<\_ACEOF
-@@ -2878,11 +3268,11 @@
+@@ -2903,11 +3308,11 @@
rm -f conftest.make
fi
if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
@@ -2316,7 +2530,7 @@
$as_echo "no" >&6; }
SET_MAKE="MAKE=${MAKE-make}"
fi
-@@ -2902,9 +3292,7 @@
+@@ -2927,9 +3332,7 @@
am__isrc=' -I$(srcdir)'
# test to see if srcdir already configured
if test -f $srcdir/config.status; then
@@ -2327,7 +2541,7 @@
fi
fi
-@@ -2963,7 +3351,7 @@
+@@ -2988,7 +3391,7 @@
# Enable silent build when available (Automake 1.11)
# Check whether --enable-silent-rules was given.
@@ -2336,7 +2550,7 @@
enableval=$enable_silent_rules;
fi
-@@ -2994,7 +3382,7 @@
+@@ -3019,7 +3422,7 @@
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
@@ -2345,7 +2559,7 @@
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
-@@ -3022,12 +3410,12 @@
+@@ -3047,12 +3450,12 @@
fi
@@ -2360,7 +2574,7 @@
enableval=$enable_dependency_tracking;
fi
-@@ -3052,9 +3440,9 @@
+@@ -3077,9 +3480,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
@@ -2372,7 +2586,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3065,24 +3453,24 @@
+@@ -3090,24 +3493,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2402,7 +2616,7 @@
$as_echo "no" >&6; }
fi
-@@ -3092,9 +3480,9 @@
+@@ -3117,9 +3520,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
@@ -2414,7 +2628,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3105,24 +3493,24 @@
+@@ -3130,24 +3533,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2444,7 +2658,7 @@
$as_echo "no" >&6; }
fi
-@@ -3131,7 +3519,7 @@
+@@ -3156,7 +3559,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2453,7 +2667,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3145,9 +3533,9 @@
+@@ -3170,9 +3573,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
@@ -2465,7 +2679,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3158,24 +3546,24 @@
+@@ -3183,24 +3586,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2495,7 +2709,7 @@
$as_echo "no" >&6; }
fi
-@@ -3185,9 +3573,9 @@
+@@ -3210,9 +3613,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
@@ -2507,7 +2721,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3199,18 +3587,18 @@
+@@ -3224,18 +3627,18 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2529,7 +2743,7 @@
IFS=$as_save_IFS
if test $ac_prog_rejected = yes; then
-@@ -3229,10 +3617,10 @@
+@@ -3254,10 +3657,10 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
@@ -2542,7 +2756,7 @@
$as_echo "no" >&6; }
fi
-@@ -3244,9 +3632,9 @@
+@@ -3269,9 +3672,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
@@ -2554,7 +2768,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
-@@ -3257,24 +3645,24 @@
+@@ -3282,24 +3685,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2584,7 +2798,7 @@
$as_echo "no" >&6; }
fi
-@@ -3288,9 +3676,9 @@
+@@ -3313,9 +3716,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
@@ -2596,7 +2810,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
-@@ -3301,24 +3689,24 @@
+@@ -3326,24 +3729,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -2626,7 +2840,7 @@
$as_echo "no" >&6; }
fi
-@@ -3331,7 +3719,7 @@
+@@ -3356,7 +3759,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -2635,7 +2849,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -3342,73 +3730,55 @@
+@@ -3367,57 +3770,37 @@
fi
@@ -2698,8 +2912,8 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
@@ -2711,30 +2925,20 @@
-cat >>conftest.$ac_ext <<_ACEOF
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
--
-+#include <stdio.h>
+
int
- main ()
- {
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-
- ;
- return 0;
- }
- _ACEOF
- ac_clean_files_save=$ac_clean_files
--ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+@@ -3433,8 +3816,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.
-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
- $as_echo_n "checking for C compiler default output file name... " >&6; }
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-@@ -3425,17 +3795,17 @@
+ # The possible output files:
+@@ -3450,17 +3833,17 @@
done
rm -f $ac_rmfiles
@@ -2757,7 +2961,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,
-@@ -3452,7 +3822,7 @@
+@@ -3477,7 +3860,7 @@
# certainly right.
break;;
*.* )
@@ -2766,17 +2970,19 @@
then :; else
ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
fi
-@@ -3471,84 +3841,75 @@
+@@ -3496,84 +3879,42 @@
else
ac_file=''
fi
-
-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
- $as_echo "$ac_file" >&6; }
+-$as_echo "$ac_file" >&6; }
-if test -z "$ac_file"; then
+- $as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
@@ -2790,70 +2996,64 @@
+{ as_fn_set_status 77
+as_fn_error "C compiler cannot create executables
+See \`config.log' for more details." "$LINENO" 5; }; }
- fi
--
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
- $as_echo_n "checking whether the C compiler works... " >&6; }
+-$as_echo_n "checking whether the C compiler works... " >&6; }
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
- # If not cross compiling, check that we can run a simple program.
- if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+- if { ac_try='./$ac_file'
- { (case "(($ac_try" in
-+ { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
- esac
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
+- (eval "$ac_try") 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
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
+- cross_compiling=no
+- else
+- if test "$cross_compiling" = maybe; then
+- cross_compiling=yes
+- else
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
-+as_fn_error "cannot run C compiled programs.
- If you meant to cross compile, use \`--host'.
+-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-$as_echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
- fi
+- fi
+- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-
--rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
- # Check that the compiler produces executables we can run. If not, either
- # the compiler is broken, or we cross compile.
+-# Check that the compiler produces executables we can run. If not, either
+-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
- $as_echo_n "checking whether we are cross compiling... " >&6; }
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
- $as_echo "$cross_compiling" >&6; }
-
+-$as_echo "$cross_compiling" >&6; }
+-
-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
@@ -2876,7 +3076,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
-@@ -3563,32 +3924,24 @@
+@@ -3588,32 +3929,83 @@
esac
done
else
@@ -2892,8 +3092,9 @@
+See \`config.log' for more details." "$LINENO" 5; }
fi
-
- rm -f conftest$ac_cv_exeext
+-rm -f conftest$ac_cv_exeext
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
@@ -2901,6 +3102,65 @@
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++ ;
++ return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run. If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++ { { ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_link") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }
++ if { ac_try='./conftest$ac_cv_exeext'
++ { { case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++ (eval "$ac_try") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; }; then
++ cross_compiling=no
++ else
++ if test "$cross_compiling" = maybe; then
++ cross_compiling=yes
++ else
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++ fi
++ fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then
@@ -2916,7 +3176,7 @@
/* end confdefs.h. */
int
-@@ -3600,17 +3953,17 @@
+@@ -3625,17 +4017,17 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -2939,7 +3199,7 @@
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
-@@ -3623,31 +3976,23 @@
+@@ -3648,31 +4040,23 @@
$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2978,7 +3238,7 @@
/* end confdefs.h. */
int
-@@ -3661,37 +4006,16 @@
+@@ -3686,37 +4070,16 @@
return 0;
}
_ACEOF
@@ -3019,7 +3279,7 @@
$as_echo "$ac_cv_c_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GCC=yes
-@@ -3700,20 +4024,16 @@
+@@ -3725,20 +4088,16 @@
fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
@@ -3043,7 +3303,7 @@
/* end confdefs.h. */
int
-@@ -3724,35 +4044,11 @@
+@@ -3749,35 +4108,11 @@
return 0;
}
_ACEOF
@@ -3082,7 +3342,7 @@
/* end confdefs.h. */
int
-@@ -3763,36 +4059,12 @@
+@@ -3788,36 +4123,12 @@
return 0;
}
_ACEOF
@@ -3123,7 +3383,7 @@
/* end confdefs.h. */
int
-@@ -3803,42 +4075,17 @@
+@@ -3828,42 +4139,17 @@
return 0;
}
_ACEOF
@@ -3168,7 +3428,7 @@
$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
-@@ -3855,18 +4102,14 @@
+@@ -3880,18 +4166,14 @@
CFLAGS=
fi
fi
@@ -3190,7 +3450,7 @@
/* end confdefs.h. */
#include <stdarg.h>
#include <stdio.h>
-@@ -3923,32 +4166,9 @@
+@@ -3948,32 +4230,9 @@
-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
do
CC="$ac_save_CC $ac_arg"
@@ -3224,7 +3484,7 @@
rm -f core conftest.err conftest.$ac_objext
test "x$ac_cv_prog_cc_c89" != "xno" && break
done
-@@ -3959,17 +4179,19 @@
+@@ -3984,17 +4243,19 @@
# AC_CACHE_VAL
case "x$ac_cv_prog_cc_c89" in
x)
@@ -3247,7 +3507,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -3979,9 +4201,9 @@
+@@ -4004,9 +4265,9 @@
depcc="$CC" am_compiler_list=
@@ -3259,7 +3519,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -4089,7 +4311,7 @@
+@@ -4114,7 +4375,7 @@
fi
fi
@@ -3268,7 +3528,7 @@
$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -4110,14 +4332,14 @@
+@@ -4135,14 +4396,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
@@ -3285,7 +3545,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
-@@ -4132,11 +4354,7 @@
+@@ -4157,11 +4418,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.
@@ -3298,7 +3558,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4145,78 +4363,34 @@
+@@ -4170,78 +4427,34 @@
#endif
Syntax error
_ACEOF
@@ -3382,7 +3642,7 @@
break
fi
-@@ -4228,7 +4402,7 @@
+@@ -4253,7 +4466,7 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -3391,7 +3651,7 @@
$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
-@@ -4239,11 +4413,7 @@
+@@ -4264,11 +4477,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.
@@ -3404,7 +3664,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -4252,87 +4422,40 @@
+@@ -4277,87 +4486,40 @@
#endif
Syntax error
_ACEOF
@@ -3448,7 +3708,7 @@
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <ac_nonexistent.h>
--_ACEOF
+ _ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -3466,7 +3726,6 @@
- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
- test ! -s conftest.err
- }; then
-+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"; then :
# Broken: success on invalid input.
continue
@@ -3502,7 +3761,7 @@
fi
ac_ext=c
-@@ -4342,9 +4465,9 @@
+@@ -4367,9 +4529,9 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -3514,7 +3773,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$GREP"; then
-@@ -4355,7 +4478,7 @@
+@@ -4380,7 +4542,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3523,7 +3782,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
-@@ -4375,7 +4498,7 @@
+@@ -4400,7 +4562,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
@@ -3532,7 +3791,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"
-@@ -4390,26 +4513,24 @@
+@@ -4415,26 +4577,24 @@
$ac_path_GREP_found && break 3
done
done
@@ -3564,7 +3823,7 @@
$as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -4423,7 +4544,7 @@
+@@ -4448,7 +4608,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -3573,7 +3832,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
-@@ -4443,7 +4564,7 @@
+@@ -4468,7 +4628,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
@@ -3582,7 +3841,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"
-@@ -4458,12 +4579,10 @@
+@@ -4483,12 +4643,10 @@
$ac_path_EGREP_found && break 3
done
done
@@ -3597,7 +3856,7 @@
fi
else
ac_cv_path_EGREP=$EGREP
-@@ -4471,21 +4590,17 @@
+@@ -4496,21 +4654,17 @@
fi
fi
@@ -3623,7 +3882,7 @@
/* end confdefs.h. */
#include <stdlib.h>
#include <stdarg.h>
-@@ -4500,48 +4615,23 @@
+@@ -4525,48 +4679,23 @@
return 0;
}
_ACEOF
@@ -3677,7 +3936,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4551,18 +4641,14 @@
+@@ -4576,18 +4705,14 @@
if test $ac_cv_header_stdc = yes; then
# ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
@@ -3699,7 +3958,7 @@
else
ac_cv_header_stdc=no
fi
-@@ -4572,14 +4658,10 @@
+@@ -4597,14 +4722,10 @@
if test $ac_cv_header_stdc = yes; then
# /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
@@ -3716,7 +3975,7 @@
/* end confdefs.h. */
#include <ctype.h>
#include <stdlib.h>
-@@ -4606,118 +4688,34 @@
+@@ -4631,118 +4752,34 @@
return 0;
}
_ACEOF
@@ -3848,7 +4107,7 @@
cat >>confdefs.h <<_ACEOF
#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
-@@ -4728,151 +4726,12 @@
+@@ -4753,151 +4790,12 @@
@@ -4005,7 +4264,7 @@
_ACEOF
fi
-@@ -4880,227 +4739,61 @@
+@@ -4905,16 +4803,12 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -4025,13 +4284,10 @@
/* end confdefs.h. */
#include <locale.h>
int
- main ()
- {
- return LC_MESSAGES
-- ;
-- return 0;
--}
--_ACEOF
+@@ -4925,46 +4819,19 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -4053,37 +4309,38 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- am_cv_val_LC_MESSAGES=yes
--else
++if ac_fn_c_try_link "$LINENO"; then :
+ am_cv_val_LC_MESSAGES=yes
+ else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- am_cv_val_LC_MESSAGES=no
--fi
++ am_cv_val_LC_MESSAGES=no
+ fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ fi
-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
--$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-- if test $am_cv_val_LC_MESSAGES = yes; then
--
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+ $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+ if test $am_cv_val_LC_MESSAGES = yes; then
+
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_LC_MESSAGES 1
-_ACEOF
--
-- fi
-- fi
-- USE_NLS=yes
--
--
-- gt_cv_have_gettext=no
--
-- CATOBJEXT=NONE
-- XGETTEXT=:
-- INTLLIBS=
--
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+
+ fi
+ fi
+@@ -4977,155 +4844,20 @@
+ XGETTEXT=:
+ INTLLIBS=
+
- if test "${ac_cv_header_libintl_h+set}" = set; then
- { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
-$as_echo_n "checking for libintl.h... " >&6; }
@@ -4209,40 +4466,14 @@
-$as_echo_n "checking for libintl.h... " >&6; }
-if test "${ac_cv_header_libintl_h+set}" = set; then
- $as_echo_n "(cached) " >&6
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+ am_cv_val_LC_MESSAGES=yes
- else
+-else
- ac_cv_header_libintl_h=$ac_header_preproc
-+ am_cv_val_LC_MESSAGES=no
- fi
+-fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
-$as_echo "$ac_cv_header_libintl_h" >&6; }
-
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- fi
+-fi
-if test "x$ac_cv_header_libintl_h" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
-+$as_echo "$am_cv_val_LC_MESSAGES" >&6; }
-+ if test $am_cv_val_LC_MESSAGES = yes; then
-+
-+$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
-+
-+ fi
-+ fi
-+ USE_NLS=yes
-+
-+
-+ gt_cv_have_gettext=no
-+
-+ CATOBJEXT=NONE
-+ XGETTEXT=:
-+ INTLLIBS=
-+
+ ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
+if test "x$ac_cv_header_libintl_h" = x""yes; then :
gt_cv_func_dgettext_libintl="no"
@@ -4267,7 +4498,261 @@
/* end confdefs.h. */
#include <libintl.h>
-@@ -5113,54 +4806,25 @@
+@@ -5137,202 +4869,58 @@
+ ;
+ return 0;
+ }
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- gt_cv_func_ngettext_libc=yes
+-else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gt_cv_func_ngettext_libc=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+-
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
+-$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+-
+- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
+-$as_echo_n "checking for dgettext in libc... " >&6; }
+-if test "${gt_cv_func_dgettext_libc+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h. */
+-
+-#include <libintl.h>
+-
+-int
+-main ()
+-{
+-return !dgettext ("","")
+- ;
+- return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- gt_cv_func_dgettext_libc=yes
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_ngettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- gt_cv_func_dgettext_libc=no
++ gt_cv_func_ngettext_libc=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
+-$as_echo "$gt_cv_func_dgettext_libc" >&6; }
+- fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
++$as_echo "$gt_cv_func_ngettext_libc" >&6; }
+
+ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
++$as_echo_n "checking for dgettext in libc... " >&6; }
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char $ac_func (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
++#include <libintl.h>
+
+ int
+ main ()
+ {
+-return $ac_func ();
++return !dgettext ("","")
+ ;
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
+- eval "$as_ac_var=yes"
++if ac_fn_c_try_link "$LINENO"; then :
++ gt_cv_func_dgettext_libc=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- eval "$as_ac_var=no"
++ gt_cv_func_dgettext_libc=no
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+- $as_echo "$as_val"'`
+- if test "x$as_val" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
++$as_echo "$gt_cv_func_dgettext_libc" >&6; }
++ fi
++
++ if test "$gt_cv_func_ngettext_libc" = "yes" ; then
++ for ac_func in bind_textdomain_codeset
++do :
++ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+
+ fi
+@@ -5347,18 +4935,14 @@
+ || test "$gt_cv_func_ngettext_libc" != "yes" \
+ || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+
+- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5376,55 +4960,26 @@
return 0;
}
_ACEOF
@@ -4293,13 +4778,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_ngettext_libc=yes
+ ac_cv_lib_intl_bindtextdomain=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- gt_cv_func_ngettext_libc=no
-+ gt_cv_func_ngettext_libc=no
+- ac_cv_lib_intl_bindtextdomain=no
++ ac_cv_lib_intl_bindtextdomain=no
fi
-
-rm -rf conftest.dSYM
@@ -4307,30 +4792,32 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
- $as_echo "$gt_cv_func_ngettext_libc" >&6; }
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
- $as_echo_n "checking for dgettext in libc... " >&6; }
--if test "${gt_cv_func_dgettext_libc+set}" = set; then
-+if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
$as_echo_n "(cached) " >&6
else
-- cat >conftest.$ac_ext <<_ACEOF
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #include <libintl.h>
-@@ -5173,141 +4837,26 @@
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5442,55 +4997,26 @@
return 0;
}
_ACEOF
@@ -4356,13 +4843,13 @@
- $as_test_x conftest$ac_exeext
- }; then
+if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_dgettext_libc=yes
+ ac_cv_lib_intl_ngettext=yes
else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- gt_cv_func_dgettext_libc=no
-+ gt_cv_func_dgettext_libc=no
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
fi
-
-rm -rf conftest.dSYM
@@ -4370,14 +4857,228 @@
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
-
- fi
--{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
- $as_echo "$gt_cv_func_dgettext_libc" >&6; }
- fi
-
- if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5508,43 +5034,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dgettext=no
++ ac_cv_lib_intl_dgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ fi
+
+@@ -5554,22 +5055,18 @@
+
+
+ if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+- { $as_echo "$as_me:$LINENO: result: " >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5587,55 +5084,26 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_ngettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_ngettext=no
++ ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5653,43 +5121,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_intl_dcgettext=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_intl_dcgettext=no
++ ac_cv_lib_intl_dcgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+ gt_cv_func_dgettext_libintl=yes
+ libintl_extra_libs=-liconv
+ else
+@@ -5711,102 +5154,12 @@
+ glib_save_LIBS="$LIBS"
+ LIBS="$LIBS -lintl $libintl_extra_libs"
+ unset ac_cv_func_bind_textdomain_codeset
-
-for ac_func in bind_textdomain_codeset
-do
@@ -4472,508 +5173,6 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
-+ for ac_func in bind_textdomain_codeset
-+do :
-+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
-+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
- cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define HAVE_BIND_TEXTDOMAIN_CODESET 1
- _ACEOF
-
- fi
-@@ -5322,18 +4871,14 @@
- || test "$gt_cv_func_ngettext_libc" != "yes" \
- || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
-
-- { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
- $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
-+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5351,55 +4896,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_bindtextdomain=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_bindtextdomain=no
-+ ac_cv_lib_intl_bindtextdomain=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
- $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
--if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5417,55 +4933,26 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
- $as_echo_n "checking for dgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5483,43 +4970,18 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_dgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dgettext=no
-+ ac_cv_lib_intl_dgettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
- $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
--if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
-+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
- gt_cv_func_dgettext_libintl=yes
- fi
-
-@@ -5529,22 +4991,18 @@
-
-
- if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
-- { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
- $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
-- { $as_echo "$as_me:$LINENO: result: " >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
- $as_echo "" >&6; }
-- { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
- $as_echo_n "checking for ngettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_ngettext+set}" = set; then
-+if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
-
- /* Override any GCC internal prototype to avoid an error.
-@@ -5562,161 +5020,27 @@
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_intl_ngettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_ngettext=no
-+ ac_cv_lib_intl_ngettext=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
- $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
--if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
-- { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
-+if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
- $as_echo_n "checking for dcgettext in -lintl... " >&6; }
--if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
-+if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- ac_check_lib_save_LIBS=$LIBS
- LIBS="-lintl -liconv $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char dcgettext ();
--int
--main ()
--{
--return dcgettext ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_lib_intl_dcgettext=yes
--else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_lib_intl_dcgettext=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
--$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
--if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
-- gt_cv_func_dgettext_libintl=yes
-- libintl_extra_libs=-liconv
--else
-- :
--fi
--
--else
-- :
--fi
--
-- fi
--
-- #
-- # If we found libintl, then check in it for bind_textdomain_codeset();
-- # we'll prefer libc if neither have bind_textdomain_codeset(),
-- # and both have dgettext and ngettext
-- #
-- if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-- glib_save_LIBS="$LIBS"
-- LIBS="$LIBS -lintl $libintl_extra_libs"
-- unset ac_cv_func_bind_textdomain_codeset
--
--for ac_func in bind_textdomain_codeset
--do
--as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
--$as_echo_n "checking for $ac_func... " >&6; }
--if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define $ac_func innocuous_$ac_func
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char $ac_func (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef $ac_func
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -5724,64 +5048,54 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char $ac_func ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_$ac_func || defined __stub___$ac_func
--choke me
--#endif
--
-+char dcgettext ();
- int
- main ()
- {
--return $ac_func ();
-+return dcgettext ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- eval "$as_ac_var=yes"
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_intl_dcgettext=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- eval "$as_ac_var=no"
-+ ac_cv_lib_intl_dcgettext=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
-+$as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
-+if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
-+ gt_cv_func_dgettext_libintl=yes
-+ libintl_extra_libs=-liconv
-+else
-+ :
- fi
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
-+else
-+ :
- fi
--ac_res=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_var'}
-- $as_echo "$as_val"'`
-- if test "x$as_val" = x""yes; then
-+
-+ fi
-+
-+ #
-+ # If we found libintl, then check in it for bind_textdomain_codeset();
-+ # we'll prefer libc if neither have bind_textdomain_codeset(),
-+ # and both have dgettext and ngettext
-+ #
-+ if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
-+ glib_save_LIBS="$LIBS"
-+ LIBS="$LIBS -lintl $libintl_extra_libs"
-+ unset ac_cv_func_bind_textdomain_codeset
+ for ac_func in bind_textdomain_codeset
+do :
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
@@ -4984,7 +5183,7 @@
_ACEOF
fi
-@@ -5811,15 +5125,13 @@
+@@ -5836,15 +5189,13 @@
if test "$gt_cv_have_gettext" = "yes"; then
@@ -5003,7 +5202,7 @@
$as_echo_n "(cached) " >&6
else
case "$MSGFMT" in
-@@ -5844,118 +5156,28 @@
+@@ -5869,118 +5220,28 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -5015,9 +5214,9 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
- if test "$MSGFMT" != "no"; then
- glib_save_LIBS="$LIBS"
- LIBS="$LIBS $INTLLIBS"
+- if test "$MSGFMT" != "no"; then
+- glib_save_LIBS="$LIBS"
+- LIBS="$LIBS $INTLLIBS"
-
-for ac_func in dcgettext
-do
@@ -5112,6 +5311,9 @@
-as_val=`eval 'as_val=${'$as_ac_var'}
- $as_echo "$as_val"'`
- if test "x$as_val" = x""yes; then
++ if test "$MSGFMT" != "no"; then
++ glib_save_LIBS="$LIBS"
++ LIBS="$LIBS $INTLLIBS"
+ for ac_func in dcgettext
+do :
+ ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
@@ -5130,7 +5332,7 @@
$as_echo_n "checking if msgfmt accepts -c... " >&6; }
cat >conftest.foo <<_ACEOF
-@@ -5970,14 +5192,14 @@
+@@ -5995,14 +5256,14 @@
"Content-Transfer-Encoding: 8bit\n"
_ACEOF
@@ -5150,7 +5352,7 @@
$as_echo "no" >&6; }
echo "$as_me: failed input was:" >&5
sed 's/^/| /' conftest.foo >&5
-@@ -5985,9 +5207,9 @@
+@@ -6010,9 +5271,9 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -5162,7 +5364,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6000,14 +5222,14 @@
+@@ -6025,14 +5286,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5180,7 +5382,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6016,19 +5238,19 @@
+@@ -6041,19 +5302,19 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5204,7 +5406,7 @@
$as_echo_n "(cached) " >&6
else
case "$XGETTEXT" in
-@@ -6053,18 +5275,14 @@
+@@ -6078,18 +5339,14 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -5226,7 +5428,7 @@
/* end confdefs.h. */
int
-@@ -6076,121 +5294,14 @@
+@@ -6101,121 +5358,14 @@
return 0;
}
_ACEOF
@@ -5352,7 +5554,7 @@
CATOBJEXT=.gmo
DATADIRNAME=share
else
-@@ -6205,10 +5316,8 @@
+@@ -6230,10 +5380,8 @@
;;
esac
fi
@@ -5365,7 +5567,7 @@
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
else
-@@ -6222,9 +5331,7 @@
+@@ -6247,9 +5395,7 @@
if test "$gt_cv_have_gettext" = "yes" ; then
@@ -5376,7 +5578,7 @@
fi
-@@ -6232,7 +5339,7 @@
+@@ -6257,7 +5403,7 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -5385,7 +5587,7 @@
$as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
XGETTEXT=":"
fi
-@@ -6265,7 +5372,7 @@
+@@ -6290,7 +5436,7 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -5394,7 +5596,7 @@
$as_echo_n "checking for catalogs to be installed... " >&6; }
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
-@@ -6290,7 +5397,7 @@
+@@ -6315,7 +5461,7 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -5403,7 +5605,7 @@
$as_echo "$LINGUAS" >&6; }
fi
-@@ -6323,16 +5430,16 @@
+@@ -6348,16 +5494,16 @@
< $srcdir/po/POTFILES.in > po/POTFILES
@@ -5423,7 +5625,7 @@
$as_echo "$USE_NLS" >&6; }
-@@ -6340,35 +5447,31 @@
+@@ -6365,35 +5511,31 @@
case "$am__api_version" in
1.01234)
@@ -5465,7 +5667,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_UPDATE in
-@@ -6381,14 +5484,14 @@
+@@ -6406,14 +5548,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5483,7 +5685,7 @@
IFS=$as_save_IFS
;;
-@@ -6396,19 +5499,19 @@
+@@ -6421,19 +5563,19 @@
fi
INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
if test -n "$INTLTOOL_UPDATE"; then
@@ -5507,7 +5709,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_MERGE in
-@@ -6421,14 +5524,14 @@
+@@ -6446,14 +5588,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5525,7 +5727,7 @@
IFS=$as_save_IFS
;;
-@@ -6436,19 +5539,19 @@
+@@ -6461,19 +5603,19 @@
fi
INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
if test -n "$INTLTOOL_MERGE"; then
@@ -5549,7 +5751,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_EXTRACT in
-@@ -6461,14 +5564,14 @@
+@@ -6486,14 +5628,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5567,7 +5769,7 @@
IFS=$as_save_IFS
;;
-@@ -6476,18 +5579,16 @@
+@@ -6501,18 +5643,16 @@
fi
INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
if test -n "$INTLTOOL_EXTRACT"; then
@@ -5589,7 +5791,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 $< $@'
-@@ -6609,9 +5710,9 @@
+@@ -6634,9 +5774,9 @@
# Check the gettext tools to make sure they are GNU
# Extract the first word of "xgettext", so it can be a program name with args.
set dummy xgettext; ac_word=$2
@@ -5601,7 +5803,7 @@
$as_echo_n "(cached) " >&6
else
case $XGETTEXT in
-@@ -6624,14 +5725,14 @@
+@@ -6649,14 +5789,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5619,7 +5821,7 @@
IFS=$as_save_IFS
;;
-@@ -6639,19 +5740,19 @@
+@@ -6664,19 +5804,19 @@
fi
XGETTEXT=$ac_cv_path_XGETTEXT
if test -n "$XGETTEXT"; then
@@ -5643,7 +5845,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGMERGE in
-@@ -6664,14 +5765,14 @@
+@@ -6689,14 +5829,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5661,7 +5863,7 @@
IFS=$as_save_IFS
;;
-@@ -6679,19 +5780,19 @@
+@@ -6704,19 +5844,19 @@
fi
MSGMERGE=$ac_cv_path_MSGMERGE
if test -n "$MSGMERGE"; then
@@ -5685,7 +5887,7 @@
$as_echo_n "(cached) " >&6
else
case $MSGFMT in
-@@ -6704,14 +5805,14 @@
+@@ -6729,14 +5869,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5703,7 +5905,7 @@
IFS=$as_save_IFS
;;
-@@ -6719,19 +5820,19 @@
+@@ -6744,19 +5884,19 @@
fi
MSGFMT=$ac_cv_path_MSGFMT
if test -n "$MSGFMT"; then
@@ -5727,7 +5929,7 @@
$as_echo_n "(cached) " >&6
else
case $GMSGFMT in
-@@ -6744,14 +5845,14 @@
+@@ -6769,14 +5909,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5745,7 +5947,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-@@ -6760,33 +5861,29 @@
+@@ -6785,33 +5925,29 @@
fi
GMSGFMT=$ac_cv_path_GMSGFMT
if test -n "$GMSGFMT"; then
@@ -5785,7 +5987,7 @@
$as_echo_n "(cached) " >&6
else
case $INTLTOOL_PERL in
-@@ -6799,14 +5896,14 @@
+@@ -6824,14 +5960,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -5803,7 +6005,7 @@
IFS=$as_save_IFS
;;
-@@ -6814,41 +5911,35 @@
+@@ -6839,41 +5975,35 @@
fi
INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
if test -n "$INTLTOOL_PERL"; then
@@ -5854,7 +6056,7 @@
fi
fi
-@@ -6858,136 +5949,25 @@
+@@ -6883,11 +6013,7 @@
# Set DATADIRNAME correctly if it is not set yet
# (copied from glib-gettext.m4)
if test -z "$DATADIRNAME"; then
@@ -5863,13 +6065,90 @@
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -6899,120 +6025,13 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ DATADIRNAME=share
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- case $host in
++ case $host in
+ *-*-solaris*)
+- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char bind_textdomain_codeset (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
-
-int
-main ()
-{
--extern int _nl_msg_cat_cntr;
-- return _nl_msg_cat_cntr
+-return bind_textdomain_codeset ();
- ;
- return 0;
-}
@@ -5895,91 +6174,8 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- DATADIRNAME=share
+- ac_cv_func_bind_textdomain_codeset=yes
-else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- case $host in
-- *-*-solaris*)
-- { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
--$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
--if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char bind_textdomain_codeset (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef bind_textdomain_codeset
--
--/* Override any GCC internal prototype to avoid an error.
-- Use char because int might match the return type of a GCC
-- builtin and then its argument prototype would still apply. */
--#ifdef __cplusplus
--extern "C"
--#endif
--char bind_textdomain_codeset ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
--choke me
--#endif
-
- int
- main ()
- {
--return bind_textdomain_codeset ();
-+extern int _nl_msg_cat_cntr;
-+ return _nl_msg_cat_cntr
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_bind_textdomain_codeset=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ DATADIRNAME=share
- else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
@@ -5993,14 +6189,12 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
-+ case $host in
-+ *-*-solaris*)
+ ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
+if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
DATADIRNAME=share
else
DATADIRNAME=lib
-@@ -6999,10 +5979,8 @@
+@@ -7024,10 +6043,8 @@
;;
esac
fi
@@ -6013,7 +6207,7 @@
fi
-@@ -7010,14 +5988,14 @@
+@@ -7035,14 +6052,14 @@
@@ -6031,7 +6225,7 @@
$as_echo "no, using $LN_S" >&6; }
fi
-@@ -7027,9 +6005,9 @@
+@@ -7052,9 +6069,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
@@ -6043,7 +6237,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -7042,14 +6020,14 @@
+@@ -7067,14 +6084,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6061,7 +6255,7 @@
IFS=$as_save_IFS
;;
-@@ -7057,10 +6035,10 @@
+@@ -7082,10 +6099,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -6074,7 +6268,7 @@
$as_echo "no" >&6; }
fi
-@@ -7070,9 +6048,9 @@
+@@ -7095,9 +6112,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
@@ -6086,7 +6280,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -7085,14 +6063,14 @@
+@@ -7110,14 +6127,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6104,7 +6298,7 @@
IFS=$as_save_IFS
;;
-@@ -7100,10 +6078,10 @@
+@@ -7125,10 +6142,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -6117,7 +6311,7 @@
$as_echo "no" >&6; }
fi
-@@ -7112,7 +6090,7 @@
+@@ -7137,7 +6154,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6126,7 +6320,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7125,13 +6103,13 @@
+@@ -7150,13 +6167,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -6143,7 +6337,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -7140,35 +6118,33 @@
+@@ -7165,35 +6182,33 @@
gdu_cv_version_required=0.3.2
@@ -6187,7 +6381,7 @@
withval=$with_help_dir;
else
with_help_dir='${datadir}/gnome/help'
-@@ -7179,7 +6155,7 @@
+@@ -7204,7 +6219,7 @@
# Check whether --with-omf-dir was given.
@@ -6196,7 +6390,7 @@
withval=$with_omf_dir;
else
with_omf_dir='${datadir}/omf'
-@@ -7190,7 +6166,7 @@
+@@ -7215,7 +6230,7 @@
# Check whether --with-help-formats was given.
@@ -6205,7 +6399,7 @@
withval=$with_help_formats;
else
with_help_formats=''
-@@ -7200,7 +6176,7 @@
+@@ -7225,7 +6240,7 @@
# Check whether --enable-scrollkeeper was given.
@@ -6214,7 +6408,7 @@
enableval=$enable_scrollkeeper;
else
enable_scrollkeeper=yes
-@@ -7243,9 +6219,9 @@
+@@ -7268,9 +6283,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
@@ -6226,7 +6420,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -7256,24 +6232,24 @@
+@@ -7281,24 +6296,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6256,7 +6450,7 @@
$as_echo "no" >&6; }
fi
-@@ -7287,9 +6263,9 @@
+@@ -7312,9 +6327,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
@@ -6268,7 +6462,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -7300,24 +6276,24 @@
+@@ -7325,24 +6340,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6298,7 +6492,7 @@
$as_echo "no" >&6; }
fi
-@@ -7330,7 +6306,7 @@
+@@ -7355,7 +6370,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -6307,7 +6501,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -7341,53 +6317,36 @@
+@@ -7366,53 +6381,36 @@
fi
fi
# Provide some information about the compiler.
@@ -6358,8 +6552,8 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
@@ -6380,7 +6574,7 @@
/* end confdefs.h. */
int
-@@ -7401,37 +6360,16 @@
+@@ -7426,37 +6424,16 @@
return 0;
}
_ACEOF
@@ -6421,7 +6615,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -7440,20 +6378,16 @@
+@@ -7465,20 +6442,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -6445,7 +6639,7 @@
/* end confdefs.h. */
int
-@@ -7464,35 +6398,11 @@
+@@ -7489,35 +6462,11 @@
return 0;
}
_ACEOF
@@ -6484,7 +6678,7 @@
/* end confdefs.h. */
int
-@@ -7503,36 +6413,12 @@
+@@ -7528,82 +6477,33 @@
return 0;
}
_ACEOF
@@ -6525,10 +6719,13 @@
/* end confdefs.h. */
int
-@@ -7543,42 +6429,17 @@
- return 0;
- }
- _ACEOF
+ main ()
+-{
+-
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -6547,13 +6744,19 @@
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+if ac_fn_cxx_try_compile "$LINENO"; then :
- ac_cv_prog_cxx_g=yes
+- ac_cv_prog_cxx_g=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
--
++{
+
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_cxx_try_compile "$LINENO"; then :
++ ac_cv_prog_cxx_g=yes
fi
-
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -6570,7 +6773,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -7603,9 +6464,9 @@
+@@ -7628,9 +6528,9 @@
depcc="$CXX" am_compiler_list=
@@ -6582,7 +6785,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -7713,7 +6574,7 @@
+@@ -7738,7 +6638,7 @@
fi
fi
@@ -6591,7 +6794,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -7729,22 +6590,18 @@
+@@ -7754,22 +6654,18 @@
if test "x$CC" != xcc; then
@@ -6618,7 +6821,7 @@
/* end confdefs.h. */
int
-@@ -7760,63 +6617,63 @@
+@@ -7785,63 +6681,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.*
@@ -6707,7 +6910,7 @@
then
# cc works too.
:
-@@ -7833,15 +6690,13 @@
+@@ -7858,15 +6754,13 @@
fi
if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
@@ -6726,7 +6929,7 @@
fi
-@@ -7862,7 +6717,7 @@
+@@ -7887,7 +6781,7 @@
case `pwd` in
*\ * | *\ *)
@@ -6735,7 +6938,7 @@
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
-@@ -7887,35 +6742,27 @@
+@@ -7912,35 +6806,27 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
@@ -6778,7 +6981,7 @@
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
-@@ -7931,28 +6778,24 @@
+@@ -7956,28 +6842,24 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
@@ -6812,7 +7015,7 @@
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
-@@ -7968,9 +6811,9 @@
+@@ -7993,9 +6875,9 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
@@ -6824,7 +7027,7 @@
$as_echo_n "(cached) " >&6
else
ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -7978,7 +6821,7 @@
+@@ -8003,7 +6885,7 @@
ac_script="$ac_script$as_nl$ac_script"
done
echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
@@ -6833,7 +7036,7 @@
if test -z "$SED"; then
ac_path_SED_found=false
# Loop through the user's path and test for each of PROGNAME-LIST
-@@ -7987,7 +6830,7 @@
+@@ -8012,7 +6894,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6842,7 +7045,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
-@@ -8007,7 +6850,7 @@
+@@ -8032,7 +6914,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
@@ -6851,7 +7054,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"
-@@ -8022,19 +6865,17 @@
+@@ -8047,19 +6929,17 @@
$ac_path_SED_found && break 3
done
done
@@ -6874,7 +7077,7 @@
$as_echo "$ac_cv_path_SED" >&6; }
SED="$ac_cv_path_SED"
rm -f conftest.sed
-@@ -8052,9 +6893,9 @@
+@@ -8077,9 +6957,9 @@
@@ -6886,7 +7089,7 @@
$as_echo_n "(cached) " >&6
else
if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -8068,7 +6909,7 @@
+@@ -8093,7 +6973,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -6895,7 +7098,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
-@@ -8088,7 +6929,7 @@
+@@ -8113,7 +6993,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
@@ -6904,7 +7107,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"
-@@ -8103,12 +6944,10 @@
+@@ -8128,12 +7008,10 @@
$ac_path_FGREP_found && break 3
done
done
@@ -6919,7 +7122,7 @@
fi
else
ac_cv_path_FGREP=$FGREP
-@@ -8116,7 +6955,7 @@
+@@ -8141,7 +7019,7 @@
fi
fi
@@ -6928,7 +7131,7 @@
$as_echo "$ac_cv_path_FGREP" >&6; }
FGREP="$ac_cv_path_FGREP"
-@@ -8142,7 +6981,7 @@
+@@ -8167,7 +7045,7 @@
# Check whether --with-gnu-ld was given.
@@ -6937,7 +7140,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -8151,7 +6990,7 @@
+@@ -8176,7 +7054,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -6946,7 +7149,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -8181,13 +7020,13 @@
+@@ -8206,13 +7084,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -6963,7 +7166,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -8218,18 +7057,16 @@
+@@ -8243,18 +7121,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -6987,7 +7190,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -8242,7 +7079,7 @@
+@@ -8267,7 +7143,7 @@
;;
esac
fi
@@ -6996,7 +7199,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -8254,9 +7091,9 @@
+@@ -8279,9 +7155,9 @@
@@ -7008,7 +7211,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NM"; then
-@@ -8303,7 +7140,7 @@
+@@ -8328,7 +7204,7 @@
: ${lt_cv_path_NM=no}
fi
fi
@@ -7017,7 +7220,7 @@
$as_echo "$lt_cv_path_NM" >&6; }
if test "$lt_cv_path_NM" != "no"; then
NM="$lt_cv_path_NM"
-@@ -8314,9 +7151,9 @@
+@@ -8339,9 +7215,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
@@ -7029,7 +7232,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DUMPBIN"; then
-@@ -8327,24 +7164,24 @@
+@@ -8352,24 +7228,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7059,7 +7262,7 @@
$as_echo "no" >&6; }
fi
-@@ -8358,9 +7195,9 @@
+@@ -8383,9 +7259,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
@@ -7071,7 +7274,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DUMPBIN"; then
-@@ -8371,24 +7208,24 @@
+@@ -8396,24 +7272,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7101,7 +7304,7 @@
$as_echo "no" >&6; }
fi
-@@ -8401,7 +7238,7 @@
+@@ -8426,7 +7302,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7110,7 +7313,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8421,33 +7258,33 @@
+@@ -8446,33 +7322,33 @@
@@ -7123,16 +7326,16 @@
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
-- (eval echo "\"\$as_me:8431: $ac_compile\"" >&5)
-+ (eval echo "\"\$as_me:7268: $ac_compile\"" >&5)
+- (eval echo "\"\$as_me:8456: $ac_compile\"" >&5)
++ (eval echo "\"\$as_me:7332: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8434: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+ (eval echo "\"\$as_me:7271: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+- (eval echo "\"\$as_me:8459: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++ (eval echo "\"\$as_me:7335: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
-- (eval echo "\"\$as_me:8437: output\"" >&5)
-+ (eval echo "\"\$as_me:7274: output\"" >&5)
+- (eval echo "\"\$as_me:8462: output\"" >&5)
++ (eval echo "\"\$as_me:7338: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -7152,7 +7355,7 @@
$as_echo_n "(cached) " >&6
else
i=0
-@@ -8565,10 +7402,10 @@
+@@ -8590,10 +7466,10 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7165,7 +7368,7 @@
$as_echo "none" >&6; }
fi
max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -8582,7 +7419,7 @@
+@@ -8607,7 +7483,7 @@
: ${MV="mv -f"}
: ${RM="rm -f"}
@@ -7174,7 +7377,7 @@
$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
# Try some XSI features
xsi_shell=no
-@@ -8592,17 +7429,17 @@
+@@ -8617,17 +7493,17 @@
&& eval 'test $(( 1 + 1 )) -eq 2 \
&& test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
&& xsi_shell=yes
@@ -7195,7 +7398,7 @@
$as_echo "$lt_shell_append" >&6; }
-@@ -8637,14 +7474,14 @@
+@@ -8662,14 +7538,14 @@
@@ -7213,7 +7416,7 @@
$as_echo "$lt_cv_ld_reload_flag" >&6; }
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
-@@ -8673,9 +7510,9 @@
+@@ -8698,9 +7574,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
@@ -7225,7 +7428,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OBJDUMP"; then
-@@ -8686,24 +7523,24 @@
+@@ -8711,24 +7587,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7255,7 +7458,7 @@
$as_echo "no" >&6; }
fi
-@@ -8713,9 +7550,9 @@
+@@ -8738,9 +7614,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
@@ -7267,7 +7470,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJDUMP"; then
-@@ -8726,24 +7563,24 @@
+@@ -8751,24 +7627,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7297,7 +7500,7 @@
$as_echo "no" >&6; }
fi
-@@ -8752,7 +7589,7 @@
+@@ -8777,7 +7653,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7306,7 +7509,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -8772,9 +7609,9 @@
+@@ -8797,9 +7673,9 @@
@@ -7318,7 +7521,12 @@
$as_echo_n "(cached) " >&6
else
lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -8893,7 +7730,7 @@
+@@ -8914,11 +7790,11 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
lt_cv_deplibs_check_method=pass_all
;;
@@ -7327,7 +7535,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
-@@ -8968,7 +7805,7 @@
+@@ -8993,7 +7869,7 @@
esac
fi
@@ -7336,7 +7544,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
-@@ -8988,9 +7825,9 @@
+@@ -9013,9 +7889,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
@@ -7348,7 +7556,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$AR"; then
-@@ -9001,24 +7838,24 @@
+@@ -9026,24 +7902,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7378,7 +7586,7 @@
$as_echo "no" >&6; }
fi
-@@ -9028,9 +7865,9 @@
+@@ -9053,9 +7929,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
@@ -7390,7 +7598,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_AR"; then
-@@ -9041,24 +7878,24 @@
+@@ -9066,24 +7942,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7420,7 +7628,7 @@
$as_echo "no" >&6; }
fi
-@@ -9067,7 +7904,7 @@
+@@ -9092,7 +7968,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7429,7 +7637,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9093,9 +7930,9 @@
+@@ -9118,9 +7994,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
@@ -7441,7 +7649,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$STRIP"; then
-@@ -9106,24 +7943,24 @@
+@@ -9131,24 +8007,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7471,7 +7679,7 @@
$as_echo "no" >&6; }
fi
-@@ -9133,9 +7970,9 @@
+@@ -9158,9 +8034,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
@@ -7483,7 +7691,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRIP"; then
-@@ -9146,24 +7983,24 @@
+@@ -9171,24 +8047,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7513,7 +7721,7 @@
$as_echo "no" >&6; }
fi
-@@ -9172,7 +8009,7 @@
+@@ -9197,7 +8073,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7522,7 +7730,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9192,9 +8029,9 @@
+@@ -9217,9 +8093,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
@@ -7534,7 +7742,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
-@@ -9205,24 +8042,24 @@
+@@ -9230,24 +8106,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7564,7 +7772,7 @@
$as_echo "no" >&6; }
fi
-@@ -9232,9 +8069,9 @@
+@@ -9257,9 +8133,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
@@ -7576,7 +7784,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
-@@ -9245,24 +8082,24 @@
+@@ -9270,24 +8146,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7606,7 +7814,7 @@
$as_echo "no" >&6; }
fi
-@@ -9271,7 +8108,7 @@
+@@ -9296,7 +8172,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7615,7 +7823,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9349,9 +8186,9 @@
+@@ -9374,9 +8250,9 @@
# Check for command to grab the raw symbol name followed by C symbol from nm.
@@ -7627,7 +7835,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -9467,18 +8304,18 @@
+@@ -9492,18 +8368,18 @@
int main(){nm_test_var='a';nm_test_func();return(0);}
_LT_EOF
@@ -7652,7 +7860,7 @@
# Try sorting and uniquifying the output.
if sort "$nlist" | uniq > "$nlist"T; then
mv -f "$nlist"T "$nlist"
-@@ -9531,11 +8368,11 @@
+@@ -9556,11 +8432,11 @@
lt_save_CFLAGS="$CFLAGS"
LIBS="conftstm.$ac_objext"
CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
@@ -7667,7 +7875,7 @@
pipe_works=yes
fi
LIBS="$lt_save_LIBS"
-@@ -9569,10 +8406,10 @@
+@@ -9594,10 +8470,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
@@ -7680,7 +7888,7 @@
$as_echo "ok" >&6; }
fi
-@@ -9598,7 +8435,7 @@
+@@ -9623,7 +8499,7 @@
# Check whether --enable-libtool-lock was given.
@@ -7689,7 +7897,7 @@
enableval=$enable_libtool_lock;
fi
-@@ -9610,11 +8447,11 @@
+@@ -9635,11 +8511,11 @@
ia64-*-hpux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7704,13 +7912,13 @@
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
HPUX_IA64_MODE="32"
-@@ -9628,12 +8465,12 @@
+@@ -9653,12 +8529,12 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
-- echo '#line 9631 "configure"' > conftest.$ac_ext
+- echo '#line 9656 "configure"' > conftest.$ac_ext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ echo '#line 8468 "configure"' > conftest.$ac_ext
++ echo '#line 8532 "configure"' > conftest.$ac_ext
+ if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7721,7 +7929,7 @@
if test "$lt_cv_prog_gnu_ld" = yes; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
-@@ -9667,11 +8504,11 @@
+@@ -9692,11 +8568,11 @@
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7736,7 +7944,7 @@
case `/usr/bin/file conftest.o` in
*32-bit*)
case $host in
-@@ -9720,9 +8557,9 @@
+@@ -9745,9 +8621,9 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -7748,7 +7956,7 @@
$as_echo_n "(cached) " >&6
else
ac_ext=c
-@@ -9731,11 +8568,7 @@
+@@ -9756,11 +8632,7 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -7761,7 +7969,7 @@
/* end confdefs.h. */
int
-@@ -9746,38 +8579,13 @@
+@@ -9771,38 +8643,13 @@
return 0;
}
_ACEOF
@@ -7804,7 +8012,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -9785,7 +8593,7 @@
+@@ -9810,7 +8657,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -7813,7 +8021,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
-@@ -9795,11 +8603,11 @@
+@@ -9820,11 +8667,11 @@
sparc*-*solaris*)
# Find out which ABI we are using.
echo 'int i;' > conftest.$ac_ext
@@ -7828,7 +8036,7 @@
case `/usr/bin/file conftest.o` in
*64-bit*)
case $lt_cv_prog_gnu_ld in
-@@ -9825,9 +8633,9 @@
+@@ -9850,9 +8697,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
@@ -7840,7 +8048,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$DSYMUTIL"; then
-@@ -9838,24 +8646,24 @@
+@@ -9863,24 +8710,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7870,7 +8078,7 @@
$as_echo "no" >&6; }
fi
-@@ -9865,9 +8673,9 @@
+@@ -9890,9 +8737,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
@@ -7882,7 +8090,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DSYMUTIL"; then
-@@ -9878,24 +8686,24 @@
+@@ -9903,24 +8750,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7912,7 +8120,7 @@
$as_echo "no" >&6; }
fi
-@@ -9904,7 +8712,7 @@
+@@ -9929,7 +8776,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -7921,7 +8129,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -9917,9 +8725,9 @@
+@@ -9942,9 +8789,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
@@ -7933,7 +8141,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$NMEDIT"; then
-@@ -9930,24 +8738,24 @@
+@@ -9955,24 +8802,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -7963,7 +8171,7 @@
$as_echo "no" >&6; }
fi
-@@ -9957,9 +8765,9 @@
+@@ -9982,9 +8829,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
@@ -7975,7 +8183,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_NMEDIT"; then
-@@ -9970,24 +8778,24 @@
+@@ -9995,24 +8842,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8005,7 +8213,7 @@
$as_echo "no" >&6; }
fi
-@@ -9996,7 +8804,7 @@
+@@ -10021,7 +8868,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8014,7 +8222,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10009,9 +8817,9 @@
+@@ -10034,9 +8881,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
@@ -8026,7 +8234,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$LIPO"; then
-@@ -10022,24 +8830,24 @@
+@@ -10047,24 +8894,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8056,7 +8264,7 @@
$as_echo "no" >&6; }
fi
-@@ -10049,9 +8857,9 @@
+@@ -10074,9 +8921,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
@@ -8068,7 +8276,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIPO"; then
-@@ -10062,24 +8870,24 @@
+@@ -10087,24 +8934,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8098,7 +8306,7 @@
$as_echo "no" >&6; }
fi
-@@ -10088,7 +8896,7 @@
+@@ -10113,7 +8960,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8107,7 +8315,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10101,9 +8909,9 @@
+@@ -10126,9 +8973,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
@@ -8119,7 +8327,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL"; then
-@@ -10114,24 +8922,24 @@
+@@ -10139,24 +8986,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8149,7 +8357,7 @@
$as_echo "no" >&6; }
fi
-@@ -10141,9 +8949,9 @@
+@@ -10166,9 +9013,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
@@ -8161,7 +8369,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL"; then
-@@ -10154,24 +8962,24 @@
+@@ -10179,24 +9026,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8191,7 +8399,7 @@
$as_echo "no" >&6; }
fi
-@@ -10180,7 +8988,7 @@
+@@ -10205,7 +9052,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8200,7 +8408,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10193,9 +9001,9 @@
+@@ -10218,9 +9065,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
@@ -8212,7 +8420,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$OTOOL64"; then
-@@ -10206,24 +9014,24 @@
+@@ -10231,24 +9078,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8242,7 +8450,7 @@
$as_echo "no" >&6; }
fi
-@@ -10233,9 +9041,9 @@
+@@ -10258,9 +9105,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
@@ -8254,7 +8462,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OTOOL64"; then
-@@ -10246,24 +9054,24 @@
+@@ -10271,24 +9118,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8284,7 +8492,7 @@
$as_echo "no" >&6; }
fi
-@@ -10272,7 +9080,7 @@
+@@ -10297,7 +9144,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8293,7 +8501,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10308,9 +9116,9 @@
+@@ -10333,9 +9180,9 @@
@@ -8305,7 +8513,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_apple_cc_single_mod=no
-@@ -10335,22 +9143,18 @@
+@@ -10360,22 +9207,18 @@
rm -f conftest.*
fi
fi
@@ -8332,7 +8540,7 @@
/* end confdefs.h. */
int
-@@ -10361,42 +9165,17 @@
+@@ -10386,42 +9229,17 @@
return 0;
}
_ACEOF
@@ -8380,7 +8588,7 @@
$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
case $host_os in
rhapsody* | darwin1.[012])
-@@ -10433,62 +9212,13 @@
+@@ -10458,62 +9276,13 @@
;;
esac
@@ -8448,7 +8656,7 @@
_ACEOF
fi
-@@ -10511,9 +9241,9 @@
+@@ -10536,9 +9305,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
@@ -8460,7 +8668,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
-@@ -10524,24 +9254,24 @@
+@@ -10549,24 +9318,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8490,7 +8698,7 @@
$as_echo "no" >&6; }
fi
-@@ -10555,9 +9285,9 @@
+@@ -10580,9 +9349,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
@@ -8502,7 +8710,7 @@
$as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
-@@ -10568,24 +9298,24 @@
+@@ -10593,24 +9362,24 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -8532,7 +8740,7 @@
$as_echo "no" >&6; }
fi
-@@ -10598,7 +9328,7 @@
+@@ -10623,7 +9392,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -8541,7 +8749,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -10609,53 +9339,36 @@
+@@ -10634,53 +9403,36 @@
fi
fi
# Provide some information about the compiler.
@@ -8592,8 +8800,8 @@
+... rest of stderr output deleted ...
+ 10q' conftest.err >conftest.er1
+ cat conftest.er1 >&5
-+ rm -f conftest.er1 conftest.err
+ fi
++ rm -f conftest.er1 conftest.err
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+done
@@ -8614,13 +8822,10 @@
/* end confdefs.h. */
int
-@@ -10666,40 +9379,19 @@
- #endif
-
- ;
-- return 0;
--}
--_ACEOF
+@@ -10694,37 +9446,16 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
@@ -8639,9 +8844,6 @@
- test -z "$ac_cxx_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
-+ return 0;
-+}
-+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
ac_compiler_gnu=yes
else
@@ -8661,7 +8863,7 @@
$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
if test $ac_compiler_gnu = yes; then
GXX=yes
-@@ -10708,20 +9400,16 @@
+@@ -10733,20 +9464,16 @@
fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
@@ -8685,7 +8887,7 @@
/* end confdefs.h. */
int
-@@ -10732,35 +9420,11 @@
+@@ -10757,35 +9484,11 @@
return 0;
}
_ACEOF
@@ -8724,7 +8926,7 @@
/* end confdefs.h. */
int
-@@ -10771,36 +9435,12 @@
+@@ -10796,36 +9499,12 @@
return 0;
}
_ACEOF
@@ -8765,7 +8967,7 @@
/* end confdefs.h. */
int
-@@ -10811,42 +9451,17 @@
+@@ -10836,42 +9515,17 @@
return 0;
}
_ACEOF
@@ -8810,7 +9012,7 @@
$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
-@@ -10871,9 +9486,9 @@
+@@ -10896,9 +9550,9 @@
depcc="$CXX" am_compiler_list=
@@ -8822,7 +9024,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -10981,7 +9596,7 @@
+@@ -11006,7 +9660,7 @@
fi
fi
@@ -8831,7 +9033,7 @@
$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -11004,10 +9619,10 @@
+@@ -11029,10 +9683,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
@@ -8844,7 +9046,7 @@
$as_echo_n "(cached) " >&6
else
# Double quotes because CXXCPP needs to be expanded
-@@ -11022,11 +9637,7 @@
+@@ -11047,11 +9701,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.
@@ -8857,7 +9059,7 @@
/* end confdefs.h. */
#ifdef __STDC__
# include <limits.h>
-@@ -11035,78 +9646,34 @@
+@@ -11060,78 +9710,34 @@
#endif
Syntax error
_ACEOF
@@ -8941,7 +9143,7 @@
break
fi
-@@ -11118,7 +9685,7 @@
+@@ -11143,7 +9749,7 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -8950,7 +9152,7 @@
$as_echo "$CXXCPP" >&6; }
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
-@@ -11129,11 +9696,7 @@
+@@ -11154,94 +9760,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.
@@ -8961,12 +9163,13 @@
-cat >>conftest.$ac_ext <<_ACEOF
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
- #ifdef __STDC__
- # include <limits.h>
-@@ -11142,81 +9705,37 @@
- #endif
- Syntax error
- _ACEOF
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+- Syntax error
+-_ACEOF
-if { (ac_try="$ac_cpp conftest.$ac_ext"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -8988,6 +9191,13 @@
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++ Syntax error
++_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+else
@@ -9052,7 +9262,7 @@
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
_lt_caught_CXX_error=yes; }
fi
-@@ -11246,7 +9765,7 @@
+@@ -11271,7 +9829,7 @@
# Check whether --enable-shared was given.
@@ -9061,7 +9271,7 @@
enableval=$enable_shared; p=${PACKAGE-default}
case $enableval in
yes) enable_shared=yes ;;
-@@ -11277,7 +9796,7 @@
+@@ -11302,7 +9860,7 @@
# Check whether --enable-static was given.
@@ -9070,7 +9280,7 @@
enableval=$enable_static; p=${PACKAGE-default}
case $enableval in
yes) enable_static=yes ;;
-@@ -11309,7 +9828,7 @@
+@@ -11334,7 +9892,7 @@
# Check whether --with-pic was given.
@@ -9079,7 +9289,7 @@
withval=$with_pic; pic_mode="$withval"
else
pic_mode=default
-@@ -11325,7 +9844,7 @@
+@@ -11350,7 +9908,7 @@
# Check whether --enable-fast-install was given.
@@ -9088,7 +9298,7 @@
enableval=$enable_fast_install; p=${PACKAGE-default}
case $enableval in
yes) enable_fast_install=yes ;;
-@@ -11406,9 +9925,9 @@
+@@ -11431,9 +9989,9 @@
setopt NO_GLOB_SUBST
fi
@@ -9100,7 +9310,7 @@
$as_echo_n "(cached) " >&6
else
rm -f .libs 2>/dev/null
-@@ -11421,7 +9940,7 @@
+@@ -11446,7 +10004,7 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -9109,7 +9319,7 @@
$as_echo "$lt_cv_objdir" >&6; }
objdir=$lt_cv_objdir
-@@ -11514,9 +10033,9 @@
+@@ -11539,9 +10097,9 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -9121,7 +9331,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11567,10 +10086,10 @@
+@@ -11592,10 +10150,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9134,7 +9344,7 @@
$as_echo "no" >&6; }
fi
-@@ -11580,9 +10099,9 @@
+@@ -11605,9 +10163,9 @@
if test -z "$lt_cv_path_MAGIC_CMD"; then
if test -n "$ac_tool_prefix"; then
@@ -9146,7 +9356,7 @@
$as_echo_n "(cached) " >&6
else
case $MAGIC_CMD in
-@@ -11633,10 +10152,10 @@
+@@ -11658,10 +10216,10 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -9159,7 +9369,7 @@
$as_echo "no" >&6; }
fi
-@@ -11713,9 +10232,9 @@
+@@ -11738,9 +10296,9 @@
if test "$GCC" = yes; then
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -9171,21 +9381,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_rtti_exceptions=no
-@@ -11731,11 +10250,11 @@
+@@ -11756,11 +10314,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:11734: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10253: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:11759: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10317: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:11738: \$? = $ac_status" >&5
-+ echo "$as_me:10257: \$? = $ac_status" >&5
+- echo "$as_me:11763: \$? = $ac_status" >&5
++ echo "$as_me:10321: \$? = $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.
-@@ -11748,7 +10267,7 @@
+@@ -11773,7 +10331,7 @@
$RM conftest*
fi
@@ -9194,7 +9404,7 @@
$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -11768,7 +10287,7 @@
+@@ -11793,7 +10351,7 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -9203,7 +9413,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
if test "$GCC" = yes; then
-@@ -12040,7 +10559,7 @@
+@@ -11925,7 +10483,7 @@
+ lt_prog_compiler_static='-non_shared'
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ # old Intel for x86_64 which still supported -KPIC.
+ ecc*)
+@@ -12065,7 +10623,7 @@
lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
;;
esac
@@ -9212,7 +9431,7 @@
$as_echo "$lt_prog_compiler_pic" >&6; }
-@@ -12052,9 +10571,9 @@
+@@ -12077,9 +10635,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic"; then
@@ -9224,21 +9443,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works=no
-@@ -12070,11 +10589,11 @@
+@@ -12095,11 +10653,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:12073: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10592: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12098: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10656: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:12077: \$? = $ac_status" >&5
-+ echo "$as_me:10596: \$? = $ac_status" >&5
+- echo "$as_me:12102: \$? = $ac_status" >&5
++ echo "$as_me:10660: \$? = $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.
-@@ -12087,7 +10606,7 @@
+@@ -12112,7 +10670,7 @@
$RM conftest*
fi
@@ -9247,7 +9466,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -12111,9 +10630,9 @@
+@@ -12136,9 +10694,9 @@
# Check to make sure the static flag actually works.
#
wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -9259,7 +9478,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works=no
-@@ -12139,7 +10658,7 @@
+@@ -12164,7 +10722,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9268,7 +9487,7 @@
$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -12154,9 +10673,9 @@
+@@ -12179,9 +10737,9 @@
@@ -9280,21 +9499,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12175,11 +10694,11 @@
+@@ -12200,11 +10758,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:12178: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10697: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12203: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12182: \$? = $ac_status" >&5
-+ echo "$as_me:10701: \$? = $ac_status" >&5
+- echo "$as_me:12207: \$? = $ac_status" >&5
++ echo "$as_me:10765: \$? = $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
-@@ -12201,7 +10720,7 @@
+@@ -12226,7 +10784,7 @@
$RM conftest*
fi
@@ -9303,7 +9522,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12209,9 +10728,9 @@
+@@ -12234,9 +10792,9 @@
@@ -9315,21 +9534,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o=no
-@@ -12230,11 +10749,11 @@
+@@ -12255,11 +10813,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:12233: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:10752: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:12258: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10816: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:12237: \$? = $ac_status" >&5
-+ echo "$as_me:10756: \$? = $ac_status" >&5
+- echo "$as_me:12262: \$? = $ac_status" >&5
++ echo "$as_me:10820: \$? = $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
-@@ -12256,7 +10775,7 @@
+@@ -12281,7 +10839,7 @@
$RM conftest*
fi
@@ -9338,7 +9557,7 @@
$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
-@@ -12265,7 +10784,7 @@
+@@ -12290,7 +10848,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
@@ -9347,7 +9566,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -12273,10 +10792,10 @@
+@@ -12298,10 +10856,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
@@ -9360,7 +9579,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -12289,7 +10808,7 @@
+@@ -12314,7 +10872,7 @@
@@ -9369,7 +9588,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
runpath_var=
-@@ -12349,6 +10868,9 @@
+@@ -12374,6 +10932,9 @@
openbsd*)
with_gnu_ld=no
;;
@@ -9379,7 +9598,24 @@
esac
ld_shlibs=yes
-@@ -12531,7 +11053,7 @@
+@@ -12395,6 +10956,7 @@
+ fi
+ supports_anon_versioning=no
+ case `$LD -v 2>&1` in
++ *GNU\ gold*) supports_anon_versioning=yes ;;
+ *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+@@ -12486,7 +11048,7 @@
+ archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ ;;
+
+- gnu* | linux* | tpf* | k*bsd*-gnu)
++ gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+ tmp_diet=no
+ if test "$host_os" = linux-dietlibc; then
+ case $cc_basename in
+@@ -12556,7 +11118,7 @@
fi
;;
@@ -9388,7 +9624,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -12706,6 +11228,7 @@
+@@ -12731,6 +11293,7 @@
if test "$aix_use_runtimelinking" = yes; then
shared_flag="$shared_flag "'${wl}-G'
fi
@@ -9396,7 +9632,7 @@
else
# not using gcc
if test "$host_cpu" = ia64; then
-@@ -12731,11 +11254,7 @@
+@@ -12756,11 +11319,7 @@
allow_undefined_flag='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9409,7 +9645,7 @@
/* end confdefs.h. */
int
-@@ -12746,27 +11265,7 @@
+@@ -12771,27 +11330,7 @@
return 0;
}
_ACEOF
@@ -9438,7 +9674,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12780,16 +11279,9 @@
+@@ -12805,16 +11344,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
@@ -9457,7 +9693,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -12802,11 +11294,7 @@
+@@ -12827,11 +11359,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -9470,7 +9706,7 @@
/* end confdefs.h. */
int
-@@ -12817,27 +11305,7 @@
+@@ -12842,27 +11370,7 @@
return 0;
}
_ACEOF
@@ -9499,7 +9735,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -12851,16 +11319,9 @@
+@@ -12876,16 +11384,9 @@
if test -z "$aix_libpath"; then
aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi
@@ -9518,7 +9754,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -13072,42 +11533,16 @@
+@@ -13097,42 +11598,16 @@
# implicitly export all symbols.
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
@@ -9566,7 +9802,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'
-@@ -13120,7 +11555,7 @@
+@@ -13145,7 +11620,7 @@
link_all_deplibs=yes
;;
@@ -9575,7 +9811,7 @@
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -13363,7 +11798,7 @@
+@@ -13388,7 +11863,7 @@
fi
fi
@@ -9584,7 +9820,7 @@
$as_echo "$ld_shlibs" >&6; }
test "$ld_shlibs" = no && can_build_shared=no
-@@ -13400,16 +11835,16 @@
+@@ -13425,16 +11900,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.
@@ -9605,7 +9841,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -13423,11 +11858,11 @@
+@@ -13448,11 +11923,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag
allow_undefined_flag=
@@ -9620,7 +9856,7 @@
then
archive_cmds_need_lc=no
else
-@@ -13438,7 +11873,7 @@
+@@ -13463,7 +11938,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -9629,7 +9865,7 @@
$as_echo "$archive_cmds_need_lc" >&6; }
;;
esac
-@@ -13602,7 +12037,7 @@
+@@ -13627,7 +12102,7 @@
@@ -9638,7 +9874,16 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
if test "$GCC" = yes; then
-@@ -14024,11 +12459,7 @@
+@@ -14035,7 +12510,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -14049,11 +12524,7 @@
save_libdir=$libdir
eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
@@ -9651,7 +9896,7 @@
/* end confdefs.h. */
int
-@@ -14039,41 +12470,13 @@
+@@ -14064,41 +12535,13 @@
return 0;
}
_ACEOF
@@ -9697,7 +9942,7 @@
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -14082,13 +12485,10 @@
+@@ -14107,13 +12550,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -9712,7 +9957,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -14100,6 +12500,18 @@
+@@ -14125,6 +12565,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9731,7 +9976,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -14288,7 +12700,7 @@
+@@ -14313,7 +12765,7 @@
dynamic_linker=no
;;
esac
@@ -9740,7 +9985,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -14390,7 +12802,7 @@
+@@ -14415,7 +12867,7 @@
@@ -9749,7 +9994,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" ||
-@@ -14415,7 +12827,7 @@
+@@ -14440,7 +12892,7 @@
# directories.
hardcode_action=unsupported
fi
@@ -9758,35 +10003,109 @@
$as_echo "$hardcode_action" >&6; }
if test "$hardcode_action" = relink ||
-@@ -14448,123 +12860,27 @@
- lt_cv_dlopen_self=yes
- ;;
-
-- mingw* | pw32* | cegcc*)
-- lt_cv_dlopen="LoadLibrary"
-- lt_cv_dlopen_libs=
-- ;;
--
-- cygwin*)
-- lt_cv_dlopen="dlopen"
-- lt_cv_dlopen_libs=
-- ;;
--
-- darwin*)
-- # if libdl is installed we need to link against it
+@@ -14485,18 +12937,14 @@
+
+ darwin*)
+ # if libdl is installed we need to link against it
- { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
--$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-- $as_echo_n "(cached) " >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldl $LIBS"
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ /* Override any GCC internal prototype to avoid an error.
+@@ -14514,43 +12962,18 @@
+ return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+- *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+- (eval "$ac_link") 2>conftest.er1
+- ac_status=$?
+- grep -v '^ *+' conftest.er1 >conftest.err
+- rm -f conftest.er1
+- cat conftest.err >&5
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); } && {
+- test -z "$ac_c_werror_flag" ||
+- test ! -s conftest.err
+- } && test -s conftest$ac_exeext && {
+- test "$cross_compiling" = yes ||
+- $as_test_x conftest$ac_exeext
+- }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ ac_cv_lib_dl_dlopen=yes
+ else
+- $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+- ac_cv_lib_dl_dlopen=no
++ ac_cv_lib_dl_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+- conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+
+@@ -14563,106 +12986,18 @@
+ ;;
+
+ *)
+- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
+- $as_echo_n "(cached) " >&6
+-else
+- cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h. */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+- For example, HP-UX 11i <limits.h> declares gettimeofday. */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+- which can conflict with char shl_load (); below.
+- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+- <limits.h> exists even on freestanding compilers. */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
@@ -9794,11 +10113,18 @@
-#ifdef __cplusplus
-extern "C"
-#endif
--char dlopen ();
+-char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+- to always fail with ENOSYS. Some functions are actually named
+- something starting with __ and the normal name is an alias. */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
-int
-main ()
-{
--return dlopen ();
+-return shl_load ();
- ;
- return 0;
-}
@@ -9824,157 +10150,21 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
-- ac_cv_lib_dl_dlopen=yes
+- ac_cv_func_shl_load=yes
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_dl_dlopen=no
+- ac_cv_func_shl_load=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
-fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
--$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-- lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--
-- lt_cv_dlopen="dyld"
-- lt_cv_dlopen_libs=
-- lt_cv_dlopen_self=yes
--
--fi
-+ mingw* | pw32* | cegcc*)
-+ lt_cv_dlopen="LoadLibrary"
-+ lt_cv_dlopen_libs=
-+ ;;
-
-+ cygwin*)
-+ lt_cv_dlopen="dlopen"
-+ lt_cv_dlopen_libs=
- ;;
-
-- *)
-- { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
--if test "${ac_cv_func_shl_load+set}" = set; then
-+ darwin*)
-+ # if libdl is installed we need to link against it
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
-+$as_echo_n "checking for dlopen in -ldl... " >&6; }
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-- cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h. */
--/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-- For example, HP-UX 11i <limits.h> declares gettimeofday. */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
-- which can conflict with char shl_load (); below.
-- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- <limits.h> exists even on freestanding compilers. */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
-
- /* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
-@@ -14572,72 +12888,51 @@
- #ifdef __cplusplus
- extern "C"
- #endif
--char shl_load ();
--/* The GNU C library defines this for functions which it implements
-- to always fail with ENOSYS. Some functions are actually named
-- something starting with __ and the normal name is an alias. */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
-+char dlopen ();
- int
- main ()
- {
--return shl_load ();
-+return dlopen ();
- ;
- return 0;
- }
- _ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--case "(($ac_try" in
-- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-- *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-- (eval "$ac_link") 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } && {
-- test -z "$ac_c_werror_flag" ||
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
-- $as_test_x conftest$ac_exeext
-- }; then
-- ac_cv_func_shl_load=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+ ac_cv_lib_dl_dlopen=yes
- else
-- $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_cv_func_shl_load=no
-+ ac_cv_lib_dl_dlopen=no
- fi
-+rm -f core conftest.err conftest.$ac_objext \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
-+$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-+ lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
-+
-+ lt_cv_dlopen="dyld"
-+ lt_cv_dlopen_libs=
-+ lt_cv_dlopen_self=yes
-
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-- conftest$ac_exeext conftest.$ac_ext
- fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-$as_echo "$ac_cv_func_shl_load" >&6; }
-if test "x$ac_cv_func_shl_load" = x""yes; then
-+
-+ ;;
-+
-+ *)
+ ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
+if test "x$ac_cv_func_shl_load" = x""yes; then :
lt_cv_dlopen="shl_load"
@@ -9997,7 +10187,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14655,145 +12950,32 @@
+@@ -14680,145 +13015,32 @@
return 0;
}
_ACEOF
@@ -10040,12 +10230,10 @@
LIBS=$ac_check_lib_save_LIBS
fi
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
- $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
- else
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+-else
- { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
-$as_echo_n "checking for dlopen... " >&6; }
-if test "${ac_cv_func_dlopen+set}" = set; then
@@ -10132,6 +10320,11 @@
-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-$as_echo "$ac_cv_func_dlopen" >&6; }
-if test "x$ac_cv_func_dlopen" = x""yes; then
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++else
+ ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
lt_cv_dlopen="dlopen"
@@ -10154,7 +10347,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14811,57 +12993,28 @@
+@@ -14836,57 +13058,28 @@
return 0;
}
_ACEOF
@@ -10221,7 +10414,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14879,57 +13032,28 @@
+@@ -14904,57 +13097,28 @@
return 0;
}
_ACEOF
@@ -10288,7 +10481,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -14947,43 +13071,18 @@
+@@ -14972,43 +13136,18 @@
return 0;
}
_ACEOF
@@ -10338,7 +10531,7 @@
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
fi
-@@ -15022,9 +13121,9 @@
+@@ -15047,9 +13186,9 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -10350,16 +10543,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15033,7 +13132,7 @@
+@@ -15058,7 +13197,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15036 "configure"
-+#line 13135 "configure"
+-#line 15061 "configure"
++#line 13200 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15092,11 +13191,11 @@
+@@ -15117,11 +13256,11 @@
return status;
}
_LT_EOF
@@ -10374,7 +10567,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15113,14 +13212,14 @@
+@@ -15138,14 +13277,14 @@
fi
@@ -10392,16 +10585,16 @@
$as_echo_n "(cached) " >&6
else
if test "$cross_compiling" = yes; then :
-@@ -15129,7 +13228,7 @@
+@@ -15154,7 +13293,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
--#line 15132 "configure"
-+#line 13231 "configure"
+-#line 15157 "configure"
++#line 13296 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -15188,11 +13287,11 @@
+@@ -15213,11 +13352,11 @@
return status;
}
_LT_EOF
@@ -10416,7 +10609,7 @@
(./conftest; exit; ) >&5 2>/dev/null
lt_status=$?
case x$lt_status in
-@@ -15209,7 +13308,7 @@
+@@ -15234,7 +13373,7 @@
fi
@@ -10425,7 +10618,7 @@
$as_echo "$lt_cv_dlopen_self_static" >&6; }
fi
-@@ -15248,12 +13347,12 @@
+@@ -15273,12 +13412,12 @@
striplib=
old_striplib=
@@ -10440,7 +10633,7 @@
$as_echo "yes" >&6; }
else
# FIXME - insert some real tests, host_os isn't really good enough
-@@ -15262,15 +13361,15 @@
+@@ -15287,15 +13426,15 @@
if test -n "$STRIP" ; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
@@ -10459,7 +10652,7 @@
$as_echo "no" >&6; }
;;
esac
-@@ -15288,12 +13387,12 @@
+@@ -15313,12 +13452,12 @@
# Report which library types will actually be built
@@ -10475,7 +10668,7 @@
$as_echo_n "checking whether to build shared libraries... " >&6; }
test "$can_build_shared" = "no" && enable_shared=no
-@@ -15314,14 +13413,14 @@
+@@ -15339,14 +13478,14 @@
fi
;;
esac
@@ -10493,7 +10686,7 @@
$as_echo "$enable_static" >&6; }
-@@ -15462,7 +13561,7 @@
+@@ -15487,7 +13626,7 @@
# Check whether --with-gnu-ld was given.
@@ -10502,7 +10695,7 @@
withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
else
with_gnu_ld=no
-@@ -15471,7 +13570,7 @@
+@@ -15496,7 +13635,7 @@
ac_prog=ld
if test "$GCC" = yes; then
# Check if gcc -print-prog-name=ld gives a path.
@@ -10511,7 +10704,7 @@
$as_echo_n "checking for ld used by $CC... " >&6; }
case $host in
*-*-mingw*)
-@@ -15501,13 +13600,13 @@
+@@ -15526,13 +13665,13 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -10528,7 +10721,7 @@
$as_echo_n "(cached) " >&6
else
if test -z "$LD"; then
-@@ -15538,18 +13637,16 @@
+@@ -15563,18 +13702,16 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -10552,7 +10745,7 @@
$as_echo_n "(cached) " >&6
else
# I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -15562,7 +13659,7 @@
+@@ -15587,7 +13724,7 @@
;;
esac
fi
@@ -10561,7 +10754,7 @@
$as_echo "$lt_cv_prog_gnu_ld" >&6; }
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -15617,7 +13714,7 @@
+@@ -15642,7 +13779,7 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -10570,7 +10763,7 @@
$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
ld_shlibs_CXX=yes
case $host_os in
-@@ -15718,11 +13815,7 @@
+@@ -15743,11 +13880,7 @@
allow_undefined_flag_CXX='-berok'
# Determine the default libpath from the value encoded in an empty
# executable.
@@ -10583,7 +10776,7 @@
/* end confdefs.h. */
int
-@@ -15733,27 +13826,7 @@
+@@ -15758,27 +13891,7 @@
return 0;
}
_ACEOF
@@ -10612,7 +10805,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15767,16 +13840,9 @@
+@@ -15792,16 +13905,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
@@ -10631,7 +10824,7 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -15790,11 +13856,7 @@
+@@ -15815,11 +13921,7 @@
else
# Determine the default libpath from the value encoded in an
# empty executable.
@@ -10644,7 +10837,7 @@
/* end confdefs.h. */
int
-@@ -15805,27 +13867,7 @@
+@@ -15830,27 +13932,7 @@
return 0;
}
_ACEOF
@@ -10673,7 +10866,7 @@
lt_aix_libpath_sed='
/Import File Strings/,/^$/ {
-@@ -15839,16 +13881,9 @@
+@@ -15864,16 +13946,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
@@ -10692,7 +10885,16 @@
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -16592,7 +14627,7 @@
+@@ -16158,7 +14233,7 @@
+ inherit_rpath_CXX=yes
+ ;;
+
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -16617,7 +14692,7 @@
;;
esac
@@ -10701,7 +10903,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -16620,11 +14655,11 @@
+@@ -16645,11 +14720,11 @@
};
_LT_EOF
@@ -10716,7 +10918,7 @@
# Parse the compiler output and extract the necessary
# objects, libraries and library flags.
-@@ -16805,7 +14840,7 @@
+@@ -16830,7 +14905,7 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -10725,7 +10927,16 @@
$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
# C++ specific cases for pic, static, wl, etc.
-@@ -17025,7 +15060,7 @@
+@@ -16986,7 +15061,7 @@
+ ;;
+ esac
+ ;;
+- linux* | k*bsd*-gnu)
++ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ case $cc_basename in
+ KCC*)
+ # KAI C++ Compiler
+@@ -17050,7 +15125,7 @@
;;
esac
;;
@@ -10734,7 +10945,7 @@
;;
*qnx* | *nto*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -17122,7 +15157,7 @@
+@@ -17147,7 +15222,7 @@
lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
;;
esac
@@ -10743,7 +10954,7 @@
$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-@@ -17131,9 +15166,9 @@
+@@ -17156,9 +15231,9 @@
# Check to make sure the PIC flag actually works.
#
if test -n "$lt_prog_compiler_pic_CXX"; then
@@ -10755,21 +10966,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_pic_works_CXX=no
-@@ -17149,11 +15184,11 @@
+@@ -17174,11 +15249,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:17152: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15187: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17177: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15252: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
-- echo "$as_me:17156: \$? = $ac_status" >&5
-+ echo "$as_me:15191: \$? = $ac_status" >&5
+- echo "$as_me:17181: \$? = $ac_status" >&5
++ echo "$as_me:15256: \$? = $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.
-@@ -17166,7 +15201,7 @@
+@@ -17191,7 +15266,7 @@
$RM conftest*
fi
@@ -10778,7 +10989,7 @@
$as_echo "$lt_cv_prog_compiler_pic_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
-@@ -17187,9 +15222,9 @@
+@@ -17212,9 +15287,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\"
@@ -10790,7 +11001,7 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_static_works_CXX=no
-@@ -17215,7 +15250,7 @@
+@@ -17240,7 +15315,7 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10799,7 +11010,7 @@
$as_echo "$lt_cv_prog_compiler_static_works_CXX" >&6; }
if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
-@@ -17227,9 +15262,9 @@
+@@ -17252,9 +15327,9 @@
@@ -10811,21 +11022,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17248,11 +15283,11 @@
+@@ -17273,11 +15348,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:17251: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15286: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17276: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15351: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17255: \$? = $ac_status" >&5
-+ echo "$as_me:15290: \$? = $ac_status" >&5
+- echo "$as_me:17280: \$? = $ac_status" >&5
++ echo "$as_me:15355: \$? = $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
-@@ -17274,14 +15309,14 @@
+@@ -17299,14 +15374,14 @@
$RM conftest*
fi
@@ -10843,21 +11054,21 @@
$as_echo_n "(cached) " >&6
else
lt_cv_prog_compiler_c_o_CXX=no
-@@ -17300,11 +15335,11 @@
+@@ -17325,11 +15400,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:17303: $lt_compile\"" >&5)
-+ (eval echo "\"\$as_me:15338: $lt_compile\"" >&5)
+- (eval echo "\"\$as_me:17328: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15403: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
-- echo "$as_me:17307: \$? = $ac_status" >&5
-+ echo "$as_me:15342: \$? = $ac_status" >&5
+- echo "$as_me:17332: \$? = $ac_status" >&5
++ echo "$as_me:15407: \$? = $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
-@@ -17326,7 +15361,7 @@
+@@ -17351,7 +15426,7 @@
$RM conftest*
fi
@@ -10866,7 +11077,7 @@
$as_echo "$lt_cv_prog_compiler_c_o_CXX" >&6; }
-@@ -17335,7 +15370,7 @@
+@@ -17360,7 +15435,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
@@ -10875,7 +11086,7 @@
$as_echo_n "checking if we can lock with hard links... " >&6; }
hard_links=yes
$RM conftest*
-@@ -17343,10 +15378,10 @@
+@@ -17368,10 +15443,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
@@ -10888,7 +11099,7 @@
$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
need_locks=warn
fi
-@@ -17356,7 +15391,7 @@
+@@ -17381,7 +15456,7 @@
@@ -10897,7 +11108,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'
-@@ -17376,13 +15411,16 @@
+@@ -17401,13 +15476,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'
;;
@@ -10915,7 +11126,7 @@
$as_echo "$ld_shlibs_CXX" >&6; }
test "$ld_shlibs_CXX" = no && can_build_shared=no
-@@ -17410,16 +15448,16 @@
+@@ -17435,16 +15513,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.
@@ -10936,7 +11147,7 @@
soname=conftest
lib=conftest
libobjs=conftest.$ac_objext
-@@ -17433,11 +15471,11 @@
+@@ -17458,11 +15536,11 @@
libname=conftest
lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
allow_undefined_flag_CXX=
@@ -10951,7 +11162,7 @@
then
archive_cmds_need_lc_CXX=no
else
-@@ -17448,7 +15486,7 @@
+@@ -17473,7 +15551,7 @@
cat conftest.err 1>&5
fi
$RM conftest*
@@ -10960,7 +11171,7 @@
$as_echo "$archive_cmds_need_lc_CXX" >&6; }
;;
esac
-@@ -17519,7 +15557,7 @@
+@@ -17544,7 +15622,7 @@
@@ -10969,30 +11180,32 @@
$as_echo_n "checking dynamic linker characteristics... " >&6; }
library_names_spec=
-@@ -17884,61 +15922,29 @@
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
-- # Some binutils ld are patched to set DT_RUNPATH
-- save_LDFLAGS=$LDFLAGS
-- save_libdir=$libdir
-- eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-- LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+@@ -17900,7 +15978,7 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux* | k*bsd*-gnu)
++linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -17914,11 +15992,7 @@
+ save_libdir=$libdir
+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--int
--main ()
--{
--
-- ;
-- return 0;
--}
--_ACEOF
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+ int
+@@ -17929,41 +16003,13 @@
+ return 0;
+ }
+ _ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -11015,43 +11228,27 @@
- $as_test_x conftest$ac_exeext
- }; then
- if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-- shlibpath_overrides_runpath=yes
--fi
++if ac_fn_cxx_try_link "$LINENO"; then :
++ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+ shlibpath_overrides_runpath=yes
+ fi
-
-else
- $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-+ # Some binutils ld are patched to set DT_RUNPATH
-+ save_LDFLAGS=$LDFLAGS
-+ save_libdir=$libdir
-+ eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-+ LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-
-+int
-+main ()
-+{
-
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+ if ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-+ shlibpath_overrides_runpath=yes
+-
+-
fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-+fi
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$save_LDFLAGS
libdir=$save_libdir
-@@ -17947,13 +15953,10 @@
+@@ -17972,13 +16018,10 @@
# before this can be enabled.
hardcode_into_libs=yes
@@ -11066,7 +11263,7 @@
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
-@@ -17965,6 +15968,18 @@
+@@ -17990,6 +16033,18 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -11085,7 +11282,7 @@
netbsd*)
version_type=sunos
need_lib_prefix=no
-@@ -18153,7 +16168,7 @@
+@@ -18178,7 +16233,7 @@
dynamic_linker=no
;;
esac
@@ -11094,7 +11291,7 @@
$as_echo "$dynamic_linker" >&6; }
test "$dynamic_linker" = no && can_build_shared=no
-@@ -18204,7 +16219,7 @@
+@@ -18229,7 +16284,7 @@
@@ -11103,7 +11300,7 @@
$as_echo_n "checking how to hardcode library paths into programs... " >&6; }
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" ||
-@@ -18229,7 +16244,7 @@
+@@ -18254,7 +16309,7 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -11112,7 +11309,7 @@
$as_echo "$hardcode_action_CXX" >&6; }
if test "$hardcode_action_CXX" = relink ||
-@@ -18288,7 +16303,7 @@
+@@ -18313,7 +16368,7 @@
: ${CONFIG_LT=./config.lt}
@@ -11121,7 +11318,7 @@
$as_echo "$as_me: creating $CONFIG_LT" >&6;}
cat >"$CONFIG_LT" <<_LTEOF
#! $SHELL
-@@ -18300,13 +16315,13 @@
+@@ -18325,13 +16380,13 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11139,7 +11336,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -18314,23 +16329,15 @@
+@@ -18339,23 +16394,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -11168,7 +11365,7 @@
as_nl='
'
export as_nl
-@@ -18338,7 +16345,13 @@
+@@ -18363,7 +16410,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
@@ -11183,7 +11380,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -18349,7 +16362,7 @@
+@@ -18374,7 +16427,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -11192,7 +11389,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -18372,13 +16385,6 @@
+@@ -18397,13 +16450,6 @@
}
fi
@@ -11206,7 +11403,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -18388,15 +16394,15 @@
+@@ -18413,15 +16459,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -11225,7 +11422,7 @@
IFS=$as_save_IFS
;;
-@@ -18408,12 +16414,16 @@
+@@ -18433,12 +16479,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -11246,7 +11443,7 @@
done
PS1='$ '
PS2='> '
-@@ -18425,7 +16435,90 @@
+@@ -18450,7 +16500,90 @@
LANGUAGE=C
export LANGUAGE
@@ -11338,7 +11535,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -18439,8 +16532,12 @@
+@@ -18464,8 +16597,12 @@
as_basename=false
fi
@@ -11352,7 +11549,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -18460,77 +16557,25 @@
+@@ -18485,77 +16622,25 @@
}
s/.*/./; q'`
@@ -11441,7 +11638,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -18559,8 +16604,56 @@
+@@ -18584,8 +16669,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -11499,7 +11696,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -18579,10 +16672,10 @@
+@@ -18604,10 +16737,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -11512,16 +11709,16 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -18622,7 +16715,7 @@
+@@ -18647,7 +16780,7 @@
lt_cl_version="\
- totem config.lt 2.28.4
+ totem config.lt 2.28.5
-configured by $0, generated by GNU Autoconf 2.63.
-+configured by $0, generated by GNU Autoconf 2.64.
++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
-@@ -18640,17 +16733,11 @@
+@@ -18665,17 +16798,11 @@
--quiet | --q* | --silent | --s* | -q )
lt_cl_silent=: ;;
@@ -11544,7 +11741,7 @@
esac
shift
done
-@@ -19015,7 +17102,7 @@
+@@ -19040,7 +17167,7 @@
_LTEOF
cat >>"$CONFIG_LT" <<\_LTEOF
@@ -11553,7 +11750,7 @@
$as_echo "$as_me: creating $ofile" >&6;}
-@@ -19819,7 +17906,7 @@
+@@ -19844,7 +17971,7 @@
_LT_EOF
@@ -11562,7 +11759,7 @@
_LTEOF
chmod +x "$CONFIG_LT"
-@@ -19834,7 +17921,7 @@
+@@ -19859,7 +17986,7 @@
exec 5>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
exec 5>>config.log
@@ -11571,7 +11768,7 @@
fi
-@@ -19844,9 +17931,9 @@
+@@ -19869,9 +17996,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
@@ -11583,7 +11780,7 @@
$as_echo_n "(cached) " >&6
else
case $PKG_CONFIG in
-@@ -19859,14 +17946,14 @@
+@@ -19884,14 +18011,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11601,7 +11798,7 @@
IFS=$as_save_IFS
;;
-@@ -19874,10 +17961,10 @@
+@@ -19899,10 +18026,10 @@
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
@@ -11614,7 +11811,7 @@
$as_echo "no" >&6; }
fi
-@@ -19887,9 +17974,9 @@
+@@ -19912,9 +18039,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
@@ -11626,7 +11823,7 @@
$as_echo_n "(cached) " >&6
else
case $ac_pt_PKG_CONFIG in
-@@ -19902,14 +17989,14 @@
+@@ -19927,14 +18054,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11644,7 +11841,7 @@
IFS=$as_save_IFS
;;
-@@ -19917,10 +18004,10 @@
+@@ -19942,10 +18069,10 @@
fi
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
if test -n "$ac_pt_PKG_CONFIG"; then
@@ -11657,7 +11854,7 @@
$as_echo "no" >&6; }
fi
-@@ -19929,7 +18016,7 @@
+@@ -19954,7 +18081,7 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
@@ -11666,7 +11863,7 @@
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
-@@ -19942,13 +18029,13 @@
+@@ -19967,13 +18094,13 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11683,7 +11880,7 @@
$as_echo "no" >&6; }
PKG_CONFIG=""
fi
-@@ -19957,9 +18044,9 @@
+@@ -19982,9 +18109,9 @@
# Extract the first word of "glib-genmarshal", so it can be a program name with args.
set dummy glib-genmarshal; ac_word=$2
@@ -11695,7 +11892,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_GENMARSHAL in
-@@ -19972,14 +18059,14 @@
+@@ -19997,14 +18124,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11713,7 +11910,7 @@
IFS=$as_save_IFS
;;
-@@ -19987,19 +18074,19 @@
+@@ -20012,19 +18139,19 @@
fi
GLIB_GENMARSHAL=$ac_cv_path_GLIB_GENMARSHAL
if test -n "$GLIB_GENMARSHAL"; then
@@ -11737,7 +11934,7 @@
$as_echo_n "(cached) " >&6
else
case $GLIB_MKENUMS in
-@@ -20012,14 +18099,14 @@
+@@ -20037,14 +18164,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -11755,7 +11952,7 @@
IFS=$as_save_IFS
;;
-@@ -20027,10 +18114,10 @@
+@@ -20052,10 +18179,10 @@
fi
GLIB_MKENUMS=$ac_cv_path_GLIB_MKENUMS
if test -n "$GLIB_MKENUMS"; then
@@ -11768,7 +11965,7 @@
$as_echo "no" >&6; }
fi
-@@ -20052,7 +18139,7 @@
+@@ -20077,7 +18204,7 @@
# The full list of plugins
@@ -11777,7 +11974,7 @@
PLUGINDIR='${libdir}/totem/plugins'
-@@ -20063,10 +18150,10 @@
+@@ -20088,10 +18215,10 @@
HAVE_GSTREAMER=no
@@ -11790,7 +11987,7 @@
enableval=$enable_easy_codec_installation;
case "${enableval}" in
yes) enable_easy_codec_installation=yes ;;
-@@ -20081,46 +18168,50 @@
+@@ -20106,46 +18233,50 @@
fi
@@ -11861,7 +12058,7 @@
fi
-@@ -20133,25 +18224,14 @@
+@@ -20158,25 +18289,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -11890,7 +12087,7 @@
$MISSING_PLUGINS_PKG_ERRORS
-@@ -20161,22 +18241,11 @@
+@@ -20186,22 +18306,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.
@@ -11916,7 +12113,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20185,19 +18254,16 @@
+@@ -20210,19 +18319,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -11939,7 +12136,7 @@
fi
-@@ -20206,40 +18272,44 @@
+@@ -20231,40 +18337,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
@@ -12003,7 +12200,7 @@
fi
-@@ -20252,25 +18322,14 @@
+@@ -20277,25 +18387,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12032,7 +12229,7 @@
$GST_PKG_ERRORS
-@@ -20280,22 +18339,11 @@
+@@ -20305,22 +18404,11 @@
Alternatively, you may set the environment variables GST_CFLAGS
and GST_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12058,7 +12255,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20304,12 +18352,11 @@
+@@ -20329,12 +18417,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12073,7 +12270,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -20320,94 +18367,79 @@
+@@ -20345,94 +18432,79 @@
gst010_toolsdir=`$PKG_CONFIG --variable=toolsdir gstreamer-0.10`
gst010_inspect="$gst010_toolsdir/gst-inspect-0.10"
@@ -12190,7 +12387,7 @@
$as_echo "no" >&6; }
fi
-@@ -20428,11 +18460,11 @@
+@@ -20453,11 +18525,11 @@
GDK_TARGET="$($PKG_CONFIG --variable target gdk-2.0)"
SMCLIENT_PKGS=
@@ -12204,7 +12401,7 @@
withval=$with_smclient;
else
case "$GDK_TARGET" in
-@@ -20442,46 +18474,50 @@
+@@ -20467,46 +18539,50 @@
esac
fi
@@ -12275,7 +12472,7 @@
fi
-@@ -20494,25 +18530,14 @@
+@@ -20519,25 +18595,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12304,7 +12501,7 @@
$SMCLIENT_PKG_ERRORS
-@@ -20522,22 +18547,11 @@
+@@ -20547,22 +18612,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.
@@ -12330,7 +12527,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20546,19 +18560,16 @@
+@@ -20571,19 +18625,16 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12353,7 +12550,7 @@
fi
-@@ -20598,21 +18609,22 @@
+@@ -20623,21 +18674,22 @@
pkg_failed=no
@@ -12383,7 +12580,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20622,8 +18634,8 @@
+@@ -20647,8 +18699,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12394,7 +12591,7 @@
pkg_cv_DEPENDENCY_CFLAGS=`$PKG_CONFIG --cflags "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20635,21 +18647,23 @@
+@@ -20660,21 +18712,23 @@
else
pkg_failed=yes
fi
@@ -12426,7 +12623,7 @@
($PKG_CONFIG --exists --print-errors "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20659,8 +18673,8 @@
+@@ -20684,8 +18738,8 @@
totem-plparser >= $TOTEM_PLPARSER_REQS
cairo") 2>&5
ac_status=$?
@@ -12437,7 +12634,7 @@
pkg_cv_DEPENDENCY_LIBS=`$PKG_CONFIG --libs "
glib-2.0 >= $GLIB_REQS
gio-2.0
-@@ -20672,8 +18686,9 @@
+@@ -20697,8 +18751,9 @@
else
pkg_failed=yes
fi
@@ -12449,7 +12646,7 @@
fi
-@@ -20686,46 +18701,28 @@
+@@ -20711,46 +18766,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12501,7 +12698,7 @@
glib-2.0 >= $GLIB_REQS
gio-2.0
gtk+-2.0 >= $GTK_REQS
-@@ -20742,22 +18739,11 @@
+@@ -20767,22 +18804,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.
@@ -12527,7 +12724,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20766,52 +18752,55 @@
+@@ -20791,52 +18817,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12605,7 +12802,7 @@
fi
-@@ -20824,25 +18813,14 @@
+@@ -20849,25 +18878,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12634,7 +12831,7 @@
$MM_PKG_ERRORS
-@@ -20852,22 +18830,11 @@
+@@ -20877,22 +18895,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.
@@ -12660,7 +12857,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20876,52 +18843,55 @@
+@@ -20901,52 +18908,55 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12738,7 +12935,7 @@
fi
-@@ -20934,25 +18904,14 @@
+@@ -20959,25 +18969,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12767,7 +12964,7 @@
$GTK_PKG_ERRORS
-@@ -20962,22 +18921,11 @@
+@@ -20987,22 +18986,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.
@@ -12793,7 +12990,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -20986,12 +18934,11 @@
+@@ -21011,12 +18999,11 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12808,7 +13005,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -21001,54 +18948,58 @@
+@@ -21026,54 +19013,58 @@
if test -n "$PKG_CONFIG" && \
@@ -12890,7 +13087,7 @@
fi
-@@ -21061,25 +19012,14 @@
+@@ -21086,25 +19077,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -12919,7 +13116,7 @@
$UNIQUE_PKG_ERRORS
-@@ -21089,22 +19029,11 @@
+@@ -21114,22 +19094,11 @@
Alternatively, you may set the environment variables UNIQUE_CFLAGS
and UNIQUE_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
@@ -12945,7 +13142,7 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-@@ -21113,24 +19042,23 @@
+@@ -21138,24 +19107,23 @@
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
@@ -12974,7 +13171,7 @@
withval=$with_x;
fi
-@@ -21140,10 +19068,8 @@
+@@ -21165,10 +19133,8 @@
have_x=disabled
else
case $x_includes,$x_libraries in #(
@@ -12987,7 +13184,7 @@
$as_echo_n "(cached) " >&6
else
# One or both of the vars are not set, and there is no cached value.
-@@ -21191,21 +19117,25 @@
+@@ -21216,21 +19182,25 @@
# Check X11 before X11Rn because it is often a symlink to the current release.
ac_x_header_dirs='
/usr/X11/include
@@ -13013,7 +13210,7 @@
/usr/local/include/X11R6
/usr/local/include/X11R5
/usr/local/include/X11R4
-@@ -21227,37 +19157,14 @@
+@@ -21252,37 +19222,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.
@@ -13053,7 +13250,7 @@
for ac_dir in $ac_x_header_dirs; do
if test -r "$ac_dir/X11/Xlib.h"; then
ac_x_includes=$ac_dir
-@@ -21265,7 +19172,6 @@
+@@ -21290,7 +19237,6 @@
fi
done
fi
@@ -13061,7 +13258,7 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -21275,11 +19181,7 @@
+@@ -21300,11 +19246,7 @@
# Don't add to $LIBS permanently.
ac_save_LIBS=$LIBS
LIBS="-lX11 $LIBS"
@@ -13074,7 +13271,7 @@
/* end confdefs.h. */
#include <X11/Xlib.h>
int
-@@ -21290,35 +19192,12 @@
+@@ -21315,35 +19257,12 @@
return 0;
}
_ACEOF
@@ -13112,7 +13309,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!
-@@ -21330,10 +19209,8 @@
+@@ -21355,10 +19274,8 @@
done
done
fi
@@ -13125,7 +13322,7 @@
fi # $ac_x_libraries = no
case $ac_x_includes,$ac_x_libraries in #(
-@@ -21354,7 +19231,7 @@
+@@ -21379,7 +19296,7 @@
fi # $with_x != no
if test "$have_x" != yes; then
@@ -13134,7 +13331,7 @@
$as_echo "$have_x" >&6; }
no_x=yes
else
-@@ -21365,7 +19242,7 @@
+@@ -21390,7 +19307,7 @@
ac_cv_have_x="have_x=yes\
ac_x_includes='$x_includes'\
ac_x_libraries='$x_libraries'"
@@ -13143,7 +13340,7 @@
$as_echo "libraries $x_libraries, headers $x_includes" >&6; }
fi
-@@ -21383,18 +19260,14 @@
+@@ -21408,18 +19325,14 @@
XTEST_LIBS=""
enable_xtest=no
@@ -13165,10 +13362,16 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -21412,49 +19285,22 @@
- return 0;
- }
- _ACEOF
+@@ -21431,55 +19344,28 @@
+ char XTestFakeKeyEvent ();
+ int
+ main ()
+-{
+-return XTestFakeKeyEvent ();
+- ;
+- return 0;
+-}
+-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
@@ -13190,6 +13393,12 @@
- test "$cross_compiling" = yes ||
- $as_test_x conftest$ac_exeext
- }; then
++{
++return XTestFakeKeyEvent ();
++ ;
++ return 0;
++}
++_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_Xtst_XTestFakeKeyEvent=yes
else
@@ -13222,7 +13431,7 @@
fi
-@@ -21462,40 +19308,44 @@
+@@ -21487,40 +19373,44 @@
pkg_failed=no
@@ -13286,7 +13495,7 @@
fi
-@@ -21508,14 +19358,14 @@
+@@ -21533,14 +19423,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13304,7 +13513,7 @@
$as_echo "no" >&6; }
have_xvidmode=no
elif test $pkg_failed = untried; then
-@@ -21523,16 +19373,14 @@
+@@ -21548,16 +19438,14 @@
else
XVIDMODE_CFLAGS=$pkg_cv_XVIDMODE_CFLAGS
XVIDMODE_LIBS=$pkg_cv_XVIDMODE_LIBS
@@ -13323,7 +13532,7 @@
fi
-@@ -21542,7 +19390,8 @@
+@@ -21567,7 +19455,8 @@
have_xfree=no
@@ -13333,7 +13542,7 @@
#include <X11/XF86keysym.h>
int main(int argc,char **argv) {
-@@ -21550,43 +19399,18 @@
+@@ -21575,43 +19464,18 @@
}
_ACEOF
@@ -13381,7 +13590,7 @@
fi
fi
-@@ -21600,26 +19424,24 @@
+@@ -21625,26 +19489,24 @@
@@ -13413,7 +13622,7 @@
$as_echo "$as_me: WARNING: Python not found, disabling python support" >&2;}
fi
fi
-@@ -21631,7 +19453,7 @@
+@@ -21656,7 +19518,7 @@
if test -n "$PYTHON"; then
# If the user set $PYTHON, use it and don't search something else.
@@ -13422,7 +13631,7 @@
$as_echo_n "checking whether $PYTHON version >= 2.3... " >&6; }
prog="import sys
# split strings by '.' and convert to numeric. Append some zeros
-@@ -21646,22 +19468,19 @@
+@@ -21671,22 +19533,19 @@
($PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13450,7 +13659,7 @@
$as_echo_n "(cached) " >&6
else
-@@ -21680,13 +19499,12 @@
+@@ -21705,13 +19564,12 @@
($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
@@ -13466,7 +13675,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
-@@ -21694,9 +19512,9 @@
+@@ -21719,9 +19577,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
@@ -13478,7 +13687,7 @@
$as_echo_n "(cached) " >&6
else
case $PYTHON in
-@@ -21709,14 +19527,14 @@
+@@ -21734,14 +19592,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -13496,7 +13705,7 @@
IFS=$as_save_IFS
;;
-@@ -21724,10 +19542,10 @@
+@@ -21749,10 +19607,10 @@
fi
PYTHON=$ac_cv_path_PYTHON
if test -n "$PYTHON"; then
@@ -13509,7 +13718,7 @@
$as_echo "no" >&6; }
fi
-@@ -21742,14 +19560,14 @@
+@@ -21767,14 +19625,14 @@
else
@@ -13527,7 +13736,7 @@
$as_echo "$am_cv_python_version" >&6; }
PYTHON_VERSION=$am_cv_python_version
-@@ -21761,23 +19579,23 @@
+@@ -21786,23 +19644,23 @@
@@ -13556,7 +13765,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$prefix" = xNONE
-@@ -21796,7 +19614,7 @@
+@@ -21821,7 +19679,7 @@
esac
fi
@@ -13565,7 +13774,7 @@
$as_echo "$am_cv_python_pythondir" >&6; }
pythondir=$am_cv_python_pythondir
-@@ -21805,9 +19623,9 @@
+@@ -21830,9 +19688,9 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -13577,7 +13786,7 @@
$as_echo_n "(cached) " >&6
else
if test "x$exec_prefix" = xNONE
-@@ -21826,7 +19644,7 @@
+@@ -21851,7 +19709,7 @@
esac
fi
@@ -13586,7 +13795,7 @@
$as_echo "$am_cv_python_pyexecdir" >&6; }
pyexecdir=$am_cv_python_pyexecdir
-@@ -21869,52 +19687,56 @@
+@@ -21894,52 +19752,56 @@
pkg_failed=no
@@ -13664,7 +13873,7 @@
fi
-@@ -21927,30 +19749,28 @@
+@@ -21952,30 +19814,28 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13703,7 +13912,7 @@
$as_echo "$as_me: WARNING: Disabling python support" >&2;}
fi
-@@ -21958,21 +19778,19 @@
+@@ -21983,21 +19843,19 @@
have_python=no
if test "x$enable_python" = "xyes"; then
@@ -13729,7 +13938,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -21982,22 +19800,22 @@
+@@ -22007,22 +19865,22 @@
fi
if test "x$have_python" != "xno"; then
@@ -13758,7 +13967,7 @@
$as_echo "$PYGTK_H2DEF" >&6; }
-@@ -22008,13 +19826,9 @@
+@@ -22033,13 +19891,9 @@
FLAGS="-fno-strict-aliasing"
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $FLAGS"
@@ -13774,7 +13983,7 @@
/* end confdefs.h. */
int
-@@ -22025,35 +19839,14 @@
+@@ -22050,35 +19904,14 @@
return 0;
}
_ACEOF
@@ -13813,7 +14022,7 @@
$as_echo "$compiler_has_option" >&6; }
if test $compiler_has_option = yes; then
NO_STRICT_ALIASING_CFLAGS="$FLAGS"
-@@ -22064,9 +19857,7 @@
+@@ -22089,9 +19922,7 @@
if test "x$have_python" != "xno" -a "x$enable_python" != "xno"; then
enable_python=yes
@@ -13824,7 +14033,7 @@
fi
-@@ -22079,54 +19870,58 @@
+@@ -22104,54 +19935,58 @@
fi
@@ -13905,7 +14114,7 @@
fi
-@@ -22139,14 +19934,14 @@
+@@ -22164,14 +19999,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -13923,7 +14132,7 @@
$as_echo "no" >&6; }
with_vala=no
elif test $pkg_failed = untried; then
-@@ -22154,7 +19949,7 @@
+@@ -22179,7 +20014,7 @@
else
VALA_CFLAGS=$pkg_cv_VALA_CFLAGS
VALA_LIBS=$pkg_cv_VALA_LIBS
@@ -13932,7 +14141,7 @@
$as_echo "yes" >&6; }
with_vala=yes
fi
-@@ -22162,9 +19957,7 @@
+@@ -22187,9 +20022,7 @@
VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
elif test "x$enable_vala" = "xyes"; then
@@ -13943,7 +14152,7 @@
fi
fi
if test "x$with_vala" = "xyes"; then
-@@ -22183,18 +19976,16 @@
+@@ -22208,18 +20041,16 @@
plugin_error_or_ignore()
{
if test "${error_on_bad_plugin}" = "1" ; then
@@ -13965,7 +14174,7 @@
withval=$with_plugins;
else
with_plugins=autodetect
-@@ -22241,40 +20032,44 @@
+@@ -22266,40 +20097,44 @@
screensaver)
pkg_failed=no
@@ -14029,7 +14238,7 @@
fi
-@@ -22287,25 +20082,14 @@
+@@ -22312,25 +20147,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14058,16 +14267,28 @@
$SCREENSAVER_PKG_ERRORS
-@@ -22315,22 +20099,11 @@
+@@ -22340,12 +20164,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.
-" >&2;}
- { (exit 1); exit 1; }; }
--elif test $pkg_failed = untried; then
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
++as_fn_error "The pkg-config script could not be found or is too old. Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+
+@@ -22354,22 +20177,11 @@
+ See the pkg-config man page for more details.
+
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
@@ -14076,20 +14297,6 @@
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-+" "$LINENO" 5
-+elif test $pkg_failed = untried; then
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "The pkg-config script could not be found or is too old. Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
-
-@@ -22339,12 +20112,11 @@
- See the pkg-config man page for more details.
-
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }; }
+See \`config.log' for more details." "$LINENO" 5; }
@@ -14101,7 +14308,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -22352,40 +20124,44 @@
+@@ -22377,40 +20189,44 @@
galago)
pkg_failed=no
@@ -14165,7 +14372,7 @@
fi
-@@ -22398,14 +20174,14 @@
+@@ -22423,14 +20239,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14183,7 +14390,7 @@
$as_echo "no" >&6; }
HAVE_LIBGALAGO=no
elif test $pkg_failed = untried; then
-@@ -22413,7 +20189,7 @@
+@@ -22438,7 +20254,7 @@
else
LIBGALAGO_CFLAGS=$pkg_cv_LIBGALAGO_CFLAGS
LIBGALAGO_LIBS=$pkg_cv_LIBGALAGO_LIBS
@@ -14192,7 +14399,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGALAGO=yes
fi
-@@ -22431,40 +20207,44 @@
+@@ -22456,40 +20272,44 @@
media-player-keys)
pkg_failed=no
@@ -14256,7 +14463,7 @@
fi
-@@ -22477,14 +20257,14 @@
+@@ -22502,14 +20322,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14274,7 +14481,7 @@
$as_echo "no" >&6; }
HAVE_MEDIA_PLAYER_KEYS=no
elif test $pkg_failed = untried; then
-@@ -22492,7 +20272,7 @@
+@@ -22517,7 +20337,7 @@
else
MEDIA_PLAYER_KEYS_CFLAGS=$pkg_cv_MEDIA_PLAYER_KEYS_CFLAGS
MEDIA_PLAYER_KEYS_LIBS=$pkg_cv_MEDIA_PLAYER_KEYS_LIBS
@@ -14283,7 +14490,7 @@
$as_echo "yes" >&6; }
HAVE_MEDIA_PLAYER_KEYS=yes
fi
-@@ -22502,18 +20282,14 @@
+@@ -22527,18 +20347,14 @@
fi
;;
lirc)
@@ -14305,7 +14512,7 @@
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
-@@ -22531,176 +20307,20 @@
+@@ -22556,176 +20372,20 @@
return 0;
}
_ACEOF
@@ -14490,7 +14697,7 @@
LIRC_LIBS="-llirc_client"
HAVE_LIRC=yes
else
-@@ -22721,40 +20341,44 @@
+@@ -22746,40 +20406,123 @@
mythtv)
pkg_failed=no
@@ -14524,67 +14731,60 @@
+ fi
+else
+ pkg_failed=untried
- fi
--if test -n "$GMYTH_LIBS"; then
-- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
-- elif test -n "$PKG_CONFIG"; then
-- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
++fi
+if test -n "$PKG_CONFIG"; then
+ if test -n "$GMYTH_LIBS"; then
+ pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
- ac_status=$?
-- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; then
++ ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
++ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
- pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-- else
-- pkg_failed=untried
++ pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
+ fi
+else
+ pkg_failed=untried
- fi
-
-
-@@ -22767,14 +20391,14 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
- else
-- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
++ else
+ GMYTH_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GMYTH_PKG_ERRORS" >&5
-
-- { $as_echo "$as_me:$LINENO: result: no" >&5
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$GMYTH_PKG_ERRORS" >&5
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- HAVE_GMYTH=no
- elif test $pkg_failed = untried; then
-@@ -22782,7 +20406,7 @@
- else
- GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
- GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
-- { $as_echo "$as_me:$LINENO: result: yes" >&5
++$as_echo "no" >&6; }
++ HAVE_GMYTH=no
++elif test $pkg_failed = untried; then
++ HAVE_GMYTH=no
++else
++ GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
++ GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- HAVE_GMYTH=yes
- fi
-@@ -22791,43 +20415,141 @@
- add_plugin="0"
- fi
- ;;
++$as_echo "yes" >&6; }
++ HAVE_GMYTH=yes
++fi
++ if test "${HAVE_GMYTH}" != "yes"; then
++ plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
++ add_plugin="0"
++ fi
++ ;;
+ bbc)
+ # pygobject >= 2.15.3 for gio support
+ # pygtk >= 2.13.0 for gtk_tree_view_get_tooltip_context support
@@ -14610,7 +14810,17 @@
+ fi
+else
+ pkg_failed=untried
-+fi
+ fi
+-if test -n "$GMYTH_LIBS"; then
+- pkg_cv_GMYTH_LIBS="$GMYTH_LIBS"
+- elif test -n "$PKG_CONFIG"; then
+- if test -n "$PKG_CONFIG" && \
+- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0\"") >&5
+- ($PKG_CONFIG --exists --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0") 2>&5
+- ac_status=$?
+- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+- (exit $ac_status); }; then
+- pkg_cv_GMYTH_LIBS=`$PKG_CONFIG --libs "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>/dev/null`
+if test -n "$PKG_CONFIG"; then
+ if test -n "$BBC_LIBS"; then
+ pkg_cv_BBC_LIBS="$BBC_LIBS"
@@ -14622,47 +14832,56 @@
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BBC_LIBS=`$PKG_CONFIG --libs " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 " 2>/dev/null`
-+else
-+ pkg_failed=yes
-+fi
+ else
+ pkg_failed=yes
+ fi
+- else
+- pkg_failed=untried
+ fi
+else
+ pkg_failed=untried
-+fi
-+
-+
-+
-+if test $pkg_failed = yes; then
-+
-+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-+ _pkg_short_errors_supported=yes
-+else
-+ _pkg_short_errors_supported=no
-+fi
-+ if test $_pkg_short_errors_supported = yes; then
+ fi
+
+
+@@ -22792,67 +20535,86 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- GMYTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
+ BBC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
-+ else
+ else
+- GMYTH_PKG_ERRORS=`$PKG_CONFIG --print-errors "gmyth >= 0.7.1 gmyth-upnp >= 0.7.1 gconf-2.0" 2>&1`
+ BBC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors " pygobject-2.0 >= 2.15.3 gst-python-0.10 >= 0.10.11 pygtk-2.0 >= 2.13.0 "`
-+ fi
-+ # Put the nasty error message in config.log where it belongs
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$GMYTH_PKG_ERRORS" >&5
+ echo "$BBC_PKG_ERRORS" >&5
-+
+
+- { $as_echo "$as_me:$LINENO: result: no" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
+ $as_echo "no" >&6; }
+- HAVE_GMYTH=no
+ HAVE_BBCSTUFF=no
-+elif test $pkg_failed = untried; then
+ elif test $pkg_failed = untried; then
+- HAVE_GMYTH=no
+ HAVE_BBCSTUFF=no
-+else
+ else
+- GMYTH_CFLAGS=$pkg_cv_GMYTH_CFLAGS
+- GMYTH_LIBS=$pkg_cv_GMYTH_LIBS
+- { $as_echo "$as_me:$LINENO: result: yes" >&5
+ BBC_CFLAGS=$pkg_cv_BBC_CFLAGS
+ BBC_LIBS=$pkg_cv_BBC_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
+ $as_echo "yes" >&6; }
+- HAVE_GMYTH=yes
+ HAVE_BBCSTUFF=yes
-+fi
+ fi
+- if test "${HAVE_GMYTH}" != "yes"; then
+- plugin_error_or_ignore "you need GMyth >= 0.7 installed for the MythTV plugin"
+ if test "x$HAVE_BBCSTUFF" != "xyes"; then
+ plugin_error_or_ignore "you need pygobject-2.0 >= 2.15.3 and gst-python-0.10 >= 0.10.11 and pygtk-2.0 >= 2.13.0 installed for the BBC plugin"
-+ add_plugin="0"
-+ fi
+ add_plugin="0"
+ fi
+ # only require python apt and gdbm where we would actually be using it, ie. on ubuntu
+ bbc_py_pkg_reqs=''
+ if test -f /etc/debian_version ; then
@@ -14678,7 +14897,7 @@
+ add_plugin="0"
+ fi
+ done
-+ ;;
+ ;;
bemused)
pkg_failed=no
@@ -14742,7 +14961,7 @@
fi
-@@ -22840,14 +20562,14 @@
+@@ -22865,14 +20627,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14760,7 +14979,7 @@
$as_echo "no" >&6; }
HAVE_BLUEZ=no
elif test $pkg_failed = untried; then
-@@ -22855,7 +20577,7 @@
+@@ -22880,7 +20642,7 @@
else
BEMUSED_CFLAGS=$pkg_cv_BEMUSED_CFLAGS
BEMUSED_LIBS=$pkg_cv_BEMUSED_LIBS
@@ -14769,7 +14988,7 @@
$as_echo "yes" >&6; }
HAVE_BLUEZ=yes
fi
-@@ -22867,40 +20589,44 @@
+@@ -22892,40 +20654,44 @@
publish)
pkg_failed=no
@@ -14833,7 +15052,7 @@
fi
-@@ -22913,14 +20639,14 @@
+@@ -22938,14 +20704,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14851,7 +15070,7 @@
$as_echo "no" >&6; }
HAVE_LIBEPC=no
elif test $pkg_failed = untried; then
-@@ -22928,7 +20654,7 @@
+@@ -22953,7 +20719,7 @@
else
LIBEPC_CFLAGS=$pkg_cv_LIBEPC_CFLAGS
LIBEPC_LIBS=$pkg_cv_LIBEPC_LIBS
@@ -14860,7 +15079,7 @@
$as_echo "yes" >&6; }
HAVE_LIBEPC=yes
fi
-@@ -22940,40 +20666,44 @@
+@@ -22965,40 +20731,44 @@
tracker)
pkg_failed=no
@@ -14924,7 +15143,7 @@
fi
-@@ -22986,14 +20716,14 @@
+@@ -23011,14 +20781,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -14942,7 +15161,7 @@
$as_echo "no" >&6; }
HAVE_TRACKER=no
elif test $pkg_failed = untried; then
-@@ -23001,7 +20731,7 @@
+@@ -23026,7 +20796,7 @@
else
TRACKER_CFLAGS=$pkg_cv_TRACKER_CFLAGS
TRACKER_LIBS=$pkg_cv_TRACKER_LIBS
@@ -14951,7 +15170,7 @@
$as_echo "yes" >&6; }
HAVE_TRACKER=yes
fi
-@@ -23019,40 +20749,44 @@
+@@ -23044,40 +20814,44 @@
thumbnail)
pkg_failed=no
@@ -15015,7 +15234,7 @@
fi
-@@ -23065,14 +20799,14 @@
+@@ -23090,14 +20864,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15033,7 +15252,7 @@
$as_echo "no" >&6; }
HAVE_GLIB_2_15=no
elif test $pkg_failed = untried; then
-@@ -23080,7 +20814,7 @@
+@@ -23105,7 +20879,7 @@
else
GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
GLIB_LIBS=$pkg_cv_GLIB_LIBS
@@ -15042,7 +15261,7 @@
$as_echo "yes" >&6; }
HAVE_GLIB_2_15=yes
fi
-@@ -23092,40 +20826,44 @@
+@@ -23117,40 +20891,44 @@
brasero-disc-recorder)
pkg_failed=no
@@ -15106,7 +15325,7 @@
fi
-@@ -23138,14 +20876,14 @@
+@@ -23163,14 +20941,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15124,7 +15343,7 @@
$as_echo "no" >&6; }
BUILD_RECORDER=no
elif test $pkg_failed = untried; then
-@@ -23153,7 +20891,7 @@
+@@ -23178,7 +20956,7 @@
else
DISC_RECORDER_CFLAGS=$pkg_cv_DISC_RECORDER_CFLAGS
DISC_RECORDER_LIBS=$pkg_cv_DISC_RECORDER_LIBS
@@ -15133,7 +15352,7 @@
$as_echo "yes" >&6; }
BUILD_RECORDER=yes
fi
-@@ -23165,40 +20903,44 @@
+@@ -23190,40 +20968,44 @@
youtube)
pkg_failed=no
@@ -15197,7 +15416,7 @@
fi
-@@ -23211,14 +20953,14 @@
+@@ -23236,14 +21018,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15215,7 +15434,7 @@
$as_echo "no" >&6; }
HAVE_LIBGDATA=no
elif test $pkg_failed = untried; then
-@@ -23226,7 +20968,7 @@
+@@ -23251,7 +21033,7 @@
else
LIBGDATA_CFLAGS=$pkg_cv_LIBGDATA_CFLAGS
LIBGDATA_LIBS=$pkg_cv_LIBGDATA_LIBS
@@ -15224,7 +15443,7 @@
$as_echo "yes" >&6; }
HAVE_LIBGDATA=yes
fi
-@@ -23235,23 +20977,18 @@
+@@ -23260,23 +21042,18 @@
add_plugin="0"
fi
@@ -15253,7 +15472,7 @@
fi
;;
esac
-@@ -23265,9 +21002,9 @@
+@@ -23290,9 +21067,9 @@
ALL_PLUGINS=$allowed_plugins
PLUGINS=$used_plugins2
@@ -15265,7 +15484,7 @@
$as_echo "$PLUGINS" >&6; }
-@@ -23277,24 +21014,22 @@
+@@ -23302,24 +21079,22 @@
# Browser plugins
# ***************
@@ -15294,7 +15513,7 @@
BROWSER_PLUGIN_DIR="${BROWSER_PLUGIN_DIR:-"\${libdir}/mozilla/plugins"}"
-@@ -23302,24 +21037,25 @@
+@@ -23327,24 +21102,25 @@
pkg_failed=no
@@ -15329,7 +15548,7 @@
pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
gio-2.0
x11
-@@ -23327,24 +21063,26 @@
+@@ -23352,24 +21128,26 @@
else
pkg_failed=yes
fi
@@ -15366,7 +15585,7 @@
pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
gio-2.0
x11
-@@ -23352,8 +21090,9 @@
+@@ -23377,8 +21155,9 @@
else
pkg_failed=yes
fi
@@ -15378,7 +15597,7 @@
fi
-@@ -23366,20 +21105,20 @@
+@@ -23391,20 +21170,20 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15404,7 +15623,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23387,7 +21126,7 @@
+@@ -23412,7 +21191,7 @@
else
BROWSER_PLUGIN_CFLAGS=$pkg_cv_BROWSER_PLUGIN_CFLAGS
BROWSER_PLUGIN_LIBS=$pkg_cv_BROWSER_PLUGIN_LIBS
@@ -15413,7 +15632,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23397,58 +21136,58 @@
+@@ -23422,58 +21201,58 @@
# Earlier versions misdetect playlists
if test -n "$PKG_CONFIG" && \
@@ -15500,7 +15719,7 @@
fi
-@@ -23461,14 +21200,14 @@
+@@ -23486,14 +21265,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15518,7 +15737,7 @@
$as_echo "no" >&6; }
enable_browser_plugins=no
elif test $pkg_failed = untried; then
-@@ -23476,7 +21215,7 @@
+@@ -23501,7 +21280,7 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15527,7 +15746,7 @@
$as_echo "yes" >&6; }
:
fi
-@@ -23484,9 +21223,9 @@
+@@ -23509,9 +21288,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
@@ -15539,7 +15758,7 @@
$as_echo_n "(cached) " >&6
else
case $DBUS_BIND in
-@@ -23500,14 +21239,14 @@
+@@ -23525,14 +21304,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15557,7 +15776,7 @@
IFS=$as_save_IFS
test -z "$ac_cv_path_DBUS_BIND" && ac_cv_path_DBUS_BIND="no"
-@@ -23516,16 +21255,16 @@
+@@ -23541,16 +21320,16 @@
fi
DBUS_BIND=$ac_cv_path_DBUS_BIND
if test -n "$DBUS_BIND"; then
@@ -15577,7 +15796,7 @@
$as_echo "$as_me: WARNING: dbus-binding-tool not found" >&2;}
enable_browser_plugins=no
fi
-@@ -23541,13 +21280,9 @@
+@@ -23566,13 +21345,9 @@
__SAVE_CXXFLAGS=$CXXFLAGS
CXXFLAGS="-fno-rtti $CXXFLAGS"
@@ -15593,7 +15812,7 @@
/* end confdefs.h. */
int
-@@ -23558,34 +21293,13 @@
+@@ -23583,34 +21358,13 @@
return 0;
}
_ACEOF
@@ -15631,7 +15850,7 @@
$as_echo "$have_no_rtti_flag" >&6; }
CXXFLAGS=$__SAVE_CXXFLAGS
-@@ -23614,64 +21328,64 @@
+@@ -23639,64 +21393,64 @@
if test "$enable_browser_plugins" = "yes"; then
@@ -15711,7 +15930,7 @@
$as_echo "$enable_cone_plugin" >&6; }
fi
-@@ -23719,13 +21433,11 @@
+@@ -23744,13 +21498,11 @@
# Check whether --enable-nautilus was given.
@@ -15727,7 +15946,7 @@
esac
else
ENABLE_NAUTILUS=yes
-@@ -23734,40 +21446,44 @@
+@@ -23759,40 +21511,44 @@
if test x$ENABLE_NAUTILUS = "xyes" ; then
pkg_failed=no
@@ -15791,7 +16010,7 @@
fi
-@@ -23780,14 +21496,14 @@
+@@ -23805,14 +21561,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15809,7 +16028,7 @@
$as_echo "no" >&6; }
HAVE_NAUTILUS=no
elif test $pkg_failed = untried; then
-@@ -23795,7 +21511,7 @@
+@@ -23820,7 +21576,7 @@
else
NAUTILUS_CFLAGS=$pkg_cv_NAUTILUS_CFLAGS
NAUTILUS_LIBS=$pkg_cv_NAUTILUS_LIBS
@@ -15818,7 +16037,16 @@
$as_echo "yes" >&6; }
HAVE_NAUTILUS=yes
fi
-@@ -23806,9 +21522,7 @@
+@@ -23828,7 +21584,7 @@
+
+
+ # Check whether --with-nautilusdir was given.
+-if test "${with_nautilusdir+set}" = set; then
++if test "${with_nautilusdir+set}" = set; then :
+ withval=$with_nautilusdir; ac_with_nautilusdir=$withval
+ else
+ ac_with_nautilusdir=""
+@@ -23840,15 +21596,13 @@
if test x$HAVE_NAUTILUS = "xyes"; then
@@ -15827,9 +16055,16 @@
-_ACEOF
+$as_echo "#define HAVE_NAUTILUS 1" >>confdefs.h
- NAUTILUSDIR=`pkg-config --variable=extensiondir libnautilus-extension`
-
-@@ -23824,7 +21538,7 @@
+ if test "${ac_with_nautilusdir}" = ""; then
+ ac_with_nautilusdir=`pkg-config --variable=extensiondir libnautilus-extension`
+ fi
+
+- { $as_echo "$as_me:$LINENO: installing nautilus plugin in ${ac_with_nautilusdir}" >&5
++ { $as_echo "$as_me:${as_lineno-$LINENO}: installing nautilus plugin in ${ac_with_nautilusdir}" >&5
+ $as_echo "$as_me: installing nautilus plugin in ${ac_with_nautilusdir}" >&6;}
+ NAUTILUSDIR=${ac_with_nautilusdir}
+
+@@ -23865,7 +21619,7 @@
# Check whether --with-dbus was given.
@@ -15838,7 +16073,7 @@
withval=$with_dbus;
else
with_dbus=auto
-@@ -23833,40 +21547,44 @@
+@@ -23874,40 +21628,44 @@
if test "x$with_dbus" != "xno"; then
pkg_failed=no
@@ -15902,7 +16137,7 @@
fi
-@@ -23879,14 +21597,14 @@
+@@ -23920,14 +21678,14 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
@@ -15920,7 +16155,7 @@
$as_echo "no" >&6; }
enable_dbus=no
elif test $pkg_failed = untried; then
-@@ -23894,20 +21612,16 @@
+@@ -23935,20 +21693,16 @@
else
DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
DBUS_LIBS=$pkg_cv_DBUS_LIBS
@@ -15944,7 +16179,7 @@
fi
fi
-@@ -23922,9 +21636,9 @@
+@@ -23963,9 +21717,9 @@
# Extract the first word of "gconftool-2", so it can be a program name with args.
set dummy gconftool-2; ac_word=$2
@@ -15956,7 +16191,7 @@
$as_echo_n "(cached) " >&6
else
case $GCONFTOOL in
-@@ -23937,14 +21651,14 @@
+@@ -23978,14 +21732,14 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -15974,7 +16209,7 @@
IFS=$as_save_IFS
;;
-@@ -23952,10 +21666,10 @@
+@@ -23993,10 +21747,10 @@
fi
GCONFTOOL=$ac_cv_path_GCONFTOOL
if test -n "$GCONFTOOL"; then
@@ -15987,7 +16222,7 @@
$as_echo "no" >&6; }
fi
-@@ -23969,13 +21683,13 @@
+@@ -24010,13 +21764,13 @@
# Check whether --with-gconf-source was given.
@@ -16003,7 +16238,7 @@
$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-@@ -23984,22 +21698,20 @@
+@@ -24025,22 +21779,20 @@
# Check whether --with-gconf-schema-file-dir was given.
@@ -16030,7 +16265,7 @@
esac
fi
-@@ -24025,7 +21737,7 @@
+@@ -24066,7 +21818,7 @@
# Check whether --enable-debug was given.
@@ -16039,7 +16274,7 @@
enableval=$enable_debug;
else
enable_debug=no
-@@ -24034,16 +21746,14 @@
+@@ -24075,16 +21827,14 @@
if test x$enable_debug = xyes ; then
@@ -16058,7 +16293,7 @@
enableval=$enable_compile_warnings;
else
enable_compile_warnings="maximum"
-@@ -24074,13 +21784,9 @@
+@@ -24115,13 +21865,9 @@
for option in -Wno-sign-compare; do
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS $option"
@@ -16074,7 +16309,7 @@
/* end confdefs.h. */
int
-@@ -24091,35 +21797,14 @@
+@@ -24132,35 +21878,14 @@
return 0;
}
_ACEOF
@@ -16113,7 +16348,7 @@
$as_echo "$has_option" >&6; }
if test $has_option = yes; then
warning_flags="$warning_flags $option"
-@@ -24133,26 +21818,24 @@
+@@ -24174,26 +21899,24 @@
fi
;;
*)
@@ -16145,7 +16380,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
-@@ -24167,7 +21850,7 @@
+@@ -24208,7 +21931,7 @@
esac
fi
fi
@@ -16154,7 +16389,7 @@
$as_echo "$complCFLAGS" >&6; }
WARN_CFLAGS="$warning_flags $complCFLAGS"
-@@ -24175,14 +21858,14 @@
+@@ -24216,14 +21939,14 @@
# Check whether --enable-cxx-warnings was given.
@@ -16171,7 +16406,7 @@
$as_echo_n "checking what warning flags to pass to the C++ compiler... " >&6; }
warnCXXFLAGS=
if test "x$GXX" != xyes; then
-@@ -24202,18 +21885,18 @@
+@@ -24243,18 +21966,18 @@
fi
fi
fi
@@ -16193,7 +16428,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
-@@ -24229,23 +21912,23 @@
+@@ -24270,7 +21993,7 @@
esac
fi
fi
@@ -16202,35 +16437,145 @@
$as_echo "$complCXXFLAGS" >&6; }
WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-
-
-
--{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+{ $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.
--if test "${enable_maintainer_mode+set}" = set; then
-+if test "${enable_maintainer_mode+set}" = set; then :
- enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
- USE_MAINTAINER_MODE=no
- fi
-
-- { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
- $as_echo "$USE_MAINTAINER_MODE" >&6; }
- if test $USE_MAINTAINER_MODE = yes; then
- MAINTAINER_MODE_TRUE=
-@@ -24274,7 +21957,7 @@
-
-
+@@ -24291,8 +22014,136 @@
+
+
+
++ # Extract the first word of "gtkdoc-check", so it can be a program name with args.
++set dummy gtkdoc-check; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_CHECK in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
++if test -n "$GTKDOC_CHECK"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
++$as_echo "$GTKDOC_CHECK" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ for ac_prog in gtkdoc-rebase
++do
++ # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_REBASE+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_REBASE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_REBASE="$GTKDOC_REBASE" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_REBASE="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_REBASE=$ac_cv_path_GTKDOC_REBASE
++if test -n "$GTKDOC_REBASE"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_REBASE" >&5
++$as_echo "$GTKDOC_REBASE" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++ test -n "$GTKDOC_REBASE" && break
++done
++test -n "$GTKDOC_REBASE" || GTKDOC_REBASE="true"
++
++ # Extract the first word of "gtkdoc-mkpdf", so it can be a program name with args.
++set dummy gtkdoc-mkpdf; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if test "${ac_cv_path_GTKDOC_MKPDF+set}" = set; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $GTKDOC_MKPDF in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_GTKDOC_MKPDF="$GTKDOC_MKPDF" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
++ ac_cv_path_GTKDOC_MKPDF="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++GTKDOC_MKPDF=$ac_cv_path_GTKDOC_MKPDF
++if test -n "$GTKDOC_MKPDF"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_MKPDF" >&5
++$as_echo "$GTKDOC_MKPDF" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++
# Check whether --with-html-dir was given.
-if test "${with_html_dir+set}" = set; then
+if test "${with_html_dir+set}" = set; then :
withval=$with_html_dir;
else
with_html_dir='${datadir}/gtk-doc/html'
-@@ -24284,7 +21967,7 @@
+@@ -24302,7 +22153,7 @@
# Check whether --enable-gtk-doc was given.
@@ -16239,7 +16584,7 @@
enableval=$enable_gtk_doc;
else
enable_gtk_doc=no
-@@ -24293,31 +21976,29 @@
+@@ -24311,68 +22162,40 @@
if test x$enable_gtk_doc = xyes; then
if test -n "$PKG_CONFIG" && \
@@ -16256,7 +16601,7 @@
- { { $as_echo "$as_me:$LINENO: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&5
-$as_echo "$as_me: error: You need to have gtk-doc >= 1.11 installed to build gtk-doc" >&2;}
- { (exit 1); exit 1; }; }
-+ as_fn_error "You need to have gtk-doc >= 1.11 installed to build gtk-doc" "$LINENO" 5
++ as_fn_error "You need to have gtk-doc >= 1.11 installed to build $PACKAGE_NAME" "$LINENO" 5
fi
fi
@@ -16267,50 +16612,104 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gtk_doc" >&5
$as_echo "$enable_gtk_doc" >&6; }
- for ac_prog in gtkdoc-check
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
+- for ac_prog in gtkdoc-check
+-do
+- # Extract the first word of "$ac_prog", so it can be a program name with args.
+-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
+-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then
-+if test "${ac_cv_path_GTKDOC_CHECK+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
- case $GTKDOC_CHECK in
-@@ -24330,14 +22011,14 @@
- do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+- $as_echo_n "(cached) " >&6
++ # Check whether --enable-gtk-doc-html was given.
++if test "${enable_gtk_doc_html+set}" = set; then :
++ enableval=$enable_gtk_doc_html;
+ else
+- case $GTKDOC_CHECK in
+- [\\/]* | ?:[\\/]*)
+- ac_cv_path_GTKDOC_CHECK="$GTKDOC_CHECK" # Let the user override the test with a path.
+- ;;
+- *)
+- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+- IFS=$as_save_IFS
+- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
-+ for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
+- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+- ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
- done
+- break 2
+- fi
-done
-+ done
- IFS=$as_save_IFS
-
- ;;
-@@ -24345,10 +22026,10 @@
- fi
- GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
- if test -n "$GTKDOC_CHECK"; then
+-done
+-IFS=$as_save_IFS
+-
+- ;;
+-esac
++ enable_gtk_doc_html=yes
+ fi
+-GTKDOC_CHECK=$ac_cv_path_GTKDOC_CHECK
+-if test -n "$GTKDOC_CHECK"; then
- { $as_echo "$as_me:$LINENO: result: $GTKDOC_CHECK" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTKDOC_CHECK" >&5
- $as_echo "$GTKDOC_CHECK" >&6; }
+-$as_echo "$GTKDOC_CHECK" >&6; }
++
++ # Check whether --enable-gtk-doc-pdf was given.
++if test "${enable_gtk_doc_pdf+set}" = set; then :
++ enableval=$enable_gtk_doc_pdf;
else
- { $as_echo "$as_me:$LINENO: result: no" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
-
-@@ -24391,22 +22072,18 @@
+-$as_echo "no" >&6; }
++ enable_gtk_doc_pdf=no
+ fi
+
+
+- test -n "$GTKDOC_CHECK" && break
+-done
++ if test -z "$GTKDOC_MKPDF"; then
++ enable_gtk_doc_pdf=no
++ fi
+
+
+ if test x$enable_gtk_doc = xyes; then
+@@ -24383,6 +22206,22 @@
+ ENABLE_GTK_DOC_FALSE=
+ fi
+
++ if test x$enable_gtk_doc_html = xyes; then
++ GTK_DOC_BUILD_HTML_TRUE=
++ GTK_DOC_BUILD_HTML_FALSE='#'
++else
++ GTK_DOC_BUILD_HTML_TRUE='#'
++ GTK_DOC_BUILD_HTML_FALSE=
++fi
++
++ if test x$enable_gtk_doc_pdf = xyes; then
++ GTK_DOC_BUILD_PDF_TRUE=
++ GTK_DOC_BUILD_PDF_FALSE='#'
++else
++ GTK_DOC_BUILD_PDF_TRUE='#'
++ GTK_DOC_BUILD_PDF_FALSE=
++fi
++
+ if test -n "$LIBTOOL"; then
+ GTK_DOC_USE_LIBTOOL_TRUE=
+ GTK_DOC_USE_LIBTOOL_FALSE='#'
+@@ -24391,6 +22230,14 @@
+ GTK_DOC_USE_LIBTOOL_FALSE=
+ fi
+
++ if test -n "$GTKDOC_REBASE"; then
++ GTK_DOC_USE_REBASE_TRUE=
++ GTK_DOC_USE_REBASE_FALSE='#'
++else
++ GTK_DOC_USE_REBASE_TRUE='#'
++ GTK_DOC_USE_REBASE_FALSE=
++fi
++
+
+
+ # This macro expands DIR and assigns it to RET.
+@@ -24409,22 +22256,18 @@
# Check whether --enable-run-in-source-tree was given.
@@ -16336,7 +16735,7 @@
fi
-@@ -24425,7 +22102,7 @@
+@@ -24443,7 +22286,7 @@
@@ -16345,7 +16744,7 @@
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
-@@ -24454,13 +22131,13 @@
+@@ -24472,13 +22315,13 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
@@ -16361,7 +16760,7 @@
esac ;;
esac
done
-@@ -24468,8 +22145,8 @@
+@@ -24486,8 +22329,8 @@
(set) 2>&1 |
case $as_nl`(ac_space=' '; set) 2>&1` in #(
*${as_nl}ac_space=\ *)
@@ -16372,7 +16771,7 @@
sed -n \
"s/'/'\\\\''/g;
s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -24492,11 +22169,11 @@
+@@ -24510,11 +22353,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" &&
@@ -16386,7 +16785,7 @@
$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
-@@ -24516,8 +22193,8 @@
+@@ -24534,8 +22377,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.
@@ -16397,7 +16796,21 @@
done
LIBOBJS=$ac_libobjs
-@@ -24533,192 +22210,118 @@
+@@ -24543,11 +22386,8 @@
+
+
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+- { (exit 1); exit 1; }; }
++ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -n "$EXEEXT"; then
+ am__EXEEXT_TRUE=
+@@ -24558,185 +22398,126 @@
fi
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
@@ -16602,15 +17015,6 @@
+ as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
- if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-- { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
-- { (exit 1); exit 1; }; }
-+ as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
@@ -16619,6 +17023,14 @@
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"ENABLE_GTK_DOC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_BUILD_HTML_TRUE}" && test -z "${GTK_DOC_BUILD_HTML_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_HTML\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_BUILD_PDF_TRUE}" && test -z "${GTK_DOC_BUILD_PDF_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_BUILD_PDF\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
- { { $as_echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
@@ -16627,6 +17039,10 @@
-Usually this means the macro was only invoked conditionally." >&2;}
- { (exit 1); exit 1; }; }
+ as_fn_error "conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
++if test -z "${GTK_DOC_USE_REBASE_TRUE}" && test -z "${GTK_DOC_USE_REBASE_FALSE}"; then
++ as_fn_error "conditional \"GTK_DOC_USE_REBASE\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
@@ -16643,7 +17059,7 @@
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
-@@ -24728,17 +22331,18 @@
+@@ -24746,17 +22527,18 @@
debug=false
ac_cs_recheck=false
ac_cs_silent=false
@@ -16669,7 +17085,7 @@
emulate sh
NULLCMD=:
# Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -24746,23 +22350,15 @@
+@@ -24764,23 +22546,15 @@
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
@@ -16698,7 +17114,7 @@
as_nl='
'
export as_nl
-@@ -24770,7 +22366,13 @@
+@@ -24788,7 +22562,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
@@ -16713,7 +17129,7 @@
as_echo='printf %s\n'
as_echo_n='printf %s'
else
-@@ -24781,7 +22383,7 @@
+@@ -24799,7 +22579,7 @@
as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
as_echo_n_body='eval
arg=$1;
@@ -16722,7 +17138,7 @@
*"$as_nl"*)
expr "X$arg" : "X\\(.*\\)$as_nl";
arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -24804,13 +22406,6 @@
+@@ -24822,13 +22602,6 @@
}
fi
@@ -16736,7 +17152,7 @@
# IFS
# We need space, tab and new line, in precisely that order. Quoting is
-@@ -24820,15 +22415,15 @@
+@@ -24838,15 +22611,15 @@
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -16755,7 +17171,7 @@
IFS=$as_save_IFS
;;
-@@ -24840,12 +22435,16 @@
+@@ -24858,12 +22631,16 @@
fi
if test ! -f "$as_myself"; then
$as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
@@ -16776,7 +17192,7 @@
done
PS1='$ '
PS2='> '
-@@ -24857,7 +22456,89 @@
+@@ -24875,7 +22652,89 @@
LANGUAGE=C
export LANGUAGE
@@ -16867,7 +17283,7 @@
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
-@@ -24871,8 +22552,12 @@
+@@ -24889,8 +22748,12 @@
as_basename=false
fi
@@ -16881,7 +17297,7 @@
as_me=`$as_basename -- "$0" ||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
-@@ -24892,76 +22577,25 @@
+@@ -24910,76 +22773,25 @@
}
s/.*/./; q'`
@@ -16969,7 +17385,7 @@
rm -f conf$$ conf$$.exe conf$$.file
if test -d conf$$.dir; then
-@@ -24990,8 +22624,56 @@
+@@ -25008,8 +22820,56 @@
rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
rmdir conf$$.dir 2>/dev/null
@@ -17027,7 +17443,7 @@
else
test -d ./-p && rmdir ./-p
as_mkdir_p=false
-@@ -25010,10 +22692,10 @@
+@@ -25028,10 +22888,10 @@
if test -d "$1"; then
test -d "$1/.";
else
@@ -17040,7 +17456,7 @@
???[sx]*):;;*)false;;esac;fi
'\'' sh
'
-@@ -25028,13 +22710,19 @@
+@@ -25046,13 +22906,19 @@
exec 6>&1
@@ -17056,13 +17472,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.4, which was
+ This file was extended by totem $as_me 2.28.5, which was
-generated by GNU Autoconf 2.63. Invocation command line was
-+generated by GNU Autoconf 2.64. Invocation command line was
++generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -25066,10 +22754,11 @@
+@@ -25084,13 +22950,15 @@
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
@@ -17077,7 +17493,11 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
-@@ -25091,16 +22780,16 @@
++ --config print configuration, then exit
+ -q, --quiet, --silent
+ do not print progress messages
+ -d, --debug don't remove temporary files
+@@ -25109,16 +22977,17 @@
Configuration commands:
$config_commands
@@ -17086,18 +17506,29 @@
_ACEOF
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.4
+ totem config.status 2.28.5
-configured by $0, generated by GNU Autoconf 2.63,
-+configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++ with options \\"\$ac_cs_config\\"
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
-@@ -25143,20 +22832,19 @@
+@@ -25154,6 +23023,8 @@
+ ac_cs_recheck=: ;;
+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+ $as_echo "$ac_cs_version"; exit ;;
++ --config | --confi | --conf | --con | --co | --c )
++ $as_echo "$ac_cs_config"; exit ;;
+ --debug | --debu | --deb | --de | --d | -d )
+ debug=: ;;
+ --file | --fil | --fi | --f )
+@@ -25161,20 +23032,19 @@
case $ac_optarg in
*\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
@@ -17122,7 +17553,7 @@
--help | --hel | -h )
$as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -25164,11 +22852,10 @@
+@@ -25182,11 +23052,10 @@
ac_cs_silent=: ;;
# This is an error.
@@ -17137,7 +17568,7 @@
ac_need_defaults=false ;;
esac
-@@ -25581,6 +23268,7 @@
+@@ -25599,6 +23468,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" ;;
@@ -17145,7 +17576,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" ;;
-@@ -25629,9 +23317,7 @@
+@@ -25647,9 +23517,7 @@
"docs/reference/version.xml") CONFIG_FILES="$CONFIG_FILES docs/reference/version.xml" ;;
"po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
@@ -17156,7 +17587,7 @@
esac
done
-@@ -25658,7 +23344,7 @@
+@@ -25676,7 +23544,7 @@
trap 'exit_status=$?
{ test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
' 0
@@ -17165,7 +17596,7 @@
}
# Create a (secure) tmp directory for tmp files.
-@@ -25669,11 +23355,7 @@
+@@ -25687,11 +23555,7 @@
{
tmp=./conf$$-$RANDOM
(umask 077 && mkdir "$tmp")
@@ -17178,7 +17609,7 @@
# Set up the scripts for CONFIG_FILES section.
# No need to generate them if there are no CONFIG_FILES.
-@@ -25681,10 +23363,16 @@
+@@ -25699,10 +23563,16 @@
if test -n "$CONFIG_FILES"; then
@@ -17197,7 +17628,7 @@
else
ac_cs_awk_cr=$ac_cr
fi
-@@ -25698,24 +23386,18 @@
+@@ -25716,24 +23586,18 @@
echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
echo "_ACEOF"
} >conf$$subs.sh ||
@@ -17225,7 +17656,25 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25804,9 +23486,7 @@
+@@ -25755,7 +23619,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -25769,7 +23633,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -25822,9 +23686,7 @@
else
cat
fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
@@ -17236,7 +17685,7 @@
_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -25847,9 +23527,7 @@
+@@ -25865,9 +23727,7 @@
if test -z "$ac_t"; then
break
elif $ac_last_try; then
@@ -17247,7 +17696,7 @@
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
-@@ -25934,9 +23612,7 @@
+@@ -25952,9 +23812,7 @@
_ACAWK
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
@@ -17258,7 +17707,7 @@
fi # test -n "$CONFIG_HEADERS"
-@@ -25949,9 +23625,7 @@
+@@ -25967,9 +23825,7 @@
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
@@ -17269,7 +17718,7 @@
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
esac
-@@ -25979,12 +23653,10 @@
+@@ -25997,12 +23853,10 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
@@ -17284,7 +17733,7 @@
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -25995,7 +23667,7 @@
+@@ -26013,7 +23867,7 @@
`' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
@@ -17293,7 +17742,7 @@
$as_echo "$as_me: creating $ac_file" >&6;}
fi
# Neutralize special characters interpreted by sed in replacement strings.
-@@ -26008,9 +23680,7 @@
+@@ -26026,9 +23880,7 @@
case $ac_tag in
*:-:* | *:-) cat >"$tmp/stdin" \
@@ -17304,7 +17753,7 @@
esac
;;
esac
-@@ -26038,47 +23708,7 @@
+@@ -26056,47 +23908,7 @@
q
}
s/.*/./; q'`
@@ -17353,7 +17802,7 @@
ac_builddir=.
case "$ac_dir" in
-@@ -26135,7 +23765,6 @@
+@@ -26153,7 +23965,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=
@@ -17361,7 +17810,7 @@
ac_sed_dataroot='
/datarootdir/ {
p
-@@ -26145,12 +23774,11 @@
+@@ -26163,12 +23974,11 @@
/@docdir@/p
/@infodir@/p
/@localedir@/p
@@ -17376,7 +17825,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
-@@ -26160,7 +23788,7 @@
+@@ -26178,7 +23988,7 @@
s&@infodir@&$infodir&g
s&@localedir@&$localedir&g
s&@mandir@&$mandir&g
@@ -17385,7 +17834,7 @@
esac
_ACEOF
-@@ -26189,14 +23817,12 @@
+@@ -26207,14 +24017,12 @@
$ac_datarootdir_hack
"
eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
@@ -17402,7 +17851,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;}
-@@ -26206,9 +23832,7 @@
+@@ -26224,9 +24032,7 @@
-) cat "$tmp/out" && rm -f "$tmp/out";;
*) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
esac \
@@ -17413,7 +17862,7 @@
;;
:H)
#
-@@ -26219,25 +23843,19 @@
+@@ -26237,25 +24043,19 @@
$as_echo "/* $configure_input */" \
&& eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
} >"$tmp/config.h" \
@@ -17443,7 +17892,7 @@
fi
# Compute "$ac_file"'s index in $config_headers.
_am_arg="$ac_file"
-@@ -26275,7 +23893,7 @@
+@@ -26293,7 +24093,7 @@
s/.*/./; q'`/stamp-h$_am_stamp_count
;;
@@ -17452,7 +17901,7 @@
$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
-@@ -26370,47 +23988,7 @@
+@@ -26388,47 +24188,7 @@
q
}
s/.*/./; q'`
@@ -17501,7 +17950,7 @@
# echo "creating $dirpart/$file"
echo '# dummy' > "$dirpart/$file"
done
-@@ -27224,9 +24802,7 @@
+@@ -27242,9 +25002,7 @@
;;
"po/stamp-it":C)
if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
@@ -17512,7 +17961,7 @@
fi
rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
>"po/stamp-it.tmp"
-@@ -27249,15 +24825,12 @@
+@@ -27267,15 +25025,12 @@
done # for ac_tag
@@ -17530,7 +17979,7 @@
# configure is writing to config.log, and then calls config.status.
-@@ -27278,37 +24851,37 @@
+@@ -27296,37 +25051,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.
@@ -17578,7 +18027,7 @@
$as_echo "$as_me: Vala binding support disabled" >&6;}
fi
if test "x${PLUGINS}" != "x" ; then
-@@ -27316,112 +24889,112 @@
+@@ -27334,112 +25089,112 @@
for plugin in ${PLUGINS}; do
case ${allowed_plugin} in
${plugin})
@@ -17721,9 +18170,8 @@
+{ $as_echo "$as_me:${as_lineno-$LINENO}: End options" >&5
$as_echo "$as_me: End options" >&6;}
-diff -Naur totem-2.28.4.old/data/icons/16x16/Makefile.in totem-2.28.4/data/icons/16x16/Makefile.in
---- totem-2.28.4.old/data/icons/16x16/Makefile.in 2009-11-19 16:01:16.000000000 +0100
-+++ totem-2.28.4/data/icons/16x16/Makefile.in 2009-11-20 08:53:53.000000000 +0100
+--- a/data/icons/16x16/Makefile.in
++++ b/data/icons/16x16/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17733,7 +18181,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17741,9 +18198,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/22x22/Makefile.in totem-2.28.4/data/icons/22x22/Makefile.in
---- totem-2.28.4.old/data/icons/22x22/Makefile.in 2009-11-19 16:01:16.000000000 +0100
-+++ totem-2.28.4/data/icons/22x22/Makefile.in 2009-11-20 08:53:53.000000000 +0100
+--- a/data/icons/22x22/Makefile.in
++++ b/data/icons/22x22/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17753,7 +18209,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17761,9 +18226,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/24x24/Makefile.in totem-2.28.4/data/icons/24x24/Makefile.in
---- totem-2.28.4.old/data/icons/24x24/Makefile.in 2009-11-19 16:01:16.000000000 +0100
-+++ totem-2.28.4/data/icons/24x24/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/data/icons/24x24/Makefile.in
++++ b/data/icons/24x24/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17773,7 +18237,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17781,9 +18254,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/32x32/Makefile.in totem-2.28.4/data/icons/32x32/Makefile.in
---- totem-2.28.4.old/data/icons/32x32/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/data/icons/32x32/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/data/icons/32x32/Makefile.in
++++ b/data/icons/32x32/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17793,7 +18265,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17801,9 +18282,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/48x48/Makefile.in totem-2.28.4/data/icons/48x48/Makefile.in
---- totem-2.28.4.old/data/icons/48x48/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/data/icons/48x48/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/data/icons/48x48/Makefile.in
++++ b/data/icons/48x48/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17813,7 +18293,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17821,9 +18310,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/Makefile.in totem-2.28.4/data/icons/Makefile.in
---- totem-2.28.4.old/data/icons/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/data/icons/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/data/icons/Makefile.in
++++ b/data/icons/Makefile.in
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17833,7 +18321,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -222,6 +224,7 @@
+@@ -163,6 +165,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@
+@@ -222,6 +226,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17841,9 +18338,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/icons/scalable/Makefile.in totem-2.28.4/data/icons/scalable/Makefile.in
---- totem-2.28.4.old/data/icons/scalable/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/data/icons/scalable/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/data/icons/scalable/Makefile.in
++++ b/data/icons/scalable/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17853,7 +18349,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17861,9 +18366,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/data/Makefile.in totem-2.28.4/data/Makefile.in
---- totem-2.28.4.old/data/Makefile.in 2009-11-19 16:01:16.000000000 +0100
-+++ totem-2.28.4/data/Makefile.in 2009-11-20 08:53:53.000000000 +0100
+--- a/data/Makefile.in
++++ b/data/Makefile.in
@@ -141,6 +141,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17873,7 +18377,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -256,6 +258,7 @@
+@@ -197,6 +199,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -256,6 +260,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17881,9 +18394,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/docs/Makefile.in totem-2.28.4/docs/Makefile.in
---- totem-2.28.4.old/docs/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/docs/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/docs/Makefile.in
++++ b/docs/Makefile.in
@@ -107,6 +107,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17893,7 +18405,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -222,6 +224,7 @@
+@@ -163,6 +165,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@
+@@ -222,6 +226,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17901,9 +18422,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/docs/reference/Makefile.in totem-2.28.4/docs/reference/Makefile.in
---- totem-2.28.4.old/docs/reference/Makefile.in 2009-11-19 16:01:17.000000000 +0100
-+++ totem-2.28.4/docs/reference/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/docs/reference/Makefile.in
++++ b/docs/reference/Makefile.in
@@ -76,6 +76,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17913,7 +18433,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -191,6 +193,7 @@
+@@ -132,6 +134,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@
+@@ -191,6 +195,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17921,9 +18450,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/help/bg/Makefile.in totem-2.28.4/help/bg/Makefile.in
---- totem-2.28.4.old/help/bg/Makefile.in 2009-11-19 16:01:18.000000000 +0100
-+++ totem-2.28.4/help/bg/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/help/bg/Makefile.in
++++ b/help/bg/Makefile.in
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17933,7 +18461,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -247,6 +249,7 @@
+@@ -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@
@@ -17941,9 +18478,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/help/Makefile.in totem-2.28.4/help/Makefile.in
---- totem-2.28.4.old/help/Makefile.in 2009-11-19 16:01:18.000000000 +0100
-+++ totem-2.28.4/help/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/help/Makefile.in
++++ b/help/Makefile.in
@@ -132,6 +132,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17953,7 +18489,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -247,6 +249,7 @@
+@@ -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@
@@ -17961,9 +18506,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/lib/Makefile.in totem-2.28.4/lib/Makefile.in
---- totem-2.28.4.old/lib/Makefile.in 2009-11-19 16:01:18.000000000 +0100
-+++ totem-2.28.4/lib/Makefile.in 2009-11-20 08:53:54.000000000 +0100
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
@@ -104,6 +104,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -17973,7 +18517,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -219,6 +221,7 @@
+@@ -160,6 +162,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@
+@@ -219,6 +223,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -17981,15 +18534,14 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/ltmain.sh totem-2.28.4/ltmain.sh
---- totem-2.28.4.old/ltmain.sh 2009-09-29 13:39:45.000000000 +0200
-+++ totem-2.28.4/ltmain.sh 2009-11-20 08:53:42.000000000 +0100
+--- a/ltmain.sh
++++ b/ltmain.sh
@@ -65,7 +65,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
--# $progname: (GNU libtool) 2.2.6
-+# $progname: (GNU libtool) 2.2.6 Debian-2.2.6a-4
+-# $progname: (GNU libtool) 2.2.6b
++# $progname: (GNU libtool) 2.2.6b Debian-2.2.6b-2
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -17997,10 +18549,10 @@
PROGRAM=ltmain.sh
PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6 Debian-2.2.6a-4"
+-VERSION=2.2.6b
++VERSION="2.2.6b Debian-2.2.6b-2"
TIMESTAMP=""
- package_revision=1.3012
+ package_revision=1.3017
@@ -5033,7 +5033,10 @@
case $pass in
@@ -18062,9 +18614,8 @@
esac
;;
no)
-diff -Naur totem-2.28.4.old/Makefile.in totem-2.28.4/Makefile.in
---- totem-2.28.4.old/Makefile.in 2009-11-19 16:01:24.000000000 +0100
-+++ totem-2.28.4/Makefile.in 2009-11-20 08:53:58.000000000 +0100
+--- a/Makefile.in
++++ b/Makefile.in
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18074,7 +18625,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -239,6 +241,7 @@
+@@ -180,6 +182,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -239,6 +243,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18082,9 +18642,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/po/Makefile.in.in totem-2.28.4/po/Makefile.in.in
---- totem-2.28.4.old/po/Makefile.in.in 2009-09-29 13:39:46.000000000 +0200
-+++ totem-2.28.4/po/Makefile.in.in 2009-11-20 08:53:43.000000000 +0100
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
@@ -129,7 +129,7 @@
done
@@ -18094,9 +18653,8 @@
# Define this as empty until I found a useful application.
install-exec installcheck:
-diff -Naur totem-2.28.4.old/src/backend/Makefile.in totem-2.28.4/src/backend/Makefile.in
---- totem-2.28.4.old/src/backend/Makefile.in 2009-11-19 16:01:19.000000000 +0100
-+++ totem-2.28.4/src/backend/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/backend/Makefile.in
++++ b/src/backend/Makefile.in
@@ -121,6 +121,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18106,7 +18664,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -236,6 +238,7 @@
+@@ -177,6 +179,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -236,6 +240,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18114,9 +18681,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/Makefile.in totem-2.28.4/src/Makefile.in
---- totem-2.28.4.old/src/Makefile.in 2009-11-19 16:01:19.000000000 +0100
-+++ totem-2.28.4/src/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/Makefile.in
++++ b/src/Makefile.in
@@ -343,6 +343,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18126,7 +18692,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -458,6 +460,7 @@
+@@ -399,6 +401,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@
+@@ -458,6 +462,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18134,10 +18709,9 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/bbc/Makefile.in totem-2.28.4/src/plugins/bbc/Makefile.in
---- totem-2.28.4.old/src/plugins/bbc/Makefile.in 1970-01-01 01:00:00.000000000 +0100
-+++ totem-2.28.4/src/plugins/bbc/Makefile.in 2009-11-20 08:53:55.000000000 +0100
-@@ -0,0 +1,594 @@
+--- /dev/null
++++ b/src/plugins/bbc/Makefile.in
+@@ -0,0 +1,596 @@
+# Makefile.in generated by automake 1.11 from Makefile.am.
+# @configure_input@
+
@@ -18291,6 +18865,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@
@@ -18732,9 +19308,8 @@
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -Naur totem-2.28.4.old/src/plugins/bemused/Makefile.in totem-2.28.4/src/plugins/bemused/Makefile.in
---- totem-2.28.4.old/src/plugins/bemused/Makefile.in 2009-11-19 16:01:19.000000000 +0100
-+++ totem-2.28.4/src/plugins/bemused/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/bemused/Makefile.in
++++ b/src/plugins/bemused/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18744,7 +19319,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -240,6 +242,7 @@
+@@ -181,6 +183,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@
+@@ -240,6 +244,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18752,9 +19336,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/brasero-disc-recorder/Makefile.in totem-2.28.4/src/plugins/brasero-disc-recorder/Makefile.in
---- totem-2.28.4.old/src/plugins/brasero-disc-recorder/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/brasero-disc-recorder/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/brasero-disc-recorder/Makefile.in
++++ b/src/plugins/brasero-disc-recorder/Makefile.in
@@ -128,6 +128,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18764,7 +19347,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -243,6 +245,7 @@
+@@ -184,6 +186,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@
+@@ -243,6 +247,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18772,9 +19364,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/coherence_upnp/Makefile.in totem-2.28.4/src/plugins/coherence_upnp/Makefile.in
---- totem-2.28.4.old/src/plugins/coherence_upnp/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/coherence_upnp/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/coherence_upnp/Makefile.in
++++ b/src/plugins/coherence_upnp/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18784,7 +19375,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -208,6 +210,7 @@
+@@ -149,6 +151,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@
+@@ -208,6 +212,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18792,9 +19392,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/dbus-service/Makefile.in totem-2.28.4/src/plugins/dbus-service/Makefile.in
---- totem-2.28.4.old/src/plugins/dbus-service/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/dbus-service/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/dbus-service/Makefile.in
++++ b/src/plugins/dbus-service/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18804,7 +19403,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -208,6 +210,7 @@
+@@ -149,6 +151,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@
+@@ -208,6 +212,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18812,9 +19420,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/galago/Makefile.in totem-2.28.4/src/plugins/galago/Makefile.in
---- totem-2.28.4.old/src/plugins/galago/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/galago/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/galago/Makefile.in
++++ b/src/plugins/galago/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18824,7 +19431,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -240,6 +242,7 @@
+@@ -181,6 +183,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@
+@@ -240,6 +244,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18832,9 +19448,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/gromit/Makefile.in totem-2.28.4/src/plugins/gromit/Makefile.in
---- totem-2.28.4.old/src/plugins/gromit/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/gromit/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/gromit/Makefile.in
++++ b/src/plugins/gromit/Makefile.in
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18844,7 +19459,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -239,6 +241,7 @@
+@@ -180,6 +182,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -239,6 +243,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18852,9 +19476,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/iplayer/Makefile.in totem-2.28.4/src/plugins/iplayer/Makefile.in
---- totem-2.28.4.old/src/plugins/iplayer/Makefile.in 2009-11-19 16:01:20.000000000 +0100
-+++ totem-2.28.4/src/plugins/iplayer/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/iplayer/Makefile.in
++++ b/src/plugins/iplayer/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18864,7 +19487,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -209,6 +211,7 @@
+@@ -150,6 +152,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@
+@@ -209,6 +213,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18872,9 +19504,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/jamendo/Makefile.in totem-2.28.4/src/plugins/jamendo/Makefile.in
---- totem-2.28.4.old/src/plugins/jamendo/Makefile.in 2009-11-19 16:01:21.000000000 +0100
-+++ totem-2.28.4/src/plugins/jamendo/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/jamendo/Makefile.in
++++ b/src/plugins/jamendo/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18884,7 +19515,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -209,6 +211,7 @@
+@@ -150,6 +152,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@
+@@ -209,6 +213,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18892,9 +19532,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/lirc/Makefile.in totem-2.28.4/src/plugins/lirc/Makefile.in
---- totem-2.28.4.old/src/plugins/lirc/Makefile.in 2009-11-19 16:01:21.000000000 +0100
-+++ totem-2.28.4/src/plugins/lirc/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/lirc/Makefile.in
++++ b/src/plugins/lirc/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18904,7 +19543,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18912,9 +19560,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/Makefile.in totem-2.28.4/src/plugins/Makefile.in
---- totem-2.28.4.old/src/plugins/Makefile.in 2009-11-19 16:01:19.000000000 +0100
-+++ totem-2.28.4/src/plugins/Makefile.in 2009-11-20 08:53:55.000000000 +0100
+--- a/src/plugins/Makefile.in
++++ b/src/plugins/Makefile.in
@@ -167,6 +167,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18924,7 +19571,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -282,6 +284,7 @@
+@@ -223,6 +225,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -282,6 +286,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18932,9 +19588,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/media-player-keys/Makefile.in totem-2.28.4/src/plugins/media-player-keys/Makefile.in
---- totem-2.28.4.old/src/plugins/media-player-keys/Makefile.in 2009-11-19 16:01:21.000000000 +0100
-+++ totem-2.28.4/src/plugins/media-player-keys/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/media-player-keys/Makefile.in
++++ b/src/plugins/media-player-keys/Makefile.in
@@ -130,6 +130,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18944,7 +19599,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -245,6 +247,7 @@
+@@ -186,6 +188,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@
+@@ -245,6 +249,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18952,9 +19616,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/mythtv/Makefile.in totem-2.28.4/src/plugins/mythtv/Makefile.in
---- totem-2.28.4.old/src/plugins/mythtv/Makefile.in 2009-11-19 16:01:21.000000000 +0100
-+++ totem-2.28.4/src/plugins/mythtv/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/mythtv/Makefile.in
++++ b/src/plugins/mythtv/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18964,7 +19627,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18972,9 +19644,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/ontop/Makefile.in totem-2.28.4/src/plugins/ontop/Makefile.in
---- totem-2.28.4.old/src/plugins/ontop/Makefile.in 2009-11-19 16:01:21.000000000 +0100
-+++ totem-2.28.4/src/plugins/ontop/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/ontop/Makefile.in
++++ b/src/plugins/ontop/Makefile.in
@@ -124,6 +124,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -18984,7 +19655,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -239,6 +241,7 @@
+@@ -180,6 +182,8 @@
+ GST_CFLAGS = @GST_CFLAGS@
+ GST_LIBS = @GST_LIBS@
+ GTKDOC_CHECK = @GTKDOC_CHECK@
++GTKDOC_MKPDF = @GTKDOC_MKPDF@
++GTKDOC_REBASE = @GTKDOC_REBASE@
+ GTK_CFLAGS = @GTK_CFLAGS@
+ GTK_LIBS = @GTK_LIBS@
+ HELP_DIR = @HELP_DIR@
+@@ -239,6 +243,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -18992,9 +19672,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/opensubtitles/Makefile.in totem-2.28.4/src/plugins/opensubtitles/Makefile.in
---- totem-2.28.4.old/src/plugins/opensubtitles/Makefile.in 2009-11-19 16:01:22.000000000 +0100
-+++ totem-2.28.4/src/plugins/opensubtitles/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/opensubtitles/Makefile.in
++++ b/src/plugins/opensubtitles/Makefile.in
@@ -94,6 +94,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19004,7 +19683,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -209,6 +211,7 @@
+@@ -150,6 +152,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@
+@@ -209,6 +213,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19012,9 +19700,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/properties/Makefile.in totem-2.28.4/src/plugins/properties/Makefile.in
---- totem-2.28.4.old/src/plugins/properties/Makefile.in 2009-11-19 16:01:22.000000000 +0100
-+++ totem-2.28.4/src/plugins/properties/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/properties/Makefile.in
++++ b/src/plugins/properties/Makefile.in
@@ -137,6 +137,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19024,7 +19711,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -252,6 +254,7 @@
+@@ -193,6 +195,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@
+@@ -252,6 +256,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19032,9 +19728,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/publish/Makefile.in totem-2.28.4/src/plugins/publish/Makefile.in
---- totem-2.28.4.old/src/plugins/publish/Makefile.in 2009-11-19 16:01:22.000000000 +0100
-+++ totem-2.28.4/src/plugins/publish/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/publish/Makefile.in
++++ b/src/plugins/publish/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19044,7 +19739,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19052,9 +19756,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/pythonconsole/Makefile.in totem-2.28.4/src/plugins/pythonconsole/Makefile.in
---- totem-2.28.4.old/src/plugins/pythonconsole/Makefile.in 2009-11-19 16:01:22.000000000 +0100
-+++ totem-2.28.4/src/plugins/pythonconsole/Makefile.in 2009-11-20 08:53:56.000000000 +0100
+--- a/src/plugins/pythonconsole/Makefile.in
++++ b/src/plugins/pythonconsole/Makefile.in
@@ -93,6 +93,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19064,7 +19767,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -208,6 +210,7 @@
+@@ -149,6 +151,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@
+@@ -208,6 +212,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19072,9 +19784,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/sample-python/Makefile.in totem-2.28.4/src/plugins/sample-python/Makefile.in
---- totem-2.28.4.old/src/plugins/sample-python/Makefile.in 2009-11-19 16:01:22.000000000 +0100
-+++ totem-2.28.4/src/plugins/sample-python/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/sample-python/Makefile.in
++++ b/src/plugins/sample-python/Makefile.in
@@ -67,6 +67,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19084,7 +19795,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -182,6 +184,7 @@
+@@ -123,6 +125,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@
+@@ -182,6 +186,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19092,9 +19812,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/sample-vala/Makefile.in totem-2.28.4/src/plugins/sample-vala/Makefile.in
---- totem-2.28.4.old/src/plugins/sample-vala/Makefile.in 2009-11-19 16:01:23.000000000 +0100
-+++ totem-2.28.4/src/plugins/sample-vala/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/sample-vala/Makefile.in
++++ b/src/plugins/sample-vala/Makefile.in
@@ -127,6 +127,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19104,7 +19823,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -242,6 +244,7 @@
+@@ -183,6 +185,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@
+@@ -242,6 +246,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19112,9 +19840,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/screensaver/Makefile.in totem-2.28.4/src/plugins/screensaver/Makefile.in
---- totem-2.28.4.old/src/plugins/screensaver/Makefile.in 2009-11-19 16:01:23.000000000 +0100
-+++ totem-2.28.4/src/plugins/screensaver/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/screensaver/Makefile.in
++++ b/src/plugins/screensaver/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19124,7 +19851,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19132,9 +19868,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/screenshot/Makefile.in totem-2.28.4/src/plugins/screenshot/Makefile.in
---- totem-2.28.4.old/src/plugins/screenshot/Makefile.in 2009-11-19 16:01:23.000000000 +0100
-+++ totem-2.28.4/src/plugins/screenshot/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/screenshot/Makefile.in
++++ b/src/plugins/screenshot/Makefile.in
@@ -131,6 +131,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19144,7 +19879,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -246,6 +248,7 @@
+@@ -187,6 +189,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@
+@@ -246,6 +250,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19152,9 +19896,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/sidebar-test/Makefile.in totem-2.28.4/src/plugins/sidebar-test/Makefile.in
---- totem-2.28.4.old/src/plugins/sidebar-test/Makefile.in 2009-11-19 16:01:23.000000000 +0100
-+++ totem-2.28.4/src/plugins/sidebar-test/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/sidebar-test/Makefile.in
++++ b/src/plugins/sidebar-test/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19164,7 +19907,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19172,9 +19924,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/skipto/Makefile.in totem-2.28.4/src/plugins/skipto/Makefile.in
---- totem-2.28.4.old/src/plugins/skipto/Makefile.in 2009-11-19 16:01:23.000000000 +0100
-+++ totem-2.28.4/src/plugins/skipto/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/skipto/Makefile.in
++++ b/src/plugins/skipto/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19184,7 +19935,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19192,9 +19952,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/thumbnail/Makefile.in totem-2.28.4/src/plugins/thumbnail/Makefile.in
---- totem-2.28.4.old/src/plugins/thumbnail/Makefile.in 2009-11-19 16:01:24.000000000 +0100
-+++ totem-2.28.4/src/plugins/thumbnail/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/thumbnail/Makefile.in
++++ b/src/plugins/thumbnail/Makefile.in
@@ -125,6 +125,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19204,7 +19963,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -240,6 +242,7 @@
+@@ -181,6 +183,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@
+@@ -240,6 +244,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19212,9 +19980,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/totem/Makefile.in totem-2.28.4/src/plugins/totem/Makefile.in
---- totem-2.28.4.old/src/plugins/totem/Makefile.in 2009-11-19 16:01:24.000000000 +0100
-+++ totem-2.28.4/src/plugins/totem/Makefile.in 2009-11-20 08:53:57.000000000 +0100
+--- a/src/plugins/totem/Makefile.in
++++ b/src/plugins/totem/Makefile.in
@@ -91,6 +91,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19224,7 +19991,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -206,6 +208,7 @@
+@@ -147,6 +149,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@
+@@ -206,6 +210,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19232,9 +20008,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/tracker/Makefile.in totem-2.28.4/src/plugins/tracker/Makefile.in
---- totem-2.28.4.old/src/plugins/tracker/Makefile.in 2009-11-19 16:01:24.000000000 +0100
-+++ totem-2.28.4/src/plugins/tracker/Makefile.in 2009-11-20 08:53:58.000000000 +0100
+--- a/src/plugins/tracker/Makefile.in
++++ b/src/plugins/tracker/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19244,7 +20019,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19252,9 +20036,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
-diff -Naur totem-2.28.4.old/src/plugins/youtube/Makefile.in totem-2.28.4/src/plugins/youtube/Makefile.in
---- totem-2.28.4.old/src/plugins/youtube/Makefile.in 2009-11-19 16:01:24.000000000 +0100
-+++ totem-2.28.4/src/plugins/youtube/Makefile.in 2009-11-20 08:53:58.000000000 +0100
+--- a/src/plugins/youtube/Makefile.in
++++ b/src/plugins/youtube/Makefile.in
@@ -126,6 +126,8 @@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
@@ -19264,7 +20047,16 @@
BEMUSED_CFLAGS = @BEMUSED_CFLAGS@
BEMUSED_LIBS = @BEMUSED_LIBS@
BROWSER_PLUGIN_CFLAGS = @BROWSER_PLUGIN_CFLAGS@
-@@ -241,6 +243,7 @@
+@@ -182,6 +184,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@
+@@ -241,6 +245,7 @@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
@@ -19272,3 +20064,313 @@
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/unstable/totem/debian/watch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/totem/debian/watch?rev=22679&op=diff
==============================================================================
--- desktop/unstable/totem/debian/watch [utf-8] (original)
+++ desktop/unstable/totem/debian/watch [utf-8] Tue Dec 22 23:41:01 2009
@@ -1,2 +1,2 @@
version=3
-http://download.gnome.org/sources/totem/([\d\.]+)[0123456789]/totem-([\d\.]+)\.tar\.gz
+http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz
More information about the pkg-gnome-commits
mailing list