--- totem-2.22.1.orig/config.guess
+++ totem-2.22.1/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
-# Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2008-01-08'
+timestamp='2007-07-22'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[456])
+ *:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -799,9 +799,6 @@
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
- IA64)
- echo ia64-unknown-interix${UNAME_RELEASE}
- exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -836,14 +833,7 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- eval $set_cc_for_build
- if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
- | grep -q __ARM_EABI__
- then
- echo ${UNAME_MACHINE}-unknown-linux-gnu
- else
- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
- fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -964,8 +954,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
--- totem-2.22.1.orig/debian/patches/90_from_svn_fix_youtube_requirement.patch
+++ totem-2.22.1/debian/patches/90_from_svn_fix_youtube_requirement.patch
@@ -0,0 +1,21 @@
+--- totem-2.22.1/src/plugins/youtube/youtube.py 2008/04/10 17:48:50 5355
++++ totem-2.22.1/src/plugins/youtube/youtube.py 2008/04/10 17:51:45 5356
+@@ -42,7 +42,7 @@
+ self.vadjust = {}
+ self.liststore = {}
+ def activate (self, totem_object):
+- """Check for the availability of the flvdemux and souphttpsrc GStreamer plugins"""
++ """Check for the availability of the flvdemux and soup GStreamer plugins"""
+ bvw_name = totem_object.get_video_widget_backend_name ()
+
+ if bvw_name.find ("GStreamer") != -1:
+@@ -52,7 +52,7 @@
+ import gst
+
+ registry = gst.registry_get_default ()
+- if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("souphttpsrc") == None:
++ if registry.find_plugin ("flvdemux") == None or registry.find_plugin ("soup") == None:
+ """This means an error will be displayed when they try to play anything"""
+ self.gstreamer_plugins_present = False
+ except ImportError:
+
--- totem-2.22.1.orig/debian/patches/20_use_alternatives.patch
+++ totem-2.22.1/debian/patches/20_use_alternatives.patch
@@ -0,0 +1,13 @@
+Index: totem-2.20.0/data/schemas.sh
+===================================================================
+--- totem-2.20.0.orig/data/schemas.sh 2007-08-26 01:05:12.000000000 +0200
++++ totem-2.20.0/data/schemas.sh 2007-09-25 14:54:52.714252335 +0200
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+
+ OWNER=totem
+-COMMAND="$2/totem-video-thumbnailer -s %s %u %o"
++COMMAND="$2/gnome-video-thumbnailer -s %s %u %o"
+
+ . `dirname $0`/mime-functions.sh
+
--- totem-2.22.1.orig/debian/patches/30_totem_xulrunner19.patch
+++ totem-2.22.1/debian/patches/30_totem_xulrunner19.patch
@@ -0,0 +1,164 @@
+Summary:
+
+Fix configure.in to detect xulrunner-1.9 as gecko=mozilla 1.9
+ - update configure.in:
+
+Instructions:
+
+1. Drop this into debian/patches directory of totem package and add the filename
+used into the debian/patches/series file such that it gets applied _before_ the
+autoconf patch.
+2. Update autoconf patch by: QUILT_PATCHES=debian/patches quilt push -a; autoconf; quilt refresh --diffstat -U --no-timestamps
+3. Build as usually (e.g. dpkg-buildpackage -rfakeroot -b)
+
+Tested Package Versions:
+ + totem >= 2.21.2-0ubuntu2, build: OK, works: OK (asac)
+
+---
+ configure.in | 77 ++++++++++++++++++++++++++++++++++++++++++++---------------
+ 1 file changed, 58 insertions(+), 19 deletions(-)
+
+--- a/configure.in 2008-02-27 12:24:51.000000000 +0100
++++ b/configure.in 2008-02-27 12:25:05.000000000 +0100
+@@ -590,13 +590,19 @@
+ if test -z "$with_gecko"; then
+ dnl Autodetect gecko
+ for g in $GECKOS; do
++ if $PKG_CONFIG --exists $g-plugin; then
++ gecko=$g
++ break;
++ fi
+ if $PKG_CONFIG --exists $g-xpcom; then
+ gecko=$g
+ break;
+ fi
+ done
+ elif ! $PKG_CONFIG --exists $gecko-xpcom; then
+- AC_MSG_ERROR([Gecko "$gecko" not found])
++ if ! $PKG_CONFIG --exists $gecko-plugin; then
++ AC_MSG_ERROR([Gecko "$gecko" not found])
++ fi
+ fi
+
+ if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then
+@@ -634,24 +640,35 @@
+ # Check for mozilla modules, but keep the CFLAGS and LIBS in
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
+- PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
+- [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin],,
+- [enable_browser_plugins=no])
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_VERSION_MIN=1.9
++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++ [libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN],,
++ [enable_browser_plugins=no])
++ else
++ PKG_CHECK_MODULES([MOZILLA_NOT_LINKED],
++ [$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
++ $MOZILLA-plugin],,
++ [enable_browser_plugins=no])
++ fi
+ fi
+ # Check for other required modules, and merge CFLAGS, but not link
+ # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+ if test "$enable_browser_plugins" = "yes" ; then
+ PKG_CHECK_MODULES([BROWSER_PLUGIN],
+ [glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS],
+ [],[enable_browser_plugins=no])
+
+ BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
+ AC_SUBST([BROWSER_PLUGIN_CFLAGS])
++ # for xul 1.9 we have to link anyway
++ if test "$MOZILLA_VERSION_MIN" = 1.9; then
++ BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS"
++ fi
+ AC_SUBST([BROWSER_PLUGIN_LIBS])
+
+ # Earlier versions misdetect playlists
+@@ -683,10 +700,18 @@
+
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+- MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+- MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+- MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`"
++ else
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`"
++ fi
++
+ MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
+
+ AC_PATH_PROG([MOZILLA_XPIDL], [xpidl], [no], [$MOZILLA_LIBDIR:$PATH])
+@@ -708,8 +733,12 @@
+
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
+- dnl This only works on gecko 1.8
+- MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++ dnl This only works on gecko 1.9 and 1.8
++ if $PKG_CONFIG --exists libxul; then
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++ else
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++ fi
+ dnl Fallback for older versions
+ if test "x$MOZILLA_IDLDIR" = "x"; then
+ MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+@@ -741,8 +770,14 @@
+
+ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+- LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
+- LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++ LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ else
++ LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ fi
+
+ AC_MSG_CHECKING([for libxpcomglue_s])
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[
+@@ -763,7 +798,11 @@
+ AC_LANG_POP([C++])
+
+ if test "$have_libxpcomglue_s" = "yes"; then
+- LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS"
++ else
++ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ fi
+ else
+ AC_MSG_WARN([libxpcomglue_s not available; plugins may not be portable])
+ fi
+@@ -795,7 +834,7 @@
+ if test "$enable_browser_plugins" = "yes"; then
+ AC_LANG_PUSH([C++])
+ __SAVE_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom"
++ CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
+
+ AC_CHECK_HEADERS([nsTArray.h])
+
--- totem-2.22.1.orig/debian/patches/series
+++ totem-2.22.1/debian/patches/series
@@ -0,0 +1,7 @@
+02_lpi.patch
+04_desktop_gettext_domain.patch
+20_use_alternatives.patch
+25_revert-xine-reqs-bump.patch
+30_totem_xulrunner19.patch
+70_autoconf.patch
+90_from_svn_fix_youtube_requirement.patch
--- totem-2.22.1.orig/debian/patches/02_lpi.patch
+++ totem-2.22.1/debian/patches/02_lpi.patch
@@ -0,0 +1,53 @@
+# Description: launchpad integration changes
+# UbuntuSpecific: ubuntu launchpad integration
+#
+Index: totem-2.22.1/configure.in
+===================================================================
+--- totem-2.22.1.orig/configure.in 2008-04-08 15:02:03.000000000 +0200
++++ totem-2.22.1/configure.in 2008-04-08 23:03:21.000000000 +0200
+@@ -234,11 +234,11 @@
+ dnl Also check if we're going to be using GTK+ only
+ if test x$ENABLE_GTK = "xno" ; then
+ # FIXME: use gmodule-no-export instead!
+- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ HAVE_GNOME=yes
+ else
+ # FIXME: use gmodule-no-export instead!
+- PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
++ PKG_CHECK_MODULES(EXTRA_GNOME, glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM)
+ AC_DEFINE(USE_STABLE_LIBGNOMEUI, 1, [defined if we don't have GNOME])
+ AC_DEFINE(HAVE_GTK_ONLY, 1, [defined if GNOME isn't used])
+ HAVE_GNOME=no
+Index: totem-2.22.1/data/totem.ui
+===================================================================
+--- totem-2.22.1.orig/data/totem.ui 2008-03-04 18:20:05.000000000 +0100
++++ totem-2.22.1/data/totem.ui 2008-04-08 23:03:30.000000000 +0200
+@@ -498,6 +498,7 @@
+
+
+
+Index: totem-2.22.1/src/totem-menu.c
+===================================================================
+--- totem-2.22.1.orig/src/totem-menu.c 2008-03-04 18:20:03.000000000 +0100
++++ totem-2.22.1/src/totem-menu.c 2008-04-08 23:03:21.000000000 +0200
+@@ -26,6 +26,8 @@
+ #include
+ #include
+
++#include
++
+ #include "totem-menu.h"
+ #include "totem.h"
+ #include "totem-interface.h"
+@@ -1403,5 +1405,6 @@
+ totem->languages_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
+ totem->subtitles_action_group = NULL;
+ totem->subtitles_ui_id = gtk_ui_manager_new_merge_id (totem->ui_manager);
++ launchpad_integration_add_ui(totem->ui_manager, "ui/tmw-menubar/help/LaunchpadItems");
+ }
+
--- totem-2.22.1.orig/debian/patches/70_autoconf.patch
+++ totem-2.22.1/debian/patches/70_autoconf.patch
@@ -0,0 +1,3041 @@
+Generated with aclocal && autoconf && rm -rf autom4te.cache
+
+Index: totem-2.22.1/aclocal.m4
+===================================================================
+--- totem-2.22.1.orig/aclocal.m4 2008-04-08 15:10:00.000000000 +0200
++++ totem-2.22.1/aclocal.m4 2008-04-08 23:06:21.000000000 +0200
+@@ -710,6 +710,10 @@
+ enable_scrollkeeper=yes)
+ AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
++dnl disable scrollkeeper automatically for distcheck
++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
++
+ AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+ ])
+
+@@ -945,7 +949,7 @@
+
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+-# serial 51 AC_PROG_LIBTOOL
++# serial 52 Debian 1.5.26-1ubuntu1 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -1033,7 +1037,6 @@
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+-
+ AC_LIBTOOL_SYS_MAX_CMD_LEN
+ AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+ AC_LIBTOOL_OBJDIR
+@@ -1135,6 +1138,8 @@
+ ;;
+ esac
+
++_LT_REQUIRED_DARWIN_CHECKS
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ enable_win32_dll=yes, enable_win32_dll=no)
+@@ -1214,9 +1219,80 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+ ])# _LT_LINKER_BOILERPLATE
+
++# _LT_REQUIRED_DARWIN_CHECKS
++# --------------------------
++# Check for some things on darwin
++AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
++ case $host_os in
++ rhapsody* | darwin*)
++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
++
++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
++ [lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi])
++ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
++ [lt_cv_ld_exported_symbols_list],
++ [lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
++ [lt_cv_ld_exported_symbols_list=yes],
++ [lt_cv_ld_exported_symbols_list=no])
++ LDFLAGS="$save_LDFLAGS"
++ ])
++ case $host_os in
++ rhapsody* | darwin1.[[0123]])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[[012]]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
++])
+
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+@@ -1497,7 +1573,6 @@
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -1542,7 +1617,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -1635,7 +1714,7 @@
+ $2=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+ ])
+
+@@ -1906,7 +1985,7 @@
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+ [AC_CHECK_LIB([dld], [shl_load],
+- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [AC_CHECK_FUNC([dlopen],
+ [lt_cv_dlopen="dlopen"],
+ [AC_CHECK_LIB([dl], [dlopen],
+@@ -1914,7 +1993,7 @@
+ [AC_CHECK_LIB([svld], [dlopen],
+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [AC_CHECK_LIB([dld], [dld_link],
+- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ ])
+ ])
+ ])
+@@ -2231,7 +2310,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -2556,13 +2635,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -2574,6 +2651,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -2754,6 +2843,13 @@
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+
++AC_CACHE_VAL([lt_cv_sys_lib_search_path_spec],
++[lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"])
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++AC_CACHE_VAL([lt_cv_sys_lib_dlsearch_path_spec],
++[lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"])
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -3253,7 +3349,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[[4-9]]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -3348,7 +3444,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -3689,7 +3785,7 @@
+ fi
+ ;;
+
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -3746,6 +3842,7 @@
+ _LT_AC_TAGVAR(predeps, $1)=
+ _LT_AC_TAGVAR(postdeps, $1)=
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
+
+ # Source file extension for C++ test sources.
+ ac_ext=cpp
+@@ -3855,7 +3952,7 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -3868,7 +3965,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -4014,51 +4111,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -4309,7 +4378,7 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -4382,7 +4451,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -4744,7 +4813,8 @@
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+ # objects, libraries and library flags.
+-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ dnl we can't use the lt_simple_compile_test_code here,
+ dnl because it contains code intended for an executable,
+ dnl not a library. It's possible we should let each
+@@ -4869,6 +4939,11 @@
+
+ $rm -f confest.$objext
+
++_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=
++if test -n "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_AC_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
++fi
++
+ # PORTME: override above test on systems where it is broken
+ ifelse([$1],[CXX],
+ [case $host_os in
+@@ -4925,7 +5000,6 @@
+ ;;
+ esac
+ ])
+-
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+@@ -5010,7 +5084,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[[4-9]]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -5187,6 +5261,7 @@
+ _LT_AC_TAGVAR(predeps, $1) \
+ _LT_AC_TAGVAR(postdeps, $1) \
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++ _LT_AC_TAGVAR(compiler_lib_search_dirs, $1) \
+ _LT_AC_TAGVAR(archive_cmds, $1) \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(postinstall_cmds, $1) \
+@@ -5249,7 +5324,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -5486,6 +5561,10 @@
+ # shared library.
+ postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_dirs, $1)
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
+@@ -5835,7 +5914,7 @@
+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -5892,7 +5971,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+@@ -5929,7 +6009,7 @@
+ esac
+ else
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # All AIX code is PIC.
+ if test "$host_cpu" = ia64; then
+ # AIX 5 now supports IA64 processor
+@@ -6025,7 +6105,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler.
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+@@ -6063,7 +6143,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+@@ -6176,7 +6256,8 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ darwin* | rhapsody*)
+@@ -6246,7 +6327,8 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++ m4_if([$1], [GCJ], [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -6383,7 +6465,7 @@
+ #
+ if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
+ AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_pic_works, $1),
+ [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
+ [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
+ "" | " "*) ;;
+@@ -6407,7 +6489,7 @@
+ #
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
+ AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ _LT_AC_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+ $lt_tmp_static_flag,
+ [],
+ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+@@ -6423,7 +6505,7 @@
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -6438,10 +6520,14 @@
+ cygwin* | mingw*)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ ],[
+ runpath_var=
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -6472,12 +6558,14 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++ _LT_AC_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
++dnl Note also adjust exclude_expsyms for C++ above.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ _LT_CC_BASENAME([$compiler])
+@@ -6527,7 +6615,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[[3-9]]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -6643,12 +6731,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -6746,7 +6835,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[[4-9]]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -6766,7 +6855,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -6926,11 +7015,10 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -7080,7 +7168,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+Index: totem-2.22.1/configure
+===================================================================
+--- totem-2.22.1.orig/configure 2008-04-08 15:10:12.000000000 +0200
++++ totem-2.22.1/configure 2008-04-08 23:05:54.000000000 +0200
+@@ -916,6 +916,8 @@
+ ECHO
+ AR
+ RANLIB
++DSYMUTIL
++NMEDIT
+ CXXCPP
+ F77
+ FFLAGS
+@@ -6228,6 +6230,141 @@
+ { (exit 1); exit 1; }; }
+ fi
+
++# 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_XGETTEXT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $XGETTEXT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_XGETTEXT="$XGETTEXT" # 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_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++XGETTEXT=$ac_cv_path_XGETTEXT
++if test -n "$XGETTEXT"; then
++ { echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++echo "${ECHO_T}$XGETTEXT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgmerge", so it can be a program name with args.
++set dummy msgmerge; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGMERGE+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGMERGE in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGMERGE="$MSGMERGE" # 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_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGMERGE=$ac_cv_path_MSGMERGE
++if test -n "$MSGMERGE"; then
++ { echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++echo "${ECHO_T}$MSGMERGE" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# Extract the first word of "msgfmt", so it can be a program name with args.
++set dummy msgfmt; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_path_MSGFMT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ case $MSGFMT in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_MSGFMT="$MSGFMT" # 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_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++MSGFMT=$ac_cv_path_MSGFMT
++if test -n "$MSGFMT"; then
++ { echo "$as_me:$LINENO: result: $MSGFMT" >&5
++echo "${ECHO_T}$MSGFMT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
++ { { echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
++echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
++ { (exit 1); exit 1; }; }
++fi
++
+ # Use the tools built into the package, not the ones that are installed.
+ INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+
+@@ -7684,7 +7821,7 @@
+ # whether `pass_all' will *always* work, you probably want this one.
+
+ case $host_os in
+-aix4* | aix5*)
++aix[4-9]*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+@@ -7779,7 +7916,7 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+ else
+@@ -7899,7 +8036,7 @@
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 7902 "configure"' > conftest.$ac_ext
++ echo '#line 8039 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -7964,7 +8101,6 @@
+ esac
+ ;;
+ *64-bit*)
+- libsuff=64
+ case $host in
+ x86_64-*kfreebsd*-gnu)
+ LD="${LD-ld} -m elf_x86_64_fbsd"
+@@ -8072,7 +8208,11 @@
+ *64-bit*)
+ case $lt_cv_prog_gnu_ld in
+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
+- *) LD="${LD-ld} -64" ;;
++ *)
++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
++ LD="${LD-ld} -64"
++ fi
++ ;;
+ esac
+ ;;
+ esac
+@@ -8728,7 +8868,6 @@
+
+
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+-
+ # find the maximum length of command line arguments
+ { echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+ echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
+@@ -9043,7 +9182,7 @@
+ echo "$progname: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ fi
+- rm -f conftest* conftst*
++ rm -rf conftest* conftst*
+
+ # Do not use the global_symbol_pipe unless it works.
+ if test "$pipe_works" = yes; then
+@@ -9583,25 +9722,337 @@
+ MAGIC_CMD="$lt_save_MAGIC_CMD"
+ ;;
+ esac
+-fi
+-
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+- { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
+-echo "${ECHO_T}$MAGIC_CMD" >&6; }
++fi
++
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++ { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++echo "${ECHO_T}$MAGIC_CMD" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ else
++ MAGIC_CMD=:
++ fi
++fi
++
++ fi
++ ;;
++esac
++
++
++ case $host_os in
++ rhapsody* | darwin*)
++ 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$DSYMUTIL"; then
++ ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
++else
++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_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++DSYMUTIL=$ac_cv_prog_DSYMUTIL
++if test -n "$DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++echo "${ECHO_T}$DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_DSYMUTIL"; then
++ 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_DSYMUTIL"; then
++ ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
++else
++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_prog_ac_ct_DSYMUTIL="dsymutil"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
++if test -n "$ac_ct_DSYMUTIL"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_DSYMUTIL" = x; then
++ DSYMUTIL=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ DSYMUTIL=$ac_ct_DSYMUTIL
++ fi
++else
++ DSYMUTIL="$ac_cv_prog_DSYMUTIL"
++fi
++
++ 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$NMEDIT"; then
++ ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
++else
++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_prog_NMEDIT="${ac_tool_prefix}nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++NMEDIT=$ac_cv_prog_NMEDIT
++if test -n "$NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $NMEDIT" >&5
++echo "${ECHO_T}$NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_prog_NMEDIT"; then
++ 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
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ if test -n "$ac_ct_NMEDIT"; then
++ ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
++else
++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_prog_ac_ct_NMEDIT="nmedit"
++ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
++if test -n "$ac_ct_NMEDIT"; then
++ { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
++else
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++ if test "x$ac_ct_NMEDIT" = x; then
++ NMEDIT=":"
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&5
++echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
++whose name does not start with the host triplet. If you think this
++configuration is useful to you, please write to autoconf@gnu.org." >&2;}
++ac_tool_warned=yes ;;
++esac
++ NMEDIT=$ac_ct_NMEDIT
++ fi
++else
++ NMEDIT="$ac_cv_prog_NMEDIT"
++fi
++
++
++ { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_apple_cc_single_mod=no
++ if test -z "${LT_MULTI_MODULE}"; then
++ # By default we will add the -single_module flag. You can override
++ # by either setting the environment variable LT_MULTI_MODULE
++ # non-empty at configure time, or by adding -multi_module to the
++ # link flags.
++ echo "int foo(void){return 1;}" > conftest.c
++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
++ -dynamiclib ${wl}-single_module conftest.c
++ if test -f libconftest.dylib; then
++ lt_cv_apple_cc_single_mod=yes
++ rm -rf libconftest.dylib*
++ fi
++ rm conftest.c
++ fi
++fi
++{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
++ { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_ld_exported_symbols_list=no
++ save_LDFLAGS=$LDFLAGS
++ echo "_main" > conftest.sym
++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
++ 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
++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 "echo \"\$as_me:$LINENO: $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
++ 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 &&
++ $as_test_x conftest$ac_exeext; then
++ lt_cv_ld_exported_symbols_list=yes
+ else
+- { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++ lt_cv_ld_exported_symbols_list=no
+ fi
+
+- else
+- MAGIC_CMD=:
+- fi
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ LDFLAGS="$save_LDFLAGS"
++
+ fi
++{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
++ case $host_os in
++ rhapsody* | darwin1.[0123])
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
++ darwin1.*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ darwin*)
++ # if running on 10.5 or later, the deployment target defaults
++ # to the OS version, if on x86, and 10.4, the deployment
++ # target defaults to 10.4. Don't you love it?
++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
++ 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ 10.[012]*)
++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
++ 10.*)
++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
++ esac
++ ;;
++ esac
++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then
++ _lt_dar_single_mod='$single_module'
++ fi
++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
++ else
++ _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"
++ fi
++ if test "$DSYMUTIL" != ":"; then
++ _lt_dsymutil="~$DSYMUTIL \$lib || :"
++ else
++ _lt_dsymutil=
++ fi
++ ;;
++ esac
+
+- fi
+- ;;
+-esac
+
+ enable_dlopen=no
+ enable_win32_dll=no
+@@ -9668,7 +10119,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+
+@@ -9696,11 +10147,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:9699: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10150: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9703: \$? = $ac_status" >&5
++ echo "$as_me:10154: \$? = $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.
+@@ -9970,10 +10421,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works=no
++ lt_cv_prog_compiler_pic_works=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
+@@ -9986,27 +10437,27 @@
+ -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:9989: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10440: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9993: \$? = $ac_status" >&5
++ echo "$as_me:10444: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works=yes
++ lt_cv_prog_compiler_pic_works=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+ case $lt_prog_compiler_pic in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
+@@ -10033,10 +10484,10 @@
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works=no
++ lt_cv_prog_compiler_static_works=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -10049,20 +10500,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ else
+- lt_prog_compiler_static_works=yes
++ lt_cv_prog_compiler_static_works=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
+
+-if test x"$lt_prog_compiler_static_works" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+ :
+ else
+ lt_prog_compiler_static=
+@@ -10090,11 +10541,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:10093: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:10544: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:10097: \$? = $ac_status" >&5
++ echo "$as_me:10548: \$? = $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
+@@ -10174,12 +10625,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -10238,7 +10690,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs=no
+@@ -10354,12 +10806,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs=no
+ else
+ ld_shlibs=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -10457,7 +10910,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -10477,7 +10930,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -10749,11 +11202,10 @@
+ link_all_deplibs=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -10903,7 +11355,7 @@
+ link_all_deplibs=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -11273,7 +11725,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -11598,13 +12050,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -11616,6 +12066,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -11797,6 +12259,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -12116,7 +12593,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
+ if test $ac_cv_lib_dld_shl_load = yes; then
+- lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+ { echo "$as_me:$LINENO: checking for dlopen" >&5
+ echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
+@@ -12392,7 +12869,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
+ echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
+ if test $ac_cv_lib_dld_dld_link = yes; then
+- lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
++ lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+
+
+@@ -12441,7 +12918,7 @@
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext < conftest.$ac_ext <conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -13512,7 +13995,7 @@
+ # FIXME: insert proper C++ library support
+ ld_shlibs_CXX=no
+ ;;
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -13525,7 +14008,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ case $ld_flag in
+ *-brtl*)
+@@ -13783,51 +14266,23 @@
+ fi
+ ;;
+ darwin* | rhapsody*)
+- case $host_os in
+- rhapsody* | darwin1.[012])
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
+- ;;
+- 10.*)
+- allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+ archive_cmds_need_lc_CXX=no
+ hardcode_direct_CXX=no
+ hardcode_automatic_CXX=yes
+ hardcode_shlibpath_var_CXX=unsupported
+ whole_archive_flag_spec_CXX=''
+ link_all_deplibs_CXX=yes
+-
+- if test "$GXX" = yes ; then
+- lt_int_apple_cc_single_mod=no
++ allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
++ if test "$GXX" = yes ; then
+ output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
++ archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_CXX="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
++ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
++ archive_cmds_CXX="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
++ archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+ fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- else
+- archive_cmds_CXX='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- fi
+- module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ else
+ case $cc_basename in
+ xlc*)
+@@ -14078,7 +14533,7 @@
+ export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
+ whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- pgCC*)
++ pgCC* | pgcpp*)
+ # Portland Group C++ compiler
+ archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+@@ -14151,7 +14606,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -14485,7 +14940,6 @@
+ GCC_CXX="$GXX"
+ LD_CXX="$LD"
+
+-
+ cat > conftest.$ac_ext <&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_CXX=no
++ lt_cv_prog_compiler_pic_works_CXX=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
+@@ -14961,27 +15419,27 @@
+ -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:14964: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15422: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14968: \$? = $ac_status" >&5
++ echo "$as_me:15426: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_CXX=yes
++ lt_cv_prog_compiler_pic_works_CXX=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_CXX" = xyes; then
+ case $lt_prog_compiler_pic_CXX in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
+@@ -15008,10 +15466,10 @@
+ wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_CXX=no
++ lt_cv_prog_compiler_static_works_CXX=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -15024,20 +15482,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ else
+- lt_prog_compiler_static_works_CXX=yes
++ lt_cv_prog_compiler_static_works_CXX=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_CXX" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_CXX" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_CXX" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_CXX" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_CXX" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_CXX=
+@@ -15065,11 +15523,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:15068: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:15526: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:15072: \$? = $ac_status" >&5
++ echo "$as_me:15530: \$? = $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
+@@ -15122,7 +15580,7 @@
+
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+- aix4* | aix5*)
++ aix[4-9]*)
+ # If we're using GNU nm, then we don't want the "-C" option.
+ # -C means demangle to AIX nm, but means don't demangle with GNU nm
+ if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
+@@ -15137,10 +15595,14 @@
+ cygwin* | mingw*)
+ 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'
+ ;;
++ linux* | k*bsd*-gnu)
++ link_all_deplibs_CXX=no
++ ;;
+ *)
+ export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ ;;
+ esac
++ exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+
+ { echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
+ echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
+@@ -15242,7 +15704,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -15566,13 +16028,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -15584,6 +16044,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -15765,6 +16237,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -15848,6 +16335,7 @@
+ predeps_CXX \
+ postdeps_CXX \
+ compiler_lib_search_path_CXX \
++ compiler_lib_search_dirs_CXX \
+ archive_cmds_CXX \
+ archive_expsym_cmds_CXX \
+ postinstall_cmds_CXX \
+@@ -16096,6 +16584,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_CXX
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_CXX
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
+@@ -16310,7 +16802,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -16348,7 +16840,7 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4* | aix5*)
++aix[4-9]*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+@@ -16613,10 +17105,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_F77=no
++ lt_cv_prog_compiler_pic_works_F77=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_F77"
+@@ -16629,27 +17121,27 @@
+ -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:16632: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17124: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16636: \$? = $ac_status" >&5
++ echo "$as_me:17128: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_F77=yes
++ lt_cv_prog_compiler_pic_works_F77=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_F77" = xyes; then
+ case $lt_prog_compiler_pic_F77 in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
+@@ -16676,10 +17168,10 @@
+ wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_F77+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_F77+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_F77=no
++ lt_cv_prog_compiler_static_works_F77=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -16692,20 +17184,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ else
+- lt_prog_compiler_static_works_F77=yes
++ lt_cv_prog_compiler_static_works_F77=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_F77" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_F77" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_F77" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_F77" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_F77" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_F77" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_F77=
+@@ -16733,11 +17225,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:16736: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:17228: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16740: \$? = $ac_status" >&5
++ echo "$as_me:17232: \$? = $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
+@@ -16817,12 +17309,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_F77='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -16881,7 +17374,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_F77=no
+@@ -16997,12 +17490,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_F77=no
+ else
+ ld_shlibs_F77=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -17100,7 +17594,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -17120,7 +17614,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -17372,11 +17866,10 @@
+ link_all_deplibs_F77=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_F77="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_F77="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_F77="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_F77="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -17526,7 +18019,7 @@
+ link_all_deplibs_F77=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -17845,7 +18338,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -18169,13 +18662,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -18187,6 +18678,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -18368,6 +18871,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -18451,6 +18969,7 @@
+ predeps_F77 \
+ postdeps_F77 \
+ compiler_lib_search_path_F77 \
++ compiler_lib_search_dirs_F77 \
+ archive_cmds_F77 \
+ archive_expsym_cmds_F77 \
+ postinstall_cmds_F77 \
+@@ -18699,6 +19218,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_F77
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_F77
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_F77
+@@ -18873,7 +19396,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -18922,11 +19445,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:18925: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19448: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18929: \$? = $ac_status" >&5
++ echo "$as_me:19452: \$? = $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.
+@@ -18986,7 +19509,7 @@
+ # built for inclusion in a dll (and should export symbols for example).
+ # Although the cygwin gcc ignores -fPIC, still need this for old-style
+ # (--disable-auto-import) libraries
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ darwin* | rhapsody*)
+@@ -19056,7 +19579,7 @@
+ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+- lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
++
+ ;;
+
+ hpux9* | hpux10* | hpux11*)
+@@ -19196,10 +19719,10 @@
+
+ { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
+ echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_pic_works_GCJ=no
++ lt_cv_prog_compiler_pic_works_GCJ=no
+ ac_outfile=conftest.$ac_objext
+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
+@@ -19212,27 +19735,27 @@
+ -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:19215: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19738: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:19219: \$? = $ac_status" >&5
++ echo "$as_me:19742: \$? = $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.
+ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_pic_works_GCJ=yes
++ lt_cv_prog_compiler_pic_works_GCJ=yes
+ fi
+ fi
+ $rm conftest*
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_pic_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_pic_works_GCJ" = xyes; then
+ case $lt_prog_compiler_pic_GCJ in
+ "" | " "*) ;;
+ *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
+@@ -19259,10 +19782,10 @@
+ wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
+ { echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
+-if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works_GCJ+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+- lt_prog_compiler_static_works_GCJ=no
++ lt_cv_prog_compiler_static_works_GCJ=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
+ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+@@ -19275,20 +19798,20 @@
+ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+ if diff conftest.exp conftest.er2 >/dev/null; then
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ else
+- lt_prog_compiler_static_works_GCJ=yes
++ lt_cv_prog_compiler_static_works_GCJ=yes
+ fi
+ fi
+- $rm conftest*
++ $rm -r conftest*
+ LDFLAGS="$save_LDFLAGS"
+
+ fi
+-{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works_GCJ" >&5
+-echo "${ECHO_T}$lt_prog_compiler_static_works_GCJ" >&6; }
++{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works_GCJ" >&5
++echo "${ECHO_T}$lt_cv_prog_compiler_static_works_GCJ" >&6; }
+
+-if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
++if test x"$lt_cv_prog_compiler_static_works_GCJ" = xyes; then
+ :
+ else
+ lt_prog_compiler_static_GCJ=
+@@ -19316,11 +19839,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:19319: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:19842: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:19323: \$? = $ac_status" >&5
++ echo "$as_me:19846: \$? = $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
+@@ -19400,12 +19923,13 @@
+ # it will be wrapped by ` (' and `)$', so one must not match beginning or
+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+ # as well as any symbol that contains `d'.
+- exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
++ exclude_expsyms_GCJ='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+ # platforms (ab)use it in PIC code, but their linkers get confused if
+ # the symbol is explicitly referenced. Since portable code cannot
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
++ # Exclude shared library initialization/finalization symbols.
+ extract_expsyms_cmds=
+ # Just being paranoid about ensuring that cc_basename is set.
+ for cc_temp in $compiler""; do
+@@ -19464,7 +19988,7 @@
+
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+- aix3* | aix4* | aix5*)
++ aix[3-9]*)
+ # On AIX/PPC, the GNU linker is very broken
+ if test "$host_cpu" != ia64; then
+ ld_shlibs_GCJ=no
+@@ -19580,12 +20104,13 @@
+ $echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ fi
++ link_all_deplibs_GCJ=no
+ else
+ ld_shlibs_GCJ=no
+ fi
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+@@ -19683,7 +20208,7 @@
+ fi
+ ;;
+
+- aix4* | aix5*)
++ aix[4-9]*)
+ if test "$host_cpu" = ia64; then
+ # On IA64, the linker does run time linking by default, so we don't
+ # have to do anything special.
+@@ -19703,7 +20228,7 @@
+ # Test if we are trying to use run time linking or normal
+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+ # need to do runtime linking.
+- case $host_os in aix4.[23]|aix4.[23].*|aix5*)
++ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
+ for ld_flag in $LDFLAGS; do
+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ aix_use_runtimelinking=yes
+@@ -19975,11 +20500,10 @@
+ link_all_deplibs_GCJ=yes
+ if test "$GCC" = yes ; then
+ output_verbose_link_cmd='echo'
+- archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+- module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
+- archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ archive_cmds_GCJ="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
++ module_cmds_GCJ="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
++ archive_expsym_cmds_GCJ="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
++ module_expsym_cmds_GCJ="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ else
+ case $cc_basename in
+ xlc*)
+@@ -20129,7 +20653,7 @@
+ link_all_deplibs_GCJ=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -20448,7 +20972,7 @@
+ soname_spec='${libname}${release}${shared_ext}$major'
+ ;;
+
+-aix4* | aix5*)
++aix[4-9]*)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+@@ -20772,13 +21296,11 @@
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+
+ # Append ld.so.conf contents to the search path
+ if test -f /etc/ld.so.conf; then
+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+- sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+ fi
+
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+@@ -20790,6 +21312,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -20971,6 +21505,21 @@
+ echo "${ECHO_T}$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+
++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_search_path_spec="$sys_lib_search_path_spec"
++fi
++
++sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ lt_cv_sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec"
++fi
++
++sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
++
+ variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+ if test "$GCC" = yes; then
+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+@@ -21054,6 +21603,7 @@
+ predeps_GCJ \
+ postdeps_GCJ \
+ compiler_lib_search_path_GCJ \
++ compiler_lib_search_dirs_GCJ \
+ archive_cmds_GCJ \
+ archive_expsym_cmds_GCJ \
+ postinstall_cmds_GCJ \
+@@ -21302,6 +21852,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_GCJ
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_GCJ
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
+@@ -21475,7 +22029,7 @@
+ echo "$lt_simple_link_test_code" >conftest.$ac_ext
+ eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+ _lt_linker_boilerplate=`cat conftest.err`
+-$rm conftest*
++$rm -r conftest*
+
+
+ # Allow CC to be a program name with arguments.
+@@ -21535,6 +22089,7 @@
+ predeps_RC \
+ postdeps_RC \
+ compiler_lib_search_path_RC \
++ compiler_lib_search_dirs_RC \
+ archive_cmds_RC \
+ archive_expsym_cmds_RC \
+ postinstall_cmds_RC \
+@@ -21783,6 +22338,10 @@
+ # shared library.
+ postdeps=$lt_postdeps_RC
+
++# The directories searched by this compiler when creating a shared
++# library
++compiler_lib_search_dirs=$lt_compiler_lib_search_dirs_RC
++
+ # The library search path used internally by the compiler when linking
+ # a shared library.
+ compiler_lib_search_path=$lt_compiler_lib_search_path_RC
+@@ -22286,7 +22845,7 @@
+ fi
+
+
+-XINE_REQS=1.1.7
++XINE_REQS=1.1.4
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
+@@ -22780,12 +23339,12 @@
+ pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS launchpad-integration libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++ pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22798,12 +23357,12 @@
+ pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS launchpad-integration libgnomeui-2.0 >= \$GNOMEUI_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS libgnome-2.0 >= \$LIBGNOME_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++ pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22822,14 +23381,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+ else
+- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXTRA_GNOME_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+
+ $EXTRA_GNOME_PKG_ERRORS
+
+@@ -22840,7 +23399,7 @@
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS launchpad-integration libgnomeui-2.0 >= $GNOMEUI_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS libgnome-2.0 >= $LIBGNOME_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+
+ $EXTRA_GNOME_PKG_ERRORS
+
+@@ -22894,12 +23453,12 @@
+ pkg_cv_EXTRA_GNOME_CFLAGS="$EXTRA_GNOME_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++ pkg_cv_EXTRA_GNOME_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22912,12 +23471,12 @@
+ pkg_cv_EXTRA_GNOME_LIBS="$EXTRA_GNOME_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
+- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB_REQS gtk+-2.0 >= \$GTK_REQS gnome-vfs-2.0 >= \$GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS gnome-icon-theme >= \$GNOMEICON_REQS gmodule-2.0 totem-plparser >= \$TOTEM_PLPARSER_REQS \$ISO_CODES \$MM\"") >&5
++ ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
++ pkg_cv_EXTRA_GNOME_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -22936,14 +23495,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+ else
+- EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
++ EXTRA_GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$EXTRA_GNOME_PKG_ERRORS" >&5
+
+- { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++ { { echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+
+ $EXTRA_GNOME_PKG_ERRORS
+
+@@ -22954,7 +23513,7 @@
+ and EXTRA_GNOME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
++echo "$as_me: error: Package requirements (glib-2.0 >= $GLIB_REQS gtk+-2.0 >= $GTK_REQS gnome-vfs-2.0 >= $GNOMEVFS_REQS launchpad-integration gnome-vfs-module-2.0 >= $GNOMEVFS_REQS gnome-icon-theme >= $GNOMEICON_REQS gmodule-2.0 totem-plparser >= $TOTEM_PLPARSER_REQS $ISO_CODES $MM) were not met:
+
+ $EXTRA_GNOME_PKG_ERRORS
+
+@@ -24606,15 +25165,21 @@
+
+ if test -z "$with_gecko"; then
+ for g in $GECKOS; do
++ if $PKG_CONFIG --exists $g-plugin; then
++ gecko=$g
++ break;
++ fi
+ if $PKG_CONFIG --exists $g-xpcom; then
+ gecko=$g
+ break;
+ fi
+ done
+ elif ! $PKG_CONFIG --exists $gecko-xpcom; then
+- { { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
++ if ! $PKG_CONFIG --exists $gecko-plugin; then
++ { { echo "$as_me:$LINENO: error: Gecko \"$gecko\" not found" >&5
+ echo "$as_me: error: Gecko \"$gecko\" not found" >&2;}
+ { (exit 1); exit 1; }; }
++ fi
+ fi
+
+ if test -z "$gecko" -a "$enable_browser_plugins" = "autodetect"; then
+@@ -24657,6 +25222,80 @@
+ # Check for mozilla modules, but keep the CFLAGS and LIBS in
+ # separate vars
+ if test "$enable_browser_plugins" = "yes" ; then
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_VERSION_MIN=1.9
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5
++echo $ECHO_N "checking for MOZILLA_NOT_LINKED... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MOZILLA_NOT_LINKED_CFLAGS"; then
++ pkg_cv_MOZILLA_NOT_LINKED_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++ if test -n "$MOZILLA_NOT_LINKED_LIBS"; then
++ pkg_cv_MOZILLA_NOT_LINKED_LIBS="$MOZILLA_NOT_LINKED_LIBS"
++ else
++ if test -n "$PKG_CONFIG" && \
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libxul \$MOZILLA-plugin >= \$MOZILLA_VERSION_MIN\"") >&5
++ ($PKG_CONFIG --exists --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN") 2>&5
++ ac_status=$?
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); }; then
++ pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN" 2>/dev/null`
++else
++ pkg_failed=yes
++fi
++ fi
++else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"`
++ else
++ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxul $MOZILLA-plugin >= $MOZILLA_VERSION_MIN"`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
++
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ enable_browser_plugins=no
++elif test $pkg_failed = untried; then
++ enable_browser_plugins=no
++else
++ MOZILLA_NOT_LINKED_CFLAGS=$pkg_cv_MOZILLA_NOT_LINKED_CFLAGS
++ MOZILLA_NOT_LINKED_LIBS=$pkg_cv_MOZILLA_NOT_LINKED_LIBS
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ :
++fi
++ else
+
+ pkg_failed=no
+ { echo "$as_me:$LINENO: checking for MOZILLA_NOT_LINKED" >&5
+@@ -24668,14 +25307,14 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+- \$MOZILLA-plugin\"") >&5
++ \$MOZILLA-plugin\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin") 2>&5
++ $MOZILLA-plugin") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_MOZILLA_NOT_LINKED_CFLAGS=`$PKG_CONFIG --cflags "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin" 2>/dev/null`
++ $MOZILLA-plugin" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24689,14 +25328,14 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$MOZILLA-xpcom >= \$MOZILLA_VERSION_MIN \\
+- \$MOZILLA-plugin\"") >&5
++ \$MOZILLA-plugin\"") >&5
+ ($PKG_CONFIG --exists --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin") 2>&5
++ $MOZILLA-plugin") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_MOZILLA_NOT_LINKED_LIBS=`$PKG_CONFIG --libs "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin" 2>/dev/null`
++ $MOZILLA-plugin" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24716,10 +25355,10 @@
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin"`
++ $MOZILLA-plugin"`
+ else
+ MOZILLA_NOT_LINKED_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$MOZILLA-xpcom >= $MOZILLA_VERSION_MIN \
+- $MOZILLA-plugin"`
++ $MOZILLA-plugin"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$MOZILLA_NOT_LINKED_PKG_ERRORS" >&5
+@@ -24736,6 +25375,7 @@
+ echo "${ECHO_T}yes" >&6; }
+ :
+ fi
++ fi
+ fi
+ # Check for other required modules, and merge CFLAGS, but not link
+ # flags to avoid linking against -lxpcom -lplds4 -lplc4 -lnspr4
+@@ -24751,23 +25391,23 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0
+- gnome-vfs-2.0 >= \$GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
++ gnome-vfs-2.0 >= \$GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_BROWSER_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24781,23 +25421,23 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0
+- gnome-vfs-2.0 >= \$GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
++ gnome-vfs-2.0 >= \$GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= \$GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= \$TOTEM_PLPARSER_REQS\"") >&5
+ ($PKG_CONFIG --exists --print-errors "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_BROWSER_PLUGIN_LIBS=`$PKG_CONFIG --libs "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -24817,16 +25457,16 @@
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
+ else
+ BROWSER_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0
+- gnome-vfs-2.0 >= $GNOMEVFS_REQS
+- gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
+- gthread-2.0
+- totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
++ gnome-vfs-2.0 >= $GNOMEVFS_REQS
++ gnome-vfs-module-2.0 >= $GNOMEVFS_REQS
++ gthread-2.0
++ totem-plparser-mini >= $TOTEM_PLPARSER_REQS"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BROWSER_PLUGIN_PKG_ERRORS" >&5
+@@ -24846,6 +25486,10 @@
+
+ BROWSER_PLUGIN_CFLAGS="$MOZILLA_NOT_LINKED_CFLAGS $BROWSER_PLUGIN_CFLAGS"
+
++ # for xul 1.9 we have to link anyway
++ if test "$MOZILLA_VERSION_MIN" = 1.9; then
++ BROWSER_PLUGIN_LIBS="$MOZILLA_NOT_LINKED_LIBS $BROWSER_PLUGIN_LIBS"
++ fi
+
+
+ # Earlier versions misdetect playlists
+@@ -25070,10 +25714,18 @@
+
+ # Sets some variables, and check for xpidl
+ if test "$enable_browser_plugins" = "yes" ; then
+- MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-xpcom --variable=prefix`"
+- MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-xpcom --variable=libdir`"
+- MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
+- MOZILLA_XPCOM_CFLAGS="-I`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ if $PKG_CONFIG --exists $MOZILLA-plugin; then
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=sdkdir`/bin"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-plugin`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-plugin` `$PKG_CONFIG --cflags libxul-unstable`"
++ else
++ MOZILLA_PREFIX="`$PKG_CONFIG $MOZILLA-plugin --variable=prefix`"
++ MOZILLA_LIBDIR="`$PKG_CONFIG $MOZILLA-plugin --variable=libdir`"
++ MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA-xpcom`"
++ MOZILLA_XPCOM_CFLAGS="`$PKG_CONFIG --cflags $MOZILLA-xpcom`"
++ fi
++
+ MOZILLA_PLUGINDIR="${MOZILLA_PLUGINDIR:-"\${libdir}/mozilla/plugins"}"
+
+ # Extract the first word of "xpidl", so it can be a program name with args.
+@@ -25181,7 +25833,11 @@
+
+ # Search for the idl include directory
+ if test "$enable_browser_plugins" = "yes" ; then
++ if $PKG_CONFIG --exists libxul; then
++ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir libxul`/unstable"
++ else
+ MOZILLA_IDLDIR="`$PKG_CONFIG --variable=idldir $MOZILLA-xpcom`"
++ fi
+ if test "x$MOZILLA_IDLDIR" = "x"; then
+ MOZILLA_IDLDIR="`echo $MOZILLA_LIBDIR | sed -e s!lib!share/idl!`"
+ fi
+@@ -25227,8 +25883,14 @@
+
+ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT"
+ CXXFLAGS="$CXXFLAGS $MOZILLA_NOT_LINKED_CFLAGS"
+- LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
+- LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ CPPFLAGS="$CPPFLAGS -I$MOZILLA_INCLUDE_ROOT/unstable"
++ LIBS="$LIBS $MOZILLA_NOT_LINKED_LIBS"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ else
++ LIBS="$LIBS -L$MOZILLA_LIBDIR -lxpcom -lxpcomglue_s"
++ LDFLAGS="$LDFLAGS -Wl,--rpath -Wl,$MOZILLA_LIBDIR"
++ fi
+
+ { echo "$as_me:$LINENO: checking for libxpcomglue_s" >&5
+ echo $ECHO_N "checking for libxpcomglue_s... $ECHO_C" >&6; }
+@@ -25296,7 +25958,11 @@
+
+
+ if test "$have_libxpcomglue_s" = "yes"; then
+- LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ if test $MOZILLA_VERSION_MIN = 1.9; then
++ LIBXPCOMGLUE_S="$MOZILLA_NOT_LINKED_LIBS"
++ else
++ LIBXPCOMGLUE_S="-L$MOZILLA_LIBDIR -lxpcomglue_s"
++ fi
+ else
+ { echo "$as_me:$LINENO: WARNING: libxpcomglue_s not available; plugins may not be portable" >&5
+ echo "$as_me: WARNING: libxpcomglue_s not available; plugins may not be portable" >&2;}
+@@ -25386,7 +26052,7 @@
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+ __SAVE_CPPFLAGS=$CPPFLAGS
+- CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT -I$MOZILLA_INCLUDE_ROOT/xpcom"
++ CPPFLAGS="$CPPFLAGS $MOZILLA_NOT_LINKED_CFLAGS -I$MOZILLA_INCLUDE_ROOT/xpcom -I$MOZILLA_INCLUDE_ROOT/unstable -I$MOZILLA_INCLUDE_ROOT/stable"
+
+
+
+@@ -27840,6 +28506,8 @@
+ ECHO!$ECHO$ac_delim
+ AR!$AR$ac_delim
+ RANLIB!$RANLIB$ac_delim
++DSYMUTIL!$DSYMUTIL$ac_delim
++NMEDIT!$NMEDIT$ac_delim
+ CXXCPP!$CXXCPP$ac_delim
+ F77!$F77$ac_delim
+ FFLAGS!$FFLAGS$ac_delim
+@@ -27885,8 +28553,6 @@
+ PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
+ PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim
+ PYGTK_H2DEF!$PYGTK_H2DEF$ac_delim
+-NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim
+-ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
+ _ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -27928,6 +28594,8 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+ cat >conf$$subs.sed <<_ACEOF
++NO_STRICT_ALIASING_CFLAGS!$NO_STRICT_ALIASING_CFLAGS$ac_delim
++ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
+ ENABLE_PYTHON_FALSE!$ENABLE_PYTHON_FALSE$ac_delim
+ VALA_CFLAGS!$VALA_CFLAGS$ac_delim
+ VALA_LIBS!$VALA_LIBS$ac_delim
+@@ -28020,7 +28688,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--- totem-2.22.1.orig/debian/patches/25_revert-xine-reqs-bump.patch
+++ totem-2.22.1/debian/patches/25_revert-xine-reqs-bump.patch
@@ -0,0 +1,11 @@
+--- a/configure.in 2008-02-27 12:24:21.000000000 +0100
++++ b/configure.in 2008-02-27 12:24:51.000000000 +0100
+@@ -67,7 +67,7 @@
+
+ dnl the two versions here implicate the gstreamer core and gst-plugins
+ dnl release versions.
+-XINE_REQS=1.1.7
++XINE_REQS=1.1.4
+ GST_MAJORMINOR=0.10
+ GST_REQS=0.10.12
+ GSTPLUG_REQS=0.10.12
--- totem-2.22.1.orig/debian/patches/04_desktop_gettext_domain.patch
+++ totem-2.22.1/debian/patches/04_desktop_gettext_domain.patch
@@ -0,0 +1,10 @@
+# Description: add translation domain
+# UbuntuSpecific: language pack change
+#
+--- a/data/totem.desktop.in.in.in 2008-02-27 12:20:20.000000000 +0100
++++ b/data/totem.desktop.in.in.in 2008-02-27 12:24:13.000000000 +0100
+@@ -14,3 +14,4 @@
+ X-GNOME-Bugzilla-OtherBinaries=totem-video-indexer;totem-video-thumbnailer;totem-audio-preview;
+ X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/totem/totem-bugreport.py
+ StartupNotify=true
++X-Ubuntu-Gettext-Domain=totem
--- totem-2.22.1.orig/debian/bug/control
+++ totem-2.22.1/debian/bug/control
@@ -0,0 +1 @@
+report-with: totem-gstreamer totem-xine
--- totem-2.22.1.orig/debian/totem-common.install
+++ totem-2.22.1/debian/totem-common.install
@@ -0,0 +1 @@
+debian/totem.xpm usr/share/pixmaps
--- totem-2.22.1.orig/debian/copyright
+++ totem-2.22.1/debian/copyright
@@ -0,0 +1,59 @@
+This package was debianized by Sebastien Bacher on
+Sat, 24 Aug 2002 15:12:51 +0200.
+
+It was downloaded from http://www.hadess.net/totem.php3
+
+Upstream Author: Bastien Nocera
+
+License:
+
+ Totem is distributed under the GPL by default, with a special excemption
+ clause added:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+ The excemption clause is:
+ The Totem project hereby grants permission for non-GPL compatible GStreamer
+ plugins to be used and distributed together with GStreamer and Totem. This
+ permission is above and beyond the permissions granted by the GPL licensei
+ by which Totem is covered. If you modify this code, you may. extend this
+ exception to your version of the code, but you are not obligated. to do
+ so. If you do not wish to do so, delete this exception statement from.
+ your version.
+
+ The Totem Playlist parser library, "pl-parser", is licensed under the terms of
+ the LGPL. This includes the files starting with totem-pl-parser* in the src
+ directory. See for
+ details.
+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL'.
--- totem-2.22.1.orig/debian/totem-xine.menu
+++ totem-2.22.1/debian/totem-xine.menu
@@ -0,0 +1,6 @@
+?package(totem-xine):\
+needs="X11"\
+section="Applications/Video"\
+title="totem (Xine)"\
+icon="/usr/share/pixmaps/totem.xpm"\
+command="/usr/bin/totem-xine"
--- totem-2.22.1.orig/debian/totem-gstreamer.README.Debian
+++ totem-2.22.1/debian/totem-gstreamer.README.Debian
@@ -0,0 +1,9 @@
+---[ Configuring the output sink
+
+You can choose your preferred output sink by using gnome-sound-properties (in
+the gnome-control-center package), or by editing the GConf key:
+ /system/gstreamer/0.10/default/musicaudiosink
+
+The default is to detect your output sink automagically.
+
+
--- totem-2.22.1.orig/debian/totem-xine.prerm
+++ totem-2.22.1/debian/totem-xine.prerm
@@ -0,0 +1,14 @@
+#! /bin/sh
+set -e
+
+FLAVOUR=xine
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
+ update-alternatives --quiet --remove gnome-video-thumbnailer \
+ /usr/bin/totem-${FLAVOUR}-video-thumbnailer
+ update-alternatives --quiet --remove totem /usr/bin/totem-${FLAVOUR}
+fi
+
+#DEBHELPER#
+
+exit 0
--- totem-2.22.1.orig/debian/watch
+++ totem-2.22.1/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://download.gnome.org/sources/totem/([\d\.]+)[02468]/totem-([\d\.]+)\.tar\.gz
--- totem-2.22.1.orig/debian/control
+++ totem-2.22.1/debian/control
@@ -0,0 +1,244 @@
+Source: totem
+Section: gnome
+Priority: optional
+Maintainer: Ubuntu Desktop Team
+XSBC-Original-Maintainer: Sebastien Bacher
+Uploaders: Debian GNOME Maintainers , Loic Minier
+Build-Depends: debhelper (>= 5),
+ quilt,
+ fdupes,
+ libgtk2.0-dev (>= 2.12.6),
+ libglib2.0-dev (>= 2.13.4),
+ libgnomeui-dev (>= 2.6.1.1-4),
+ libglade2-dev (>= 2.4.0),
+ libgnomevfs2-dev (>= 2.16.0),
+ libxine-dev (>= 1.1.4),
+ liblircclient-dev (>= 0.6.6),
+ libirman-dev (>= 0.4.2),
+ gnome-pkg-tools (>= 0.10),
+ scrollkeeper (>= 0.3.14-5),
+ libxml-parser-perl,
+ libgstreamer0.10-dev (>= 0.10.12),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.12),
+ gstreamer0.10-tools (>= 0.10.12),
+ gstreamer0.10-plugins-base (>= 0.10.12),
+ gstreamer0.10-plugins-good,
+ librsvg2-dev (>= 2.16.0-2),
+ librsvg2-common (>= 2.16.0-2),
+ libnautilus-extension-dev,
+ iso-codes,
+ libmusicbrainz4-dev (>= 2.1.1-4.1),
+ gnome-icon-theme (>= 2.15.90),
+ libdbus-glib-1-dev (>= 0.61),
+ xulrunner-1.9-dev,
+ intltool,
+ autotools-dev,
+ dpkg-dev (>= 1.13.19),
+ libgconf2-dev,
+ shared-mime-info (>= 0.22),
+ libcam-dev [kfreebsd-i386 kfreebsd-amd64],
+ libxtst-dev,
+ libgnome2-dev (>= 2.14.0),
+ libxrandr-dev (>= 1.1.1),
+ libxxf86vm-dev (>= 1.0.1),
+ libx11-dev,
+ gnome-doc-utils,
+ python-dev (>= 2.3),
+ python-gobject-dev,
+ python-gtk2-dev (>= 2.12),
+ libbluetooth-dev,
+ liblaunchpad-integration-dev (>= 0.1.17),
+ libgnome-keyring-dev,
+ libtrackerclient-dev,
+ libtotem-plparser-dev (>= 2.21.90),
+ libstartup-notification0-dev,
+ libgmyth-dev
+Standards-Version: 3.7.3
+
+Package: totem
+Architecture: all
+Depends: ${misc:Depends},
+ totem-plugins (>= ${source:Version}),
+ totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version})
+Recommends: totem-plugins-extra
+Description: A simple media player for the Gnome desktop (dummy package)
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This dummy package installs Totem with the GStreamer backend by
+ default.
+
+Package: totem-xine
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gnome-icon-theme (>= 2.15.90),
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
+Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
+ libxine1-ffmpeg
+Conflicts: totem (<< 0.99.12-2),
+ totem-mozilla (<< 2.20.0-3)
+Description: A simple media player for the Gnome desktop based on xine
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+ * Shoutcast, m3u, asx, SMIL and ra playlists support
+ * DVD (with menus), VCD and Digital CD (with CDDB) playback
+ * TV-Out configuration with optional resolution switching
+ * 4.0, 5.0, 5.1 and stereo audio output
+ * Full-screen mode (move your mouse and you get nice controls) with
+ Xinerama, dual-head and RandR support
+ * Aspect ratio toggling, scaling based on the video's original size
+ * Full keyboard control
+ * Simple playlist with repeat mode and saving feature
+ * Gnome and Nautilus integration
+ * Screenshot of the current movie
+ * Brightness and Contrast control
+ * Visualisation plugin when playing audio-only files
+ * Video thumbnailer for nautilus
+ * Nautilus properties page
+ * Works on remote displays
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
+ .
+ Author: Bastien Nocera
+ Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-gstreamer
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+ gstreamer0.10-gnomevfs,
+ gstreamer0.10-plugins-base,
+ gstreamer0.10-alsa | gstreamer0.10-audiosink,
+ gstreamer0.10-plugins-good,
+ gstreamer0.10-x,
+ gnome-icon-theme (>= 2.15.90),
+ iso-codes,
+ totem-common (>= ${gnome:Version}),
+ totem-common (<< ${gnome:NextVersion})
+Conflicts: totem (<< 0.99.12-2),
+ gnome-control-center (<< 2.15.90),
+ totem-mozilla (<< 2.20.0-3)
+Recommends: totem-mozilla (= ${source:Version}),
+ totem-plugins,
+ gnome-control-center (>= 2.15.90)
+Suggests: gstreamer0.10-plugins-ugly,
+ gstreamer0.10-ffmpeg,
+ gnome-app-install
+Description: A simple media player for the Gnome desktop based on gstreamer
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats. It features :
+ .
+ * Shoutcast, m3u, asx, SMIL and ra playlists support
+ * DVD (with menus), VCD and Digital CD (with CDDB) playback
+ * TV-Out configuration with optional resolution switching
+ * 4.0, 5.0, 5.1 and stereo audio output
+ * Full-screen mode (move your mouse and you get nice controls) with
+ Xinerama, dual-head and RandR support
+ * Aspect ratio toggling, scaling based on the video's original size
+ * Full keyboard control
+ * Simple playlist with repeat mode and saving feature
+ * Gnome, Nautilus and Gnome-vfs integration
+ * Screenshot of the current movie
+ * Brightness and Contrast control
+ * Visualisation plugin when playing audio-only files
+ * Video thumbnailer for nautilus
+ * Nautilus properties page
+ * Works on remote displays
+ * DVD, VCD and OGG/OGM subtitles with automatic language selection
+ * Extensible with plugins
+ .
+ Author: Bastien Nocera
+ Homepage: http://www.hadess.net/totem.php3
+
+Package: totem-mozilla
+Architecture: all
+Section: web
+Depends: ${misc:Depends},
+ totem-gstreamer (>= ${source:Version}) | totem-xine (>= ${source:Version}),
+ dbus (>= 0.61)
+Recommends: epiphany-browser | www-browser
+Replaces: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Provides: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+Conflicts: totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+XB-Npp-Applications: ec8030f7-c20a-464f-9b0e-13a3a9e97384, 92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a
+XB-Npp-Name: Totem Mozilla plugin
+XB-Npp-MimeType: video/quicktime, video/mp4, image/x-macpaint, image/x-quicktime, application/x-mplayer2, video/x-ms-asf-plugin, video/x-msvideo, video/x-ms-asf, video/x-ms-wmv, video/x-wmv, video/x-ms-wvx, video/x-ms-wm, application/ogg, video/mpeg, audio/wav, audio/x-wav, audio/mpeg
+Description: Totem Mozilla plugin
+ This package contains the Totem Mozilla plugin, which will
+ enhance your Gecko-based browser to be able to display movie
+ clips.
+ .
+ This plugin should work for Firefox as well as XULRunner based browsers.
+
+Package: totem-common
+Architecture: all
+Depends: ${misc:Depends}
+Conflicts: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Data files for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains common data files and translations.
+
+Package: totem-dbg
+Architecture: any
+Section: libs
+Priority: extra
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+ ${misc:Depends}
+Conflicts: libtotem-plparser1-dbg, libtotem-plparser10-dbg
+Description: Debugging symbols for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains detached debugging symbols.
+
+Package: totem-plugins
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends},
+ python-gdata
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3)
+Description: Plugins for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains a set of recommended plugins for Totem, which
+ allow to:
+ .
+ * Control Totem with an Infrared remote control
+ * Control Totem with the keyboard's media player keys
+ * Keep the Totem window on top of the screen
+ * Display movie properties
+ * Deactivate the screensaver when a movie is playing
+ * Skip to a defined time in the movie
+ * Set the away status in the instant messenger when a movie is
+ playing
+ * Control totem with a mobile phone using the Bluetooth protocol
+ .
+ Additional plugins can be written in C, Python or Vala.
+
+Package: totem-plugins-extra
+Architecture: any
+Depends: totem-gstreamer (= ${binary:Version}) | totem-xine (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: gromit
+Replaces: totem-xine (<< 2.20.0-3), totem-gstreamer (<< 2.20.0-3), totem-plugins (<< 2.22.0-0ubuntu3)
+Description: Extra plugins for the Totem media player
+ Totem is a simple yet featureful media player for GNOME which can read
+ a large number of file formats.
+ .
+ This package contains an extra set plugins for Totem, which allow to:
+ .
+ * A live TV and recordings viewer
+ * Annotate the screen with the Gromit tool
+ .
+ Additional plugins can be written in C, Python or Vala.
--- totem-2.22.1.orig/debian/rules
+++ totem-2.22.1/debian/rules
@@ -0,0 +1,220 @@
+#!/usr/bin/make -f
+#-*- makefile -*-
+
+#export DH_VERBOSE=1
+
+include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
+DEB_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
+include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk
+-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+
+STAMP_DIR := debian/stamp
+BUILD_DIR := debian/build
+PATCH_DIR := debian/patches
+
+COMPKG := totem-common
+PLUGPKG := totem-plugins
+PLUGEXTRAPKG := totem-plugins-extra
+
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+FLAVORS := xine gstreamer
+PRIORITY_xine := 35
+PRIORITY_gstreamer := 40
+export PRIORITY_xine PRIORITY_gstreamer
+
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
+
+COMMON_CONFIGURE_FLAGS += \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --mandir=\$${prefix}/share/man \
+ --disable-maintainer-mode \
+ --with-gecko=mozilla \
+ --disable-run-in-source-tree \
+ --disable-scrollkeeper
+
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+ COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
+else
+ COMMON_CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+xine_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+ --libexecdir=\$${prefix}/lib/totem/xine \
+ --enable-xine
+
+gstreamer_CONFIGURE_FLAGS := $(COMMON_CONFIGURE_FLAGS) \
+ --libexecdir=\$${prefix}/lib/totem/gstreamer
+
+patch: $(STAMP_DIR)/patch-stamp
+$(STAMP_DIR)/patch-stamp:
+ dh_testdir
+ mkdir -p $(STAMP_DIR)
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null push -a || test $$? = 2
+ touch $@
+
+builddir = $(BUILD_DIR)/$*
+
+configure: $(addprefix $(STAMP_DIR)/configure-stamp-, $(FLAVORS))
+$(STAMP_DIR)/configure-stamp-%: $(STAMP_DIR)/patch-stamp
+ dh_testdir
+ mkdir -p $(builddir)
+ cd $(builddir) && \
+ CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_CONFIGURE_FLAGS)
+ touch $@
+
+build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
+$(STAMP_DIR)/build-stamp-%: $(STAMP_DIR)/configure-stamp-%
+ dh_testdir
+ $(MAKE) -C $(builddir)
+ touch $@
+ cd po; intltool-update -p
+
+installdir = $(CURDIR)/debian/totem-$*
+
+install-clean:
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+
+install-%: $(STAMP_DIR)/build-stamp-%
+ GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \
+ $(MAKE) -C $(builddir) install DESTDIR=$(installdir)
+ cd $(installdir)/usr/bin && for i in totem*; do \
+ mv $$i totem-$*$${i#totem} ; done
+ cd $(installdir)/$$(pkg-config libnautilus-extension --variable=extensiondir) && \
+ mv libtotem-properties-page.so libtotem-properties-page.so.$*
+ # hide the mozilla plugin in a specific directory
+ cd $(installdir)/usr/lib/mozilla/plugins && \
+ mv *.so *.xpt $(installdir)/usr/lib/totem/$*/
+ # drop anything else
+ rm -rf $(installdir)/usr/lib/xulrunner
+ # drop *.a and *.la files
+ find debian/totem-$*/usr/lib -mindepth 2 -name '*.a' -exec rm {} \;
+ find debian/totem-$*/usr/lib -name '*.la' -exec rm {} \;
+ echo gnome:Version=$(DEB_GNOME_VERSION) >> debian/totem-$*.substvars
+ echo gnome:NextVersion=$(DEB_GNOME_NEXTVERSION) >> debian/totem-$*.substvars
+
+install: install-clean $(addprefix install-, $(FLAVORS))
+ dh_installdirs
+ mkdir -p debian/$(COMPKG)/usr
+ mv debian/totem-gstreamer/etc debian/$(COMPKG)/
+ mv debian/totem-gstreamer/usr/share debian/$(COMPKG)/usr/
+ mkdir -p debian/$(PLUGPKG)/usr/lib/totem
+ mv debian/totem-gstreamer/usr/lib/totem/plugins debian/$(PLUGPKG)/usr/lib/totem/
+ find debian/$(PLUGPKG) -name '*.py[co]' -delete
+ mkdir -p debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+ mv debian/$(PLUGPKG)/usr/lib/totem/plugins/gromit debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+ mv debian/$(PLUGPKG)/usr/lib/totem/plugins/mythtv debian/$(PLUGEXTRAPKG)/usr/lib/totem/plugins
+ find debian/$(PLUGEXTRAPKG) -name '*.py[co]' -delete
+ cd debian/totem-xine && rm -rf etc usr/share usr/lib/pkgconfig \
+ usr/include usr/lib/*.so* usr/lib/*.a usr/lib/totem/plugins
+# Make both totems installable together
+ for f in $(FLAVORS); do \
+ F=`echo $$f | sed -r 's/^([a-z])/\U\1/'` ; \
+ mkdir -p debian/totem-$$f/usr/share/applications ; \
+ ( sed -r "s/^Name(.*)$$/Name\1 ($$F)/" \
+ debian/$(COMPKG)/usr/share/applications/totem.desktop \
+ | sed -r "s,^(Exec=.*totem),\1-$$f," \
+ | grep -v ^MimeType ; \
+ echo NoDisplay=true ) \
+ > debian/totem-$$f/usr/share/applications/totem-$$f.desktop ; \
+ sed -e"s/@FLAVOUR@/$$f/" \
+ -e"s/@PRIORITY@/$$(eval echo \$$PRIORITY_$$f)/" \
+ -e"s,@NAUTILUS_EXTDIR@,$$(pkg-config libnautilus-extension --variable=extensiondir)," \
+ < debian/totem-flavor.postinst.in \
+ > debian/totem-$${f}.postinst ; \
+ done
+ printf "\nTryExec=/usr/bin/totem" >> debian/$(COMPKG)/usr/share/applications/totem.desktop
+ dh_install
+
+clean::
+ dh_testdir
+ dh_testroot
+ QUILT_PATCHES=$(PATCH_DIR) quilt --quiltrc /dev/null pop -a -R || test $$? = 2
+ rm -f $(foreach f,$(FLAVORS),debian/totem-$(f).postinst)
+ rm -rf .pc
+ rm -rf $(INSTALL_DIR) $(BUILD_DIR) $(STAMP_DIR)
+ -rm -f po/totem.pot
+ -test -r /usr/share/misc/config.sub && test -r config.sub && \
+ cp -f /usr/share/misc/config.sub config.sub
+ -test -r /usr/share/misc/config.guess && test -r config.guess && \
+ cp -f /usr/share/misc/config.guess config.guess
+ dh_clean
+
+binary: binary-arch binary-indep
+
+# Build architecture-independent files here.
+binary-indep: build install
+ dh_testdir -i
+ dh_testroot -i
+ dh_installdocs -i -A NEWS README
+ dh_installchangelogs -i
+ dh_installman -i
+ dh_scrollkeeper -i
+ dh_gconf -i
+ dh_desktop -i
+ dh_compress -i
+ dh_link -i
+ dh_fixperms -i
+ : # symlink identical Gnome help files within packages
+ for p in $$(dh_listpackages -i); do \
+ if [ -d debian/$$p/usr/share/gnome/help ]; then \
+ (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \
+ | while read s; do \
+ set -- $$(echo $$s | tr ' ' '\n' | sort); \
+ f=$$1; shift; \
+ for d; do \
+ echo "symlinking duplicate Gnome help file $$d to $$f"; \
+ rm $$d; ln -s /$$f $$d; \
+ done; \
+ done; \
+ ); \
+ dh_link -p$$p; \
+ fi; \
+ done
+ dh_installdeb -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir -a
+ dh_testroot -a
+ dh_installdocs -a -A NEWS README
+ dh_installmenu -a
+ dh_installchangelogs -a
+ dh_installchangelogs -ptotem-common ChangeLog
+ dh_desktop -a
+ dh_icons -a
+ dh_compress -a
+ dh_link -a
+ : # symlink identical Gnome help files within packages
+ for p in $$(dh_listpackages -a); do \
+ if [ -d debian/$$p/usr/share/gnome/help ]; then \
+ (cd debian/$$p && LC_ALL=C fdupes -r1nq usr/share/gnome/help \
+ | while read s; do \
+ set -- $$(echo $$s | tr ' ' '\n' | sort); \
+ f=$$1; shift; \
+ for d; do \
+ echo "symlinking duplicate Gnome help file $$d to $$f"; \
+ rm $$d; ln -s /$$f $$d; \
+ done; \
+ done; \
+ ); \
+ dh_link -p$$p; \
+ fi; \
+ done
+ dh_fixperms -a
+ dh_strip -a --dbg-package=totem-dbg
+ dh_perl -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+.PHONY: patch configure build install clean install-clean binary-indep binary-arch binary
--- totem-2.22.1.orig/debian/totem.install
+++ totem-2.22.1/debian/totem.install
@@ -0,0 +1 @@
+debian/bug/control /usr/share/bug/totem/
--- totem-2.22.1.orig/debian/changelog
+++ totem-2.22.1/debian/changelog
@@ -0,0 +1,1426 @@
+totem (2.22.1-0ubuntu2) hardy; urgency=low
+
+ * debian/patches/90_from_svn_fix_youtube_requirement.patch:
+ - change from svn, fix the youtube gstreamer requirement (lp: #214416)
+
+ -- Sebastien Bacher Fri, 11 Apr 2008 12:08:52 +0200
+
+totem (2.22.1-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Add audio/x-speex as a supported mime-type
+ - Movie player:
+ - Fix crasher when trying to load (unsupported) audio CDs
+ - Fix the bug report script
+ - Check for required GStreamer plugins in the YouTube plugin
+ - GStreamer backend:
+ - Fix a possible crash when forcing use of ximagesink (as is the case
+ for small videos on trailers.apple.com)
+ - xine-lib backend:
+ - Fix potential crasher when copying MRLs from the engine
+ * debian/control.in:
+ - updated the launchpad integration requirements
+ * debian/patches/02_lpi.patch:
+ - updated the launchpad integration changes
+ * debian/patches/26_handle_audio_xspeex.patch:
+ - dropped, fixed in the new version
+ * debian/patches/70_autoconf.patch:
+ - new version update
+
+ -- Sebastien Bacher Tue, 08 Apr 2008 23:00:33 +0200
+
+totem (2.22.0-0ubuntu4) hardy; urgency=low
+
+ * debian/rules: Remove duplicate dh_shlibdeps call.
+ * Install the upstream changelog in totem-common only. Savings: 600kB.
+ * Symlink identical Gnome help files within packages (code taken from cdbs).
+ Savings: 200kB compressed.
+ * Build-depend on fdupes.
+
+ -- Matthias Klose Tue, 08 Apr 2008 17:30:48 +0200
+
+totem (2.22.0-0ubuntu3) hardy; urgency=low
+
+ * debian/control.in:
+ - list new totem-plugins-extra which contains extra plugins which are not
+ installed by default
+ - totem-plugins depends on python-gdata so it gets installed by default
+ (lp: #178209)
+
+ -- Sebastien Bacher Thu, 27 Mar 2008 10:57:53 +0100
+
+totem (2.22.0-0ubuntu2) hardy; urgency=low
+
+ * debian/patches/26_handle_audio_xspeex.patch:
+ - add the x-speex mimetype to the mimetype definitions (lp: #190489)
+ * debian/rules: update translations template (lp: #198366)
+
+ -- Sebastien Bacher Thu, 13 Mar 2008 23:30:32 +0100
+
+totem (2.22.0-0ubuntu1) hardy; urgency=low
+
+ [ Loic Minier ]
+ * New upstream release.
+ - Bump up libgtk2.0-dev build-dep to >= 2.12.6 to match upstream check.
+ - NB: 70_autoconf doesn't need an update (new patch identical).
+ - Upstream NEWS:
+ * Update GTK+ requirement for the accessibility support
+ * Add missing accessibility properties to the interface files
+ * xine-lib backend
+ - Fix crash when using multi-head
+ * GStreamer backend
+ - When resizing a visualisation, resize to the native resolution, not
+ the minimum size
+ - Add DVB-C (digital cable TV) support
+ * Drop spurious differ.patch from diff; *cough*.
+ * Add an update-alternative slave for audio-preview per flavor; LP: #199701.
+
+ [ Sebastien Bacher ]
+ * Drop patch 05_auto_resize and hence don't autoresize by default as
+ requested by upstream as it seems to confuse users.
+
+ -- Loic Minier Tue, 11 Mar 2008 10:38:25 +0100
+
+totem (2.21.95-0ubuntu1) hardy; urgency=low
+
+ * New upstream releases.
+ - Upstream NEWS:
+ . Note that configuration files are now in ~/.config/totem/ instead
+ of ~/.gnome2/Totem. You will need to move the files by hand.
+ . Movie player:
+ * Fix crash when pressing a remote button in windowed mode
+ * Fix the YouTube plugin when there's no search results
+ * Better support for using "--fullscreen" on startup
+ * Default to using the fastest speed for MMS streaming
+ * Support auto-loading subtitles when the suffix is upper-case
+ * Add a bug-buddy script so we get more information when totem crashes
+ . Browser plugin:
+ * Support the audio/x-ms-wma mime-type
+ * Better VLC Javascript support
+ * Implement stubs for DivX Player Javascript support
+ * Force opening videos directly with the DivX plugin
+ . GStreamer backend:
+ * Check for DVB plugins before saying it's available
+ * Fix logic in the channels.conf parsing for DVB
+ . Support audio/midi
+ . Only stay on top when video is playing back, not visualisations
+ - Refresh patches 02_lpi, 04_desktop_gettext_domain, 05_auto_resize,
+ 25_revert-xine-reqs-bump to apply cleanly
+ - Update patch 70_autoconf; document how to refresh it.
+ * Re-add Xb-Npp-xxx tags accordingly to the firefox-distro-addon-support
+ UbuntuSpec which had been added in 2.19.4-0ubuntu4 and lost in a merge in
+ hardy.
+
+ -- Loic Minier Mon, 25 Feb 2008 16:05:00 +0100
+
+totem (2.21.93-0ubuntu2) hardy; urgency=low
+
+ * debian/control.in:
+ - Build depend on libgmyth-dev to activate MythTV plugin (LP: #187582)
+
+ -- Mario Limonciello Fri, 15 Feb 2008 00:00:59 -0600
+
+totem (2.21.93-0ubuntu1) hardy; urgency=low
+
+ * New upstream release (LP: #191141)
+ - Movie player:
+ + Make "Aspect ratio" menu items work again
+ + Add DVB playback straight in the "Movie" menu
+ + Add better errors when parts are missing for DVB playback
+ + Fix a crasher when using the mouse scroll in windowed mode (LP: #189967)
+ - Browser plugin:
+ + Fix playback on the Stage6 website
+ + Fix playback of lessons on the arichuvadi.nrcfosshelpline.in site
+ + Fix playback on the Sirius Radio website
+ + Fix playback on the mediathek.zdf.de website
+ + Show errors in the plugin with a logo when there is one
+ - GStreamer backend:
+ + Add support for playing titles from DVDs in the backend
+ - xine-lib backend:
+ + Fix build
+ - Plugins:
+ + Fix build with newer versions of gmyth
+ * debian/patches:
+ - 99_bugzilla_fix_xine_backend.patch: dropped, fixed upstream
+ * debian/control{.in}:
+ - Removed b-d on libgnome-settings-daemon-dev
+
+ -- Pedro Fragoso Tue, 12 Feb 2008 01:17:54 +0000
+
+totem (2.21.92-0ubuntu2) hardy; urgency=low
+
+ * use --with-gecko=mozilla to use xulrunner-1.9
+ - update debian/rules
+ * update build-depends use xulrunner-1.9-dev instead of firefox-dev
+ - update debian/control{.in}
+ * add xulrunner 1.9 support patches
+ - add debian/patches/30_totem_xulrunner19.patch
+ - update debian/patches/series
+ - refresh debian/patches/70_autoconf.patch
+ * link plugin libs to /usr/lib/xulrunner-addons/plugins to support 1.9 and
+ drop support for all 1.8 geckos
+ - update debian/totem-mozilla.links
+ * drop midbrowser links until it switches to xulrunner 1.9
+
+ -- Alexander Sack Wed, 06 Feb 2008 18:16:57 +0100
+
+totem (2.21.92-0ubuntu1) hardy; urgency=low
+
+ [ Pedro Fragoso ]
+ * New upstream release (LP: #189136)
+ - Update the tracker plugin UI
+ - Fix compilation with newer versions of Vala
+ - Support both the old and the new gnome-settings-daemon APIs for
+ multimedia keys
+ - Small bug and build fixes
+ - Add support for the new x-content/ type, to show in the nautilus'
+ media selection
+ - Lock the screensaver when only audio is playing, but allow the users
+ to disable that behaviour, for monitor-powered speakers
+ - Add a thumbnail plugin to use the video's thumbnail as the window icon
+ - Remove unneeded gnome-desktop and HAL dependency
+ - Don't start up gnome-settings-daemon when it's not already running
+ - Forcefully exit after 10 seconds when we can't finish the shutdown
+ - Don't change the resolution of screens on multi-head setups
+ - xine-lib:
+ + Check metadata being in UTF-8 before passing it to the player
+ - GStreamer:
+ + Fix a few crashers by not using GConf in the streaming thread
+ - Browser plugin:
+ + Fix building the GTK+ version
+ * debian/control{.in}:
+ - Removed b-d libgnome-desktop-dev (>= 2.6.1-2), libhal-dev (>= 0.5)
+ - B-d on libstartup-notification0-dev
+ * debian/patches/
+ - 02_lpi: Updated
+ - 70_autoreconf: Updated
+ - 99_bugzilla_fix_xine_backend.patch: Added to fix FTBFS
+ * debian/totem-mozilla.install:
+ - Added symlinks for midbrowser (LP: #189382), Thanks Steve Magoun
+
+ [ Alexander Sack ]
+ * add dh_shlibdeps to binary-arch
+ - debian/rules: Updated
+
+ -- Pedro Fragoso Mon, 04 Feb 2008 19:11:25 +0000
+
+totem (2.21.90-0ubuntu3) hardy; urgency=low
+
+ * Auto-generate totem-{xine,gstreamer}.postinst from new
+ debian/totem-flavor.postinst.in in the install target
+ * Substitute the pkg-config variable into the generated postinst also,
+ so that the update-alternatives slave for the nautilus extension is
+ kept in sync with the ABI.
+
+ -- Steve Langasek Thu, 24 Jan 2008 15:59:50 +0000
+
+totem (2.21.90-0ubuntu2) hardy; urgency=low
+
+ * Use pkg-config to detect the nautilus extension directory instead of
+ hard-coding the name, fixing a build failure caused by the switch to
+ the 2.0 extension ABI.
+
+ -- Steve Langasek Wed, 23 Jan 2008 16:24:12 +0000
+
+totem (2.21.90-0ubuntu1) hardy; urgency=low
+
+ * New upstream release (LP: #183653)
+ - Fix GTK+-only build wrt. the tracker plugin and the startup-notification
+ - Fix building with newer versions of Vala
+ - Make the icon bigger when the launcher is dropped on the desktop
+ - Ignore backup files when adding them to the playlist
+ - Only put Totem on top when playing audio
+ - Install the Nautilus extension in the correct directory
+ - Browser plugin:
+ - Reduce the number of times the button glows in the browser plugin
+ - Handle application/x-ogg mimetype
+ * debian/control{.in};
+ - Build depend on libtotem-plparser-dev >= 2.21.90 and libcamel1.2-dev
+ - Bump Standars-Version to 3.7.3
+ * debian/patches/02_lpi: updated
+ * debian/patches/70_autoconf: updated
+
+ -- Pedro Fragoso Mon, 07 Jan 2008 21:31:26 +0000
+
+totem (2.21.5-0ubuntu2) hardy; urgency=low
+
+ * debian/rules: Fix bashism ("echo -e" => "printf")
+ (LP: #177459)
+
+ -- dAniel hAhler Wed, 19 Dec 2007 14:50:17 +0100
+
+totem (2.21.5-0ubuntu1) hardy; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Build depend on libtotem-plparser-dev >= 2.21.4
+ - Do not build libtotem-plparser{10,-dev} binary packages anymore.
+ * debian/rules:
+ - Remove instalation of files for totem-plparser
+ * debian/patches/02_lpi.patch:
+ - Updated so it applies.
+ * debian/patches/30_kfreebsd_gnu.patch:
+ - Removed, as it applies to plparser which has been splitted.
+ * debian/patches/70_autoconf.patch:
+ - Regenerated.
+
+ -- Emilio Pozuelo Monfort Sat, 08 Dec 2007 19:29:01 +0100
+
+totem (2.21.3-0ubuntu1) hardy; urgency=low
+
+ * New upstream version:
+ - Add a sharing plugin using libepc
+ - Add a Tracker-based video search plugin
+ - Add the ability to select text subtitles for files in the UI
+ - Port the mythtv plugin to using the TotemVideoList
+ - Show a busy cursor when loading tracks from the YouTube plugin
+ - Restore the previously active sidebar page when restarting Totem
+ - Add the --no-existing-session argument to allow launching multiple
+ instances of the Movie Player
+ - Browser plugin:
+ - Add support for compiling with xulrunner
+ - Skip 0-length streams in playlists
+ - GStreamer backend:
+ - Add graphviz support
+ * debian/control.in:
+ - Build-Depends on libtrackerclient-dev
+ - totem-plugins Suggests python-gdata (LP: #173046)
+ * debian/patches/series:
+ - list Ubuntu patches (LP: #172463)
+
+ -- Sebastien Bacher Mon, 03 Dec 2007 11:15:17 +0100
+
+totem (2.21.2-0ubuntu2) hardy; urgency=low
+
+ * debian/totem-mozilla.links:
+ - create links for the new cone plugin so it's correctly listed
+
+ -- Sebastien Bacher Tue, 27 Nov 2007 19:36:32 +0100
+
+totem (2.21.2-0ubuntu1) hardy; urgency=low
+
+ * Sync with Debian
+ * debian/control.in:
+ - Build-Depends on liblaunchpad-integration-dev, firefox-dev,
+ libgnome-keyring-dev
+ - don't Build-Depends on libxul-dev, xulrunner,
+ libvala-dev, valac, libgalago-dev
+ - rename due to soname change
+ - totem-mozilla Replaces, Provides, Conflicts with
+ totem-gstreamer-firefox-plugin, totem-xine-firefox-plugin
+ - ubuntu uses firefox and not iceweasel
+ - updated maintainer information
+ - updated pygtk requirement
+ - use Replaces where those are required
+ - use Suggests instead of Recommends for gstreamer0.10-plugins-ugly,
+ gstreamer0.10-ffmpeg since those packages come from universe
+ - totem-gstreamer Suggests gnome-app-install
+ * debian/patches/02_lpi.patch:
+ - launchpad-integration
+ * debian/patches/03_autoconf.patch:
+ - configure update
+ * debian/patches/04_desktop_gettext_domain.patch:
+ - Add gettext domain to .desktop file to get language pack support.
+ * debian/patches/05_auto_resize.patch:
+ - use auto resize as default behaviour
+ * debian/patches/70_autoconf.patch:
+ - updated
+ * debian/rules:
+ - build with firefox instead of xulrunner
+ - call dh_icons
+ - don't build using the vala option
+ - remove bytecompiled files
+ - update for the soname change
+ * debian/totem-mozilla.links:
+ - use firefox and not iceweasel
+
+ -- Sebastien Bacher Mon, 26 Nov 2007 15:28:50 +0100
+
+totem (2.20.1-1) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Cleanup whitespace.
+
+ [ Josselin Mouette ]
+ * totem depends on totem-plugins. Closes: #445675.
+ * Conflict against totem-mozilla (<< 2.20.0-3). Closes: #448554.
+ * debian/bug/control: ship a bug control file in totem to correctly
+ report dependencies of totem-{gstreamer,xine}.
+
+ [ Sebastian Dröge ]
+ * New upstream bugfix release:
+ + debian/control:
+ - Build depend on Gtk >= 2.12.1 as per configure.in.
+ + debian/patches/60_gnome-doc-utils.patch:
+ - Dropped, upstream uses new enough gnome-doc-utils now.
+ + debian/patches/70_autoconf.patch:
+ - Regenerated for the new version.
+
+ -- Josselin Mouette Sun, 25 Nov 2007 13:15:19 +0100
+
+totem (2.20.0-3) unstable; urgency=low
+
+ * Complete rework of debian/rules.
+ * Split data files in totem-common.
+ * Make totem-xine and totem-gstreamer installable together.
+ Closes: #402549.
+ * Move debugging symbols to totem-dbg.
+ * Move plugins to totem-plugins.
+ * Switch to quilt.
+ * Refresh patches.
+ * Fix menu files and ship them in both packages.
+ * 60_gnome-doc-utils.patch: regenerate help/Makefile.in with a newer
+ gnome-doc-utils.make that supports out-of-tree builds.
+ * Build-depend on libbluetooth-dev and libgalago-dev for the
+ corresponding plugins.
+ * Remove symbolic links in the firefox directory.
+ * Improve long package descriptions.
+
+ -- Josselin Mouette Wed, 26 Sep 2007 22:36:06 +0200
+
+totem (2.20.0-2) unstable; urgency=low
+
+ [ Sebastian Dröge ]
+ * Upload to unstable.
+ * debian/control.in:
+ + Remove duplicated liblircclient-dev build dependency.
+
+ [ Josselin Mouette ]
+ * libtotem-plparser7-dbg conflicts with libtotem-plparser1-dbg.
+
+ -- Josselin Mouette Wed, 26 Sep 2007 00:41:46 +0200
+
+totem (2.20.0-1) experimental; urgency=low
+
+ * New upstream stable release:
+ + debian/control.in:
+ - Bump required versions of Gtk, GLib, GnomeVFS, GStreamer,
+ shared-mime-info.
+ - Build depend on vala.
+ - Build depend on python-gobject-dev and python-gtk2-dev.
+ - Build depend on libgnome-settings-daemon-dev.
+ - Build depend on liblircclient-dev.
+ - Bump soname of libtotem-plparser.
+ + debian/rules:
+ - Enable the vala bindings support.
+
+ -- Sebastian Dröge Mon, 17 Sep 2007 07:12:48 +0200
+
+totem (2.18.2-2) unstable; urgency=high
+
+ * Depend on iso-codes; thanks Jan Alonzo.
+ * Recommend libxine1-ffmpeg; closes: #433166.
+
+ -- Loic Minier Sun, 22 Jul 2007 15:06:24 +0200
+
+totem (2.18.2-1) unstable; urgency=low
+
+ [ Loic Minier ]
+ * Honor CFLAGS we set in rules, doh!
+
+ [ Sven Arvidsson ]
+ * New patch, lirc_freeconfig, from upstream SVN, fix freeze on close
+ with lirc; thanks Philip Withnall (GNOME bug #427681);
+ (Closes: #418020)
+
+ [ Loic Minier ]
+ * Excluse /usr/lib/totem/ and /usr/lib/nautilus/extensions- for
+ dh_makeshlibs as there are plugins in these dirs.
+ * Upload to unstable; drop check-dist include.
+ * New upstream stable release.
+ - New patch, 25_revert-xine-reqs, reverts the bump in Xine requirements
+ which was only added to pull a Xine bugfix.
+ - New patch, 70_autoconf, run autoconf.
+ - Drop patch 40_lirc_freeconfig, merged upstream.
+ * Wrap build-deps and deps.
+ * Fix some ${binary:Version} uses in Arch: all packages.
+ * Sprinkle some ${misc:Depends}.
+ * Bump up Debhelper compatibility level to 5.
+
+ -- Loic Minier Fri, 01 Jun 2007 15:36:12 +0200
+
+totem (2.18.1-1) experimental; urgency=low
+
+ * Include the new check-dist Makefile to prevent accidental uploads to
+ unstable; bump build-dep on gnome-pkg-tools to >= 0.10.
+ * New upstreeam release; no API change.
+
+ -- Loic Minier Wed, 04 Apr 2007 17:26:55 +0200
+
+totem (2.18.0-1) experimental; urgency=low
+
+ * New upstream major stable release; with API additions.
+ - Pass --enable-xine to the Xine configure and drop the --enable-gstreamer
+ from the gstreamer configure.
+ - Prefer totem-gstreamer over totem-xine in the dependencies of totem.
+ - Bump up shlibs to >= 2.17.5.
+ - Configure with --disable-run-in-source-tree; change --enable-mozilla
+ --with-browser-plugins=xulrunner into --with-gecko=xulrunner.
+ - Bump up build-deps and existing deps to libglib2.0-dev >= 2.12.0,
+ libgtk2.0-dev >= 2.10.0, libgnomevfs2-dev >= 2.9.92, gnome-icon-theme >=
+ 2.15.90, libdbus-glib-1-dev >= 0.61, dbus >= 0.61, libxine-dev >= 1.1.4,
+ libgstreamer0.10-dev >= 0.10.6, libgstreamer-plugins-base0.10-dev >=
+ 0.10.7.
+ - Add a build-dep on libgnome2-dev >= 2.14.0.
+ - Add deps on gnome-icon-theme >= 2.15.90.
+ - Build-depend on gnome-doc-utils.
+ * Configure with --disable-scrollkeeper.
+ * Drop INSTALL_PROGRAM, dh_strip handles this.
+ * Cleanups.
+ * Let totem-gstreamer recommend gnome-control-center >= 2.15.90 for
+ gnome-sound-properties; conflict with gnome-control-center << 2.15.90 as
+ the bundled gnome-sound-properties is not aware of GStreamer profiles.
+ * Add a totem-gstreamer.README.Debian to document setting the output sink.
+ * Build-depend on librsvg2-dev and librsvg2-common >= 2.16.0-2 to make the
+ package autobuildable.
+
+ -- Loic Minier Fri, 23 Mar 2007 11:53:24 +0100
+
+totem (2.16.6-1) unstable; urgency=medium
+
+ * New upstream stable release; bug fixes and translations.
+ - Drop patch 30_dlopen_noremove_dbus_glib, merged upstream.
+
+ -- Loic Minier Mon, 19 Mar 2007 15:33:08 +0100
+
+totem (2.16.5-3) unstable; urgency=medium
+
+ [ Sebastien Bacher ]
+ * debian/patches/30_dlopen_noremove_dbus_glib.dpatch:
+ - fix "crash because NPPVpluginKeepLibraryInMemory is broken in gecko",
+ patch from Alexander Sack (GNOME bug #415389)
+
+ [ Loic Minier ]
+ * Urgency medium.
+
+ -- Loic Minier Thu, 8 Mar 2007 14:51:55 +0100
+
+totem (2.16.5-2) unstable; urgency=low
+
+ * Upload to unstable; drop dist-check.
+
+ -- Loic Minier Sat, 3 Feb 2007 14:58:22 +0100
+
+totem (2.16.5-1) experimental; urgency=low
+
+ * New upstream stable release; bug fixes and translation updates; no API or
+ ABI change.
+
+ -- Loic Minier Mon, 29 Jan 2007 17:55:00 +0100
+
+totem (2.16.4-3) UNRELEASED; urgency=low
+
+ [ Sven Arvidsson ]
+ * Add upstream ChangeLog, NEWS and README. (Closes: #404362)
+ * Remove unnecessary upstream TODO.
+
+ [ Loic Minier ]
+ * Add a get-orig-source target to retrieve the upstream tarball.
+
+ -- Loic Minier Sat, 13 Jan 2007 22:51:13 +0100
+
+totem (2.16.4-2) unstable; urgency=low
+
+ * Build-depend on libxtst-dev, thanks Sven Arvidsson
+ (closes: #315926).
+
+ -- Josselin Mouette Thu, 30 Nov 2006 14:16:44 +0100
+
+totem (2.16.4-1) unstable; urgency=low
+
+ * New upstream stable release; no API change; fixes for session saving (now
+ correctly restored, closes: #399983, and with support for the width of the
+ sidebar), some translation cleanups.
+
+ -- Loic Minier Wed, 29 Nov 2006 21:41:02 +0100
+
+totem (2.16.3-3) unstable; urgency=high
+
+ * Add symlinks in the iceweasel plugins directory; symlinks for the firefox
+ plugins dir are still installed for compatibility with local firefox debs
+ and backwards-compatibility.
+ * Update description to mention Iceweasel instead of Firefox.
+
+ -- Loic Minier Tue, 21 Nov 2006 17:31:59 +0100
+
+totem (2.16.3-2) unstable; urgency=low
+
+ * Do not build-depend on libhal-dev for kfreebsd-i386 and kfreebsd-amd64;
+ build-depend on libcam-dev instead; thanks Petr Salinger; closes: #399091.
+ * Drop useless libnautilus-burn-dev build-dep; thanks Bastien Nocera.
+
+ -- Loic Minier Sat, 18 Nov 2006 10:03:47 +0100
+
+totem (2.16.3-1) unstable; urgency=low
+
+ * New upstream release; no API change.
+
+ -- Loic Minier Tue, 14 Nov 2006 17:38:27 +0100
+
+totem (2.16.2-4) unstable; urgency=low
+
+ * GNU/kFreeBSD support thanks Aurelien Jarno; closes: #391307.
+ - New dpatch, 30_kfreebsd_gnu, to use sys/cdio.h and sys/disklabel.h under
+ FreeBSD and mntent.h under Linux.
+ * Update 30_kfreebsd_gnu dpatch for totem 2.16.2.
+
+ -- Loic Minier Mon, 6 Nov 2006 18:24:35 +0100
+
+totem (2.16.2-3) unstable; urgency=low
+
+ * Fix copyright to mention the LGPL for the Totem Playlist parser library,
+ "plparser", and the excemption for proprietary GStreamer plugins; thanks
+ Thadeu Lima de Souza Cascardo; closes: #396549.
+
+ -- Loic Minier Wed, 1 Nov 2006 15:43:30 +0100
+
+totem (2.16.2-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Loic Minier Thu, 19 Oct 2006 11:57:54 +0200
+
+totem (2.16.2-1) experimental; urgency=low
+
+ * New upstream release; no API change.
+
+ -- Loic Minier Mon, 2 Oct 2006 15:52:01 +0200
+
+totem (2.16.1-1) experimental; urgency=low
+
+ [ Guilherme de S. Pastore ]
+ * New upstream release.
+ * debian/watch: updated.
+
+ [ Loic Minier ]
+ * Add debian/test.html, sample javascript integration of the gecko plugin.
+ * Re-add Firefox symlinks as these are required after all.
+ * New upstream release; with API additions.
+ - Bump libtotem-plaparser1 shlibs to >= 2.16.1.
+ - Install new plugin flavor, MullY.
+
+ -- Loic Minier Fri, 8 Sep 2006 09:14:19 +0200
+
+totem (1.5.92-1) experimental; urgency=low
+
+ * Fix changelog of 1.5.91-1; hal 0.6 is not released yet, but upstream has a
+ safety check just in case it would break API/ABI.
+ * New upstream development release.
+ - Drop 10_dont-clean-totem-schemas-in dpatch, merged upstream.
+
+ -- Loic Minier Fri, 25 Aug 2006 22:04:46 +0200
+
+totem (1.5.91-2) experimental; urgency=low
+
+ * Bump shlibs to libtotem-plparser1 >= 1.5.1.
+ * Pass "-L libtotem-plparser1" and "-l debian/libtotem-plparser1/usr/lib"
+ to dh_shlibdeps for the other packages to see the lib and use the shlibs.
+
+ -- Loic Minier Sun, 13 Aug 2006 15:19:01 +0200
+
+totem (1.5.91-1) experimental; urgency=low
+
+ * New upstream development releases; with API additions.
+ - Target at experimental.
+ - Bump up libgstreamer0.10-dev and libgstreamer-plugins-base0.10-dev
+ build-deps to >= 0.10.1.
+ - Bump up libglib2.0-dev build-dep to >= 2.8.0.
+ - Bump up libxine-dev build-dep to >= 1.1.2.
+ - Add a build-dep on libgconf2-dev.
+ - Rename --with-mozilla configure flag to --with-browser-plugins.
+ - Add a build-dep on shared-mime-info (>= 0.17).
+ - Add a build-dep on libhal-dev (>= 0.5).
+ - Drop 09_maintainer-mode dpatch as upstream now calls
+ GNOME_MAINTAINER_MODE_DEFINES which requires AM_MAINTAINER_MODE.
+ - Drop 60_mandatory-relibtoolizing dpatch which isn't required anymore.
+ - Update symlinks and installation steps for the split in 4 distinct
+ plugins.
+ - New dpatch, 10_dont-clean-totem-schemas-in, to workaround an upstream
+ bug preventing two successive builds.
+ - Fixes playing of streams with mms:// URL lists. (Closes: #382603)
+ * Ship the *.xpt files as recommended by upstream.
+ * Only symlink the plugin in /usr/lib/mozilla as Firefox and XULRunner are
+ expected to look there too.
+
+ -- Loic Minier Sun, 13 Aug 2006 14:28:00 +0200
+
+totem (1.4.5-1) unstable; urgency=low
+
+ * New upstream release; no API changes.
+
+ -- Loic Minier Tue, 12 Sep 2006 10:41:57 +0200
+
+totem (1.4.4-1) unstable; urgency=low
+
+ [ Josselin Mouette ]
+ * Make the package binNMU-able by making the arch-all packages depend
+ only on >= ${Source-Version} arch-any packages.
+ * Make totem-mozilla depend on dbus.
+
+ [ Loic Minier ]
+ * Use ${source:Version} and ${binary:Version} because of the totem-mozilla
+ Recommend; build-depend on dpkg-dev >= 1.13.19.
+ * Let totem-xine also Recommend totem-mozilla.
+ * New upstream release.
+ - Drop the 11_configure-drop-mozilla-link-flags dpatch, merged upstream.
+ - Update 60_mandatory-relibtoolizing dpatch.
+ - Fix the moves of the mozilla plugin since upstream now installs in
+ /usr/lib/mozilla/plugins, whatever the gecko engine.
+
+ -- Loic Minier Tue, 8 Aug 2006 14:13:44 +0200
+
+totem (1.4.3-1) unstable; urgency=low
+
+ * Fix bashishm in mv "foo.{x,y}" snippet executed by $SHELL, thanks Julien
+ Danjou. (Closes: #377367)
+ * Drop 10_configure-force-xulrunner dpatch as --with-mozilla=xulrunner is
+ enough to select the appropriate Gecko.
+ * New upstream release.
+ - Update 60_mandatory-relibtoolizing dpatch.
+
+ -- Loic Minier Thu, 13 Jul 2006 13:42:08 +0200
+
+totem (1.4.2-1) experimental; urgency=low
+
+ * Upload to experimental for now as the package is frozen in unstable due to
+ a big transition, but some users requested the fixed package.
+ * Set libtotem-plparser1-dbg Priority to extra.
+ [debian/control, debian/control.in]
+ * New dpatch, 09_maintainer-mode, to use AM_MAINTAINER_MODE for safety.
+ * Update 60_mandatory-relibtoolizing dpatch to also intltoolize as this is
+ required with intltool 0.35. (Closes: #372529)
+ * Bump up Standards-Version to 3.7.2.
+ * New upstream release.
+ - Lower libgnomevfs2-dev build-dep to >= 2.8.2
+ - Bump up gstreamer0.10-plugins-base build-dep to >= 0.10.7.
+ - Drop 30_totem-mozilla-types dpatch, merged upstream.
+ - Update 60_mandatory-relibtoolizing dpatch.
+ * Build-depend on autotools-dev for the config.guess / config.sub update
+ snippet to work.
+
+ -- Loic Minier Sat, 8 Jul 2006 21:34:16 +0200
+
+totem (1.4.1-2) unstable; urgency=low
+
+ * debian/patches/30_totem-mozilla-types.dpatch
+ - Added. Correct the Bool types used by the totem-mozilla plugin. Fixes the
+ mozilla plugin on big-endian architectures.
+
+ -- Sjoerd Simons Sun, 4 Jun 2006 22:16:38 +0200
+
+totem (1.4.1-1) unstable; urgency=low
+
+ [ Guilherme de S. Pastore ]
+ * New upstream release.
+ * debian/patches:
+ - 00list: updated.
+ - 06_volume_icons_change.dpatch, 07_no_mms_to_mmsh_change.dpatch,
+ 08_aspect_ratio_fix.dpatch,
+ 09_play_protocol_not_listed_by_firefox.dpatch: removed, applied upstream.
+
+ [ Loic Minier ]
+ * Update the mandatory relibtoolizing patch...
+ [debian/patches/60_mandatory-relibtoolizing.dpatch]
+ * Move common configure flags to COMMON_CONFIGURE_FLAGS and add
+ --disable-maintainer-mode to them.
+ [debian/rules]
+ * Recommend totem-mozilla and not totem-gstreamer-xul-plugin.
+ [debian/control, debian/control.in]
+ * Promote gstreamer0.10-plugins-ugly and gstreamer0.10-ffmpeg from Suggests
+ to Recommends.
+ [debian/control, debian/control.in]
+ * Remove what looks useless and now bogus deps on xlibs. (Closes: #370089)
+ [debian/control, debian/control.in]
+
+ -- Loic Minier Thu, 25 May 2006 21:09:34 +0200
+
+totem (1.4.0-1) unstable; urgency=low
+
+ [ Gustavo Franco ]
+ * New upstream release.
+ * debian/control:
+ - intltool added in build-depends field
+ - libnautilus-burn-dev build-depends downgraded
+ - libtotem-plparser1 added, dropping libtotem-plparser0 (due to
+ SONAME change)
+ - gstreamer0.8 related dependencies bumped up to gstreamer0.10
+ - Uploaders field sync with gnome-pkg-tools
+ - Standards-Version bumped up to 3.7.0
+ * debian/rules:
+ - minor changes to fix the build (e.g: libtotem-plparser1 bits)
+ - fix '*.la' removal from all the binaries
+ - config.{guess,sub} unneeded copy removed from clean target
+ * debian/patches/01_totem_playlist_add_fix.dpatch dropped (merged upstream)
+ * debian/patches/08_firefox-plugin-fix.dpatch dropped (merged upstream)
+ * Patches merged from Ubuntu:
+ * debian/patches/06_volume_icons_change.dpatch:
+ - patch from CVS, don't use the mute icon for non muted volume
+ * debian/patches/07_no_mms_to_mmsh_change.dpatch:
+ - patch from CVS, to automatically change mms to mmsh
+ * debian/patches/08_aspect_ratio_fix.dpatch:
+ - patch from upstream CVS, work by j^ , fix the aspect
+ ratio setting usage
+ * debian/patches/09_play_protocol_not_listed_by_firefox.dpatch:
+ - patch from upstream, work by Gary Coady , fix the
+ playing of protocols not listed by firefox
+
+ [ Gustavo Noronha Silva ]
+ * debian/patches/01_totem_playlist_add_fix.dpatch:
+ - patch by Thadeu Lima de Souza Cascardo
+ to fix crash on playlist add (Closes: #349357)
+ * debian/control.in, debian/rules:
+ - add xulrunner plugins for totem as new packages (Closes: #321400)
+ - added libxul-dev, and xulrunner (for xpidl) to Build-Deps
+
+ [ Loic Minier ]
+ * Trash all *.a and *.la files not only from debian/totem-gstreamer/usr/lib,
+ but from debian/totem-gstreamer and debian/totem-xine altogether, except
+ for debian/totem-xine/usr/lib/*.a.
+ [debian/rules]
+ * Remove the now useless rm calls on "*a" files.
+ [debian/rules]
+ * Remove config.guess and config.sub updating patch as cdbs takes care of
+ this and hence fix clean target.
+ [debian/rules]
+ * Bump libgnomevfs2-dev build-dep to >= 2.9.92 per configure.ac.
+ [debian/control, debian/control.in]
+ * Fix config.sub / config.guess copying over, even if it's useless.
+ [debian/rules]
+ * Drop useless dh_installdirs calls.
+ [debian/rules]
+ * Remove *-xul packages in favor of a new totem-mozilla package, arch: all.
+ [debian/control, debian/control.in]
+ * Permit "| www-browser" in totem-mozilla's Recommends too.
+ [debian/control, debian/control.in]
+ * Add symlinks in /usr/lib/{firefox,mozilla,xulrunner}/plugins to
+ the mozilla plugin below /usr/lib/totem.
+ [debian/totem-mozilla.links]
+ * Install the mozilla plugin in /usr/lib/totem in totem-xine and
+ totem-gstreamer, drop anything else from /usr/lib/xulrunner.
+ [debian/rules]
+ * Add new patch to force usage of xulrunner, even if mozilla, firefox, or
+ seamonkey are available; WARNING: requires relibtoolizing.
+ [debian/patches/00list,
+ debian/patches/10_configure-force-xulrunner.dpatch]
+ * Add new patch to stop linling against mozilla libs (-lxpcom -lplds4 -lplc4
+ -lnspr4) by splitting the PKG_CHECK_MODULES calls in configure.in;
+ WARNING: requires relibtoolizing.
+ [debian/patches/00list,
+ debian/patches/11_configure-drop-mozilla-link-flags.dpatch]
+ * Relibtoolize, as required by the preceding patches.
+ [debian/patches/00list, debian/patches/60_mandatory-relibtoolizing.dpatch]
+ * Use similar definitions as CDBS for DEB_MAKE_INVOKE and DEB_MAKE_ENVVARS
+ and use $(DEB_MAKE_INVOKE) instead of $(MAKE) to call make, fixes warnings
+ on schema installation.
+ [debian/rules]
+
+ -- Loic Minier Sat, 6 May 2006 18:38:39 +0200
+
+totem (1.2.1-4) unstable; urgency=low
+
+ * Simple rebuild to get rid of references to Xcursor.la, and Xrender.la.
+
+ -- Loic Minier Tue, 2 May 2006 16:09:22 +0200
+
+totem (1.2.1-3) unstable; urgency=low
+
+ * debian/patches/08_firefox-plugin-fix.dpatch:
+ - upstream patch to fix the firefox plugin crasher
+
+ -- Sebastien Bacher Fri, 13 Jan 2006 00:12:49 +0100
+
+totem (1.2.1-2) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Gustavo Noronha Silva Mon, 9 Jan 2006 22:58:02 -0200
+
+totem (1.2.1-1) experimental; urgency=low
+
+ [ Loic Minier ]
+ * Update watch file. [debian/watch]
+
+ [ Sjoerd Simons ]
+ * New upstream release
+ * Recommend gstreamer-theora and ffmpeg.
+ * Depend on llibmusicbrainz4-dev >= 2.1.1-4.1 to get the C++ transitioned
+ version.
+ * Build-Depend on libdbus-glib-1-dev so totem can disable gnome-screensaver
+ via dbus.
+
+ -- Sjoerd Simons Tue, 20 Dec 2005 12:09:07 +0100
+
+totem (1.2.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * Version the libmusicbrainz4-dev build-dep to >= 2.1.1-3.1 to get a
+ C++ transitionned version. [debian/control, debian/control.in]
+ * Drop hardcoded libtotem-plparser0 depends in totem-xine and
+ totem-gstreamer. [debian/control, debian/control.in]
+ * Menu icon fixes: [debian/totem-gstreamer.install,
+ debian/totem-gstreamer.menu, debian/totem-xine.install,
+ debian/totem-xine.menu, debian/totem.xpm]
+ - Convert the upstream PNG icon to XPM.
+ - Install totem.xpm in /usr/share/pixmaps for totem-xine and
+ totem-gstreamer.
+ - Update totem-gstreamer and totem-xine menu files.
+ * Only update config.guess and config.sub if we're in a tree with these
+ files. [debian/rules]
+
+ -- Loic Minier Wed, 14 Sep 2005 13:03:01 +0200
+
+totem (1.1.5-1) experimental; urgency=medium
+
+ * Ship missing shlibs.
+ * New upstream release.
+
+ -- Loic Minier Sun, 11 Sep 2005 11:37:42 +0200
+
+totem (1.1.4-1) experimental; urgency=low
+
+ * debian/control.in:
+ - new packages for libtotem-plparser.
+ - updated the Build-Depends.
+ - updated the Standards-Version.
+ * debian/rules:
+ - move libtotem-plparser files to the right place.
+ * debian/watch:
+ - updated.
+
+ -- Sebastien Bacher Sat, 13 Aug 2005 14:24:36 +0200
+
+totem (1.0.4-1) unstable; urgency=low
+
+ * New upstream version:
+ - say that we support 3GPP files.
+ - avoid resizing on startup before we really show the window.
+ - fix a crash when 'Hide controls' is called while starting up.
+ - fix crashes when playing back some files with errors (xine-lib).
+ - fix hand icon not appearing on DVD menus in fullscreen (xine-lib).
+ - fix detection of still images with newer xine-lib.
+
+ -- Sebastien Bacher Tue, 28 Jun 2005 12:14:31 +0200
+
+totem (1.0.3-1) unstable; urgency=low
+
+ * New upstream version.
+
+ -- Sebastien Bacher Fri, 10 Jun 2005 01:08:45 +0200
+
+totem (1.0.2-1) experimental; urgency=low
+
+ * New upstream version.
+
+ -- Sebastien Bacher Mon, 2 May 2005 18:38:08 +0200
+
+totem (1.0.1-1) experimental; urgency=low
+
+ * New upstream version.
+ * debian/control.in:
+ - updated the requirements.
+ * debian/patches/02_crashnull.dpatch,
+ debian/patches/10_vcd_hang.dpatch:
+ - the new version fixes that.
+ * debian/watch:
+ - updated.
+
+ -- Sebastien Bacher Sat, 9 Apr 2005 17:39:02 +0200
+
+totem (0.100-5) unstable; urgency=low
+
+ * Rebuilt for the libhowl transition (Closes: #298872).
+ * debian/control.in:
+ - updated the gnome-vfs requirements.
+
+ -- Sebastien Bacher Thu, 10 Mar 2005 19:14:51 +0100
+
+totem (0.100-4) unstable; urgency=low
+
+ * debian/patches/00list:
+ - list the new patch (Closes: #289470).
+
+ -- Sebastien Bacher Wed, 16 Feb 2005 15:09:35 +0100
+
+totem (0.100-3) unstable; urgency=low
+
+ * debian/patches/02_crashnull.dpatch:
+ - updated with the patch from Josselin Mouette .
+
+ -- Sebastien Bacher Sun, 13 Feb 2005 12:40:17 +0100
+
+totem (0.100-2) unstable; urgency=low
+
+ * debian/patches/01_gst-plugins-0.8.5.dpatch:
+ - removed, the new gst-plugins is in the archive now.
+ * debian/patches/02_crashnull.dpatch:
+ - added, fix the crash on system without any cdrom drive (Closes: #289470).
+
+ -- Sebastien Bacher Thu, 10 Feb 2005 19:05:00 +0100
+
+totem (0.100-1) unstable; urgency=low
+
+ * New upstream release:
+ - implement session management support, remove automatic save/restore of
+ the current playlist (Closes: #255320).
+ - GStreamer DVD support.
+ - make Ctrl+arrows seek further in streams.
+ - turn the cursor into a hand when hovering a menu in a DVD (xine-lib).
+ - zoom in/out support (xine-lib).
+ - implement buffering (GStreamer).
+ - enable visualisation effects (GStreamer) (Closes: #269910).
+ - make the properties page work (GStreamer) and misc. fixes (all)
+ (Hoary: #1453).
+ - add Album metadata to the properties windows.
+ - hide the video properties if a file is an audio-only one.
+ - work-around a bug in GConf that caused playbacks
+ to be very dark (xine-lib).
+ - add 4.1-channel audio support.
+ - fix parsing of sub-directories, and .pls playlists with relative paths.
+ * debian/control.in:
+ - totem-gstreamer and totem-xine Provides totem (Closes: 287981).
+ - updated the descriptions about the subtitle (Closes: #285153).
+ * debian/patches/01_gst-plugins-0.8.5.dpatch:
+ - removed, this fix is in the new version.
+ * debian/watch:
+ - updated.
+
+ -- Sebastien Bacher Sat, 8 Jan 2005 16:45:28 +0100
+
+totem (0.99.22-1) unstable; urgency=low
+
+ * New upstream release:
+ - show the popups in fullscreen (GStreamer).
+ - fix multiple volume icons appearing in the playlist.
+ - automatically load text subtitles (xine-lib).
+ - handle Drag'n'drop from Mozilla/Netscape.
+ - implement Drag from the Screenshot dialog to the file manager.
+ - make it possible to play a DVD from the hard-disk (xine-lib).
+ - fix getting the CD type when the drive doesn't implement it.
+ - add an error message when the audio device is busy (GStreamer).
+ - make drag'n'drop work again after double-clicking a playlist entry.
+ * debian/control.in:
+ - updated the Build-Depends and Depends.
+ * debian/patches/01_gst-plugins-0.8.5.dpatch:
+ - make the new version working well with gst-plugins 0.8.5.
+
+ -- Sebastien Bacher Mon, 22 Nov 2004 15:57:25 +0100
+
+totem (0.99.20-2) experimental; urgency=low
+
+ * debian/control.in:
+ - Build-Depends on libgstreamer-plugins0.8-dev (Closes: #279038).
+
+ -- Sebastien Bacher Sun, 31 Oct 2004 12:38:09 +0100
+
+totem (0.99.20-1) experimental; urgency=low
+
+ * New upstream release:
+ - fix a crash when closing Totem with non-file locations.
+ - set the current file chooser paths correctly.
+ - fix "Play Disc..." when the detected device is a symbolic link.
+ - fix detection of some DVDs, and speed-up disc type detection.
+ - add bitrate support to the GStreamer backend.
+ * debian/control.in:
+ - updated the Build-Depends.
+
+ -- Sebastien Bacher Wed, 27 Oct 2004 19:27:57 +0200
+
+totem (0.99.19-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - updated the debhelper Build-Depends to get dh_desktop.
+ * debian/totem-gstreamer.postinst, debian/totem-xine.postinst:
+ - dh_desktop handles the mime update now.
+ * debian/patches/01_automake.dpatch:
+ - removed.
+ * debian/rules:
+ - use dh_desktop.
+
+ -- Sebastien Bacher Sun, 17 Oct 2004 14:51:31 +0200
+
+totem (0.99.17-2) experimental; urgency=low
+
+ * debian/control.in:
+ - updated the Depends on nautilus-cd-burner (Closes: #275886).
+
+ -- Sebastien Bacher Sun, 10 Oct 2004 22:28:12 +0200
+
+totem (0.99.17-1) experimental; urgency=low
+
+ * New upstream release:
+ - great overhaul of the GStreamer backend.
+ - fix parsing of Real Media and ASF playlists.
+ - support for writing m3u playlists, including relative paths.
+ * debian/control.in:
+ - updated the Build-Depends.
+ - updated the Standards-Version.
+ * debian/patches/01_automake.dpatch:
+ - run automake to fix the broken build for the gstreamer backend.
+
+ -- Sebastien Bacher Thu, 7 Oct 2004 22:13:20 +0200
+
+totem (0.99.16-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ - totem depends on totem-xine | totem-gstreamer (Closes: #270985).
+ * debian/patches/20_use_alternatives.dpatch:
+ - patch from Emil Soleyman-Zomalan to convert the
+ video-thumbnailer to an alternative. (Closes: #270222).
+
+ -- Sebastien Bacher Fri, 17 Sep 2004 12:17:22 +0200
+
+totem (0.99.15.1-2) unstable; urgency=low
+
+ * debian/control.in:
+ - updated the Build-Depends on libgnomeui-dev (Closes: #263661).
+
+ -- Sebastien Bacher Thu, 5 Aug 2004 16:59:26 +0200
+
+totem (0.99.15.1-1) unstable; urgency=low
+
+ * New upstream release.
+ - add a MimeType line to the desktop file (for the new MIME system).
+ * debian/control.in:
+ - updated the Build-Depends.
+ * debian/rules:
+ - added a call to dh_gconf.
+ * debian/totem-gstreamer.postinst, debian/totem-xine.postinst:
+ - removed schemas registration code, dh_gconf handles that.
+ - run update-desktop-database if available.
+
+ -- Sebastien Bacher Sat, 24 Jul 2004 13:23:10 +0200
+
+totem (0.99.13-1) unstable; urgency=low
+
+ * New upstream release
+ - Handle Ctrl+P to show the playlist even in hidden controls mode
+ (Closes: #252604).
+ * debian/control.in
+ - Updated the totem-gstreamer description to remove references to xine
+ (Closes: #255420).
+
+ -- Sebastien Bacher Sat, 3 Jul 2004 00:01:52 +0200
+
+totem (0.99.12-2) unstable; urgency=low
+
+ * Split the package, now we have:
+ - totem-xine using the xine backend.
+ - totem-gstreamer using the gstreamer backend (Closes: #246058).
+ - totem, dummy package depending on totem-xine (since it seems to be
+ a better default for the moment).
+ * debian/control.in:
+ - updated for the split.
+ * debian/patches:
+ - switched to dpatch.
+ * debian/rules:
+ - switched back to debhelper since cdbs doesn't support multibuild for
+ the moment.
+ * debina/template:
+ - removed debconf's template for the moment, gstreamer-media is not ready
+ to be a suitable alternative for thumbnails (Closes: #235857, #252941).
+ * debian/totem.1:
+ - removed, the manpage is included in the upstream tarball now.
+
+ -- Sebastien Bacher Tue, 8 Jun 2004 15:16:34 +0200
+
+totem (0.99.12-1) unstable; urgency=low
+
+ * New upstream release
+ + turn off vanity's build.
+
+ -- Sebastien Bacher Sun, 6 Jun 2004 03:12:19 +0200
+
+totem (0.99.11-2) unstable; urgency=low
+
+ * Upload in unstable.
+
+ -- Sebastien Bacher Wed, 26 May 2004 23:53:54 +0200
+
+totem (0.99.11-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/stock-icon.patch, debian/patches/totem-rwcrash-fix.patch:
+ + removed since included in new version.
+ * debian/control.in:
+ + updated Build-Depends.
+
+ -- Sebastien Bacher Sat, 1 May 2004 23:28:02 +0200
+
+totem (0.99.10-3) experimental; urgency=low
+
+ * debian/patches/stock-icon.patch:
+ + patch from Michel Daenzer that makes all installed
+ icons loadable by totem (Closes: 243334).
+
+ -- Sebastien Bacher Tue, 27 Apr 2004 00:21:22 +0200
+
+totem (0.99.10-2) experimental; urgency=low
+
+ * debian/patches/totem-rwcrash-fix.patch:
+ + new patch to fix a crasher.
+
+ -- Sebastien Bacher Sun, 18 Apr 2004 17:30:38 +0200
+
+totem (0.99.10-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in:
+ + updated Build-Depends.
+ * Included Brazilian Portuguese debconf template from Andre Luis Lopes
+ (Closes: #235384).
+ * Included new manpage from Andre Lehovich
+ (Closes: #241814).
+
+ -- Sebastien Bacher Sun, 11 Apr 2004 00:46:20 +0200
+
+totem (0.99.9-4) unstable; urgency=low
+
+ * Fixed schemas registration (should fix the problem with colors).
+
+ -- Sebastien Bacher Sun, 22 Feb 2004 19:57:11 +0100
+
+totem (0.99.9-3) unstable; urgency=low
+
+ * debian/patches/vcd_hang.patch:
+ + patch to fix hang on start with VCD plugin.
+
+ -- Sebastien Bacher Tue, 17 Feb 2004 19:36:46 +0100
+
+totem (0.99.9-2) unstable; urgency=low
+
+ * GNOME team upload.
+ * [debian/control.in] Added build dependency on scrollkeeper.
+ (Closes: #232588)
+
+ -- J.H.M. Dassen (Ray) Sat, 14 Feb 2004 10:10:04 +0100
+
+totem (0.99.9-1) unstable; urgency=low
+
+ * New upstream release
+ + fix bug with directory selection in the file selector (Closes: #225903).
+
+ -- Sebastien Bacher Fri, 13 Feb 2004 19:47:26 +0100
+
+totem (0.99.8-3) unstable; urgency=low
+
+ * Rebuilt with xfree 4.2.
+
+ -- Sebastien Bacher Sun, 18 Jan 2004 01:01:37 +0100
+
+totem (0.99.8-2) unstable; urgency=low
+
+ * Fixed a typo in the french debconf translation (Closes: #227311).
+
+ -- Sebastien Bacher Sat, 17 Jan 2004 16:58:34 +0100
+
+totem (0.99.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ + updated Build-Depends.
+ + updated for the GNOME Team.
+ * debian/rules:
+ + updated for the GNOME Team.
+ * Added french template (Closes: #218730).
+ * Changed the template to remove the "yes" from the description
+ (Closes: #218117).
+
+ -- Sebastien Bacher Sun, 9 Nov 2003 14:03:46 +0100
+
+totem (0.99.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added debconf option to use or not totem as the nautilus video thumbnailer.
+ (Closes: #212555).
+
+ -- Sebastien Bacher Thu, 16 Oct 2003 01:01:24 +0200
+
+totem (0.99.6-1) unstable; urgency=low
+
+ * New upstream release.
+ + playlist improvements (Closes: #211833).
+ + fixed crash on eject (Closes: #211968).
+
+ -- Sebastien Bacher Sun, 12 Oct 2003 18:34:48 +0200
+
+totem (0.99.5-1) unstable; urgency=low
+
+ * New upstream release
+ + disable xscreensaver (Closes: #208175).
+
+ -- Sebastien Bacher Mon, 15 Sep 2003 17:55:44 +0200
+
+totem (0.99.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Thu, 4 Sep 2003 15:41:46 +0200
+
+totem (0.99.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Switched to cdbs.
+ * Updated menu icon.
+ * Updated description (Closes: #207007).
+
+ -- Sebastien Bacher Sun, 31 Aug 2003 19:53:10 +0200
+
+totem (0.99.2-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixed XFree86 lockup on start bug (Closes: #200101).
+
+ -- Sebastien Bacher Sat, 5 Jul 2003 14:02:13 +0000
+
+totem (0.99.1-2) unstable; urgency=low
+
+ * Build with xfree 4.2 instead 4.3. (Closes: #199335).
+
+ -- Sebastien Bacher Tue, 1 Jul 2003 23:49:57 +0200
+
+totem (0.99.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Mon, 23 Jun 2003 11:49:55 +0200
+
+totem (0.99.0-2) unstable; urgency=low
+
+ * Added libgnome-desktop-dev to Build-Depends (Closes: #196224).
+
+ -- Sebastien Bacher Thu, 5 Jun 2003 17:11:25 +0200
+
+totem (0.99.0-1) unstable; urgency=low
+
+ * New upstream release
+ - Fixed DVD/CD playing (Closes: #195090).
+ * Updated to standards version 3.5.10.0.
+
+ -- Sebastien Bacher Sat, 31 May 2003 19:19:39 +0200
+
+totem (0.98.0-1) unstable; urgency=low
+
+ * New upstream relase.
+
+ -- Sebastien Bacher Sun, 11 May 2003 21:13:06 +0200
+
+totem (0.97.0-1) unstable; urgency=low
+
+ * New upstream release.
+ - Fixed the thumbnailer (Closes: #188979).
+
+ -- Sebastien Bacher Tue, 29 Apr 2003 22:13:05 +0200
+
+totem (0.96.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Changed section to gnome.
+ * Updated to standards version 3.5.9.
+ * Updated Description to add Author and Homepage.
+ * Added Depends on ${misc:Depends}.
+ * Updated Build-Depends.
+
+ -- Sebastien Bacher Thu, 10 Apr 2003 11:17:49 +0200
+
+totem (0.95.1-3) unstable; urgency=low
+
+ * This time the schema file should be ok ...
+
+ -- Sebastien Bacher Fri, 28 Mar 2003 21:54:13 +0100
+
+totem (0.95.1-2) unstable; urgency=low
+
+ * Fixed schema file (Closes: #185137).
+
+ -- Sebastien Bacher Thu, 27 Mar 2003 17:09:15 +0100
+
+totem (0.95.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Sebastien Bacher Wed, 26 Feb 2003 23:43:07 +0100
+
+totem (0.95.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated to standards-version 3.5.8.
+
+ -- Sebastien Bacher Wed, 26 Feb 2003 22:01:48 +0100
+
+totem (0.90.0-5) unstable; urgency=low
+
+ * Added "liblircclient-dev" and "libirman-dev" to Build-Depends (Closes: #182195).
+
+ -- Sebastien Bacher Sun, 23 Feb 2003 17:47:25 +0100
+
+totem (0.90.0-4) unstable; urgency=low
+
+ * Apply patch to support playing straight from amazon (Closes: #181485).
+
+ -- Sebastien Bacher Thu, 20 Feb 2003 17:19:18 +0100
+
+totem (0.90.0-3) unstable; urgency=low
+
+ * Register totem-video-thumbnail schemas (Closes: #179343).
+
+ -- Sebastien Bacher Wed, 5 Feb 2003 01:13:54 +0100
+
+totem (0.90.0-2) unstable; urgency=low
+
+ * Update README file.
+ * Update Build-Depends.
+ * Remove obsolete depend on xine-dvdnav (Closes: #179160).
+
+ -- Sebastien Bacher Fri, 31 Jan 2003 10:59:36 +0100
+
+totem (0.90.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Should close the FTBFS (Closes: #176530).
+ * Updated Build-Depends.
+
+ -- Sebastien Bacher Wed, 29 Jan 2003 20:39:02 +0100
+
+totem (0.13.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated xine-lib Depends.
+ * Totem doesn't use xine logo any more (Closes: #160429).
+ * Updated xpm icon for debian menu.
+ * Updated to standards-version 3.5.7.
+
+ -- Sebastien Bacher Fri, 3 Jan 2003 12:34:20 +0100
+
+totem (0.11.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #161818).
+
+ -- Sebastien Bacher Mon, 28 Oct 2002 13:02:10 +0100
+
+totem (0.10.0-3) unstable; urgency=low
+
+ * Added xine-dvdnav to Depends (and not to Build-Depends ...).
+
+ -- Sebastien Bacher Fri, 25 Oct 2002 01:17:52 +0200
+
+totem (0.10.0-2) unstable; urgency=low
+
+ * Added xine-dvdnav to Build-Depends.
+
+ -- Sebastien Bacher Sun, 20 Oct 2002 00:22:30 +0200
+
+totem (0.10.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Sebastien Bacher Mon, 2 Sep 2002 19:14:31 +0200
+
+totem (0.9.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Sebastien Bacher Sat, 24 Aug 2002 15:12:51 +0200
+
+
--- totem-2.22.1.orig/debian/test.html
+++ totem-2.22.1/debian/test.html
@@ -0,0 +1,51 @@
+
+
+Test
+
+
+
+
PIMP
+
PIMP Internet Media Player
+
+
+
+ 
+ 
+