Bug#460464: marked as done (muine: diff for NMU version 0.8.7-1.2)

To: Diego Escalante Urrelo <dieguito@gmail.com>
Subject: Bug#460464: marked as done (muine: diff for NMU version 0.8.7-1.2)
From: owner@bugs.debian.org (Debian Bug Tracking System)
Date: Thu, 15 May 2008 08:00:35 +0000
Message-id: <[🔎] handler.460464.D460464.121083687826712.ackdone@bugs.debian.org>
References: <1210836535.1323.1.camel@milkyway> <20080113062132.GA2425@station.luk.local>

Your message dated Thu, 15 May 2008 02:28:55 -0500
with message-id <1210836535.1323.1.camel@milkyway>
and subject line Included in 0.8.8-1
has caused the Debian Bug report #460464,
regarding muine: diff for NMU version 0.8.7-1.2
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
460464: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=460464
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems

--- Begin Message ---

To: submit@bugs.debian.org
Subject: muine: diff for NMU version 0.8.7-1.2
From: Luk Claes <luk@debian.org>
Date: Sun, 13 Jan 2008 07:21:32 +0100
Message-id: <20080113062132.GA2425@station.luk.local>

Package: muine
Version: 0.8.7-1.1
Severity: normal
Tags: patch

Hi,

Attached is the diff for my muine 0.8.7-1.2 NMU.

diff -u muine-0.8.7/debian/control muine-0.8.7/debian/control
--- muine-0.8.7/debian/control
+++ muine-0.8.7/debian/control
@@ -2,7 +2,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Dave Beckett <dajobe@debian.org>
-Build-Depends: debhelper (>= 5), mono-gmcs (>= 1.1.13) | c-sharp-2.0-compiler, mono-gac, libgtk2.0-dev (>= 2.6.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2-1), autotools-dev, cdbs, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.10-dev (>= 0.10.0), gstreamer0.10-plugins-good (>= 0.10.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libdbus-1-cil (>= 0.61-3), gnome-icon-theme (>= 2.8.0), cli-common-dev (>= 0.4.4), monodoc-base (>= 1.1.10), libmono-cairo2.0-cil (>= 1.1.13)
+Build-Depends: debhelper (>= 5), mono-gmcs (>= 1.1.13) | c-sharp-2.0-compiler, mono-gac, libgtk2.0-dev (>= 2.6.0), libgdbm-dev (>= 1.8.0), libogg-dev (>= 1.0), libvorbis-dev (>= 1.0), libid3tag0-dev (>= 0.15.1b-3), libflac-dev (>= 1.1.2-1), autotools-dev, cdbs, libmono-dev (>= 1.1.6), libgconf2-dev (>= 2.4.0), libgnomevfs2-dev (>= 2.4.0), libgnome2-dev (>= 2.4.0), libgstreamer0.10-dev (>= 0.10.0), gstreamer0.10-plugins-good (>= 0.10.0), intltool, libgtk2.0-cil (>= 1.9.2), libgnome2.0-cil (>= 1.9.2), libglade2.0-cil (>= 1.9.2), libgconf2.0-cil (>= 1.9.2), libndesk-dbus1.0-cil (>= 0.4), libndesk-dbus-glib1.0-cil (>= 0.3), gnome-icon-theme (>= 2.8.0), cli-common-dev (>= 0.4.4), monodoc-base (>= 1.1.10), libmono-cairo2.0-cil (>= 1.1.13)
 Standards-Version: 3.7.2.0
 
 Package: muine
diff -u muine-0.8.7/debian/changelog muine-0.8.7/debian/changelog
--- muine-0.8.7/debian/changelog
+++ muine-0.8.7/debian/changelog
@@ -1,3 +1,12 @@
+muine (0.8.7-1.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * debian/control:
+    - Build-depend on libndesk-dbus1.0-cil, libndesk-dbus-glib1.0-cil
+    - Dropped libdbus-1-cil from build-depends
+
+ -- Luk Claes <luk@debian.org>  Sun, 13 Jan 2008 05:17:32 +0000
+
 muine (0.8.7-1.1) unstable; urgency=low
 
   * Non-Maintainer Upload (NMU)
only in patch2:
unchanged:
--- muine-0.8.7.orig/debian/patches/30_external-ndesk-dbus.patch
+++ muine-0.8.7/debian/patches/30_external-ndesk-dbus.patch
@@ -0,0 +1,102 @@
+diff -Naur muine-0.8.7-old/configure.in muine-0.8.7/configure.in
+--- muine-0.8.7-old/configure.in	2007-01-21 14:18:05.000000000 +0100
++++ muine-0.8.7/configure.in	2007-02-21 00:43:13.850651249 +0100
+@@ -76,6 +76,15 @@
+ 		  gconf-sharp-2.0 >= $GTKSHARP_REQUIRED \
+ 		  gnome-vfs-sharp-2.0 >= $GTKSHARP_REQUIRED)
+ 
++dnl external ndesk-dbus
++
++PKG_CHECK_MODULES(DBUS, ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3, have_external_dbus="yes", have_external_dbus="no")
++if test "x$have_external_dbus" != "xyes"; then
++	AC_MSG_RESULT([using internal copy])
++fi
++AM_CONDITIONAL(EXTERNAL_DBUS, test "x$have_external_dbus" = "xyes")
++
+ dnl check for OS
+ case "$target" in
+ 	*-*-linux*)
+diff -Naur muine-0.8.7-old/DBusLib/Makefile.am muine-0.8.7/DBusLib/Makefile.am
+--- muine-0.8.7-old/DBusLib/Makefile.am	2007-01-19 23:14:05.000000000 +0100
++++ muine-0.8.7/DBusLib/Makefile.am	2007-02-21 00:43:13.858651704 +0100
+@@ -9,9 +9,16 @@
+ 	$(srcdir)/Player.cs		\
+ 	$(srcdir)/AssemblyInfo.cs
+ 
++if EXTERNAL_DBUS
++DBUS_ASSEMBLIES = $(DBUS_LIBS)
++else
++DBUS_ASSEMBLIES =							\
++	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll
++endif
++
+ CLIENT_LIB_ASSEMBLIES = 						\
+ 	-r:$(top_builddir)/PluginLib/muine-plugin.dll			\
+-	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll
++	$(DBUS_ASSEMBLIES)
+ 
+ muine.snk: $(top_srcdir)/muine.snk
+ 	cp $(top_srcdir)/muine.snk .
+diff -Naur muine-0.8.7-old/deps/dbus-sharp/Makefile.am muine-0.8.7/deps/dbus-sharp/Makefile.am
+--- muine-0.8.7-old/deps/dbus-sharp/Makefile.am	2007-01-19 23:14:06.000000000 +0100
++++ muine-0.8.7/deps/dbus-sharp/Makefile.am	2007-02-21 00:43:34.263814527 +0100
+@@ -32,6 +32,7 @@
+ DBUSSHARP_ASSEMBLIES =		\
+ 	-r:Mono.Posix
+ 
++if !EXTERNAL_DBUS
+ $(ASSEMBLY): $(DBUSSHARP_CSFILES)
+ 	$(CSC) -t:library -unsafe $(LIBFLAGS) -out:$@ $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
+ 
+@@ -39,6 +40,7 @@
+ 
+ dbussharpdir = $(pkglibdir)
+ dbussharp_DATA = $(TARGET)
++endif
+ 
+ EXTRA_DIST = $(DBUSSHARP_CSFILES)
+ 
+diff -Naur muine-0.8.7-old/deps/dbus-sharp-glib/Makefile.am muine-0.8.7/deps/dbus-sharp-glib/Makefile.am
+--- muine-0.8.7-old/deps/dbus-sharp-glib/Makefile.am	2007-01-19 23:14:06.000000000 +0100
++++ muine-0.8.7/deps/dbus-sharp-glib/Makefile.am	2007-02-21 00:44:28.166886290 +0100
+@@ -12,6 +12,7 @@
+ DBUSSHARP_ASSEMBLIES =		\
+ 	-r:Mono.Posix
+ 
++if !EXTERNAL_DBUS
+ $(ASSEMBLY): $(DBUSSHARP_CSFILES)
+ 	$(CSC) -t:library $(LIBFLAGS) -out:$@ -r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
+ 
+@@ -19,6 +20,7 @@
+ 
+ dbussharpdir = $(pkglibdir)
+ dbussharp_DATA = $(TARGET) $(TARGET).config
++endif
+ 
+ EXTRA_DIST = $(DBUSSHARP_CSFILES)
+ 
+diff -Naur muine-0.8.7-old/src/Makefile.am muine-0.8.7/src/Makefile.am
+--- muine-0.8.7-old/src/Makefile.am	2007-01-20 22:00:33.000000000 +0100
++++ muine-0.8.7/src/Makefile.am	2007-02-21 00:43:14.010660366 +0100
+@@ -53,11 +53,18 @@
+ 	AmazonSearchService.cs			\
+ 	Defines.cs
+ 
++if EXTERNAL_DBUS
++DBUS_ASSEMBLIES = $(DBUS_LIBS)
++else
++DBUS_ASSEMBLIES =							\
++	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll		\
++	-r:$(top_builddir)/deps/dbus-sharp-glib/NDesk.DBus.GLib.dll
++endif
++
+ MUINE_ASSEMBLIES =							\
+ 	-r:$(top_builddir)/PluginLib/muine-plugin.dll			\
+ 	-r:$(top_builddir)/DBusLib/muine-dbus.dll			\
+-	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll		\
+-	-r:$(top_builddir)/deps/dbus-sharp-glib/NDesk.DBus.GLib.dll	\
++	$(DBUS_ASSEMBLIES)						\
+ 	-r:System.Web.Services						\
+ 	-r:Mono.Posix
+ 	
only in patch2:
unchanged:
--- muine-0.8.7.orig/debian/patches/99_autoreconf.patch
+++ muine-0.8.7/debian/patches/99_autoreconf.patch
@@ -0,0 +1,4756 @@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/aclocal.m4 muine-0.8.7/aclocal.m4
+--- muine-0.8.7-old/aclocal.m4	2007-01-21 16:51:18.000000000 +0100
++++ muine-0.8.7/aclocal.m4	2007-02-21 00:45:43.631186753 +0100
+@@ -990,7 +990,30 @@
+ 
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+-    
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
++                 return _nl_msg_cat_cntr],
++    [DATADIRNAME=share],
++    [case $host in
++    *-*-solaris*)
++    dnl On Solaris, if bind_textdomain_codeset is in libc,
++    dnl GNU format message catalog is always supported,
++    dnl since both are added to the libc all together.
++    dnl Hence, we'd like to go with DATADIRNAME=share
++    dnl in this case.
++    AC_CHECK_FUNC(bind_textdomain_codeset,
++      [DATADIRNAME=share], [DATADIRNAME=lib])
++    ;;
++    *)
++    [DATADIRNAME=lib]
++    ;;
++    esac])
++fi
++AC_SUBST(DATADIRNAME)
++
+ IT_PO_SUBDIR([po])
+ 
+ dnl The following is very similar to
+@@ -1082,7 +1105,7 @@
+ 
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+ 
+-# serial 48 AC_PROG_LIBTOOL
++# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
+ 
+ 
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -1288,14 +1311,6 @@
+     [pic_mode=default])
+ test -z "$pic_mode" && pic_mode=default
+ 
+-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
+-#
+-# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
+-#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
+-#        calls AC_LIBTOOL_CONFIG and creates libtool.
+-#
+-_LT_VERSION_CHECK
+-
+ # Use C for the default configuration in the libtool script
+ tagname=
+ AC_LIBTOOL_LANG_C_CONFIG
+@@ -1303,41 +1318,6 @@
+ ])# AC_LIBTOOL_SETUP
+ 
+ 
+-# _LT_VERSION_CHECK
+-# -----------------
+-AC_DEFUN([_LT_VERSION_CHECK],
+-[AC_MSG_CHECKING([for correct ltmain.sh version])
+-if test "x$ltmain" = "x" ; then
+-  AC_MSG_RESULT(no)
+-  AC_MSG_ERROR([
+-
+-*** @<:@Gentoo@:>@ sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-])
+-fi
+-gentoo_lt_version="1.5.22"
+-gentoo_ltmain_version=`sed -n '/^[[ 	]]*VERSION=/{s/^[[ 	]]*VERSION=//;p;q;}' "$ltmain"`
+-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
+-  AC_MSG_RESULT(no)
+-  AC_MSG_ERROR([
+-
+-*** @<:@Gentoo@:>@ sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+-
+-Please run:
+-
+-  libtoolize --copy --force
+-
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-])
+-else
+-  AC_MSG_RESULT(yes)
+-fi
+-])# _LT_VERSION_CHECK
+-
+-
+ # _LT_AC_SYS_COMPILER
+ # -------------------
+ AC_DEFUN([_LT_AC_SYS_COMPILER],
+@@ -2468,30 +2448,6 @@
+     esac
+     ;;
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        $archive_expsym_cmds="$archive_cmds"
+-      fi
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+@@ -2533,18 +2489,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -2556,14 +2500,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
+-  # Handle Gentoo/FreeBSD as it was Linux
+-  case $host_vendor in
+-    gentoo)
+-      version_type=linux ;;
+-    *)
+-      version_type=freebsd-$objformat ;;
+-  esac
+-
++  version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -2574,12 +2511,6 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+-    linux)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-      need_lib_prefix=no
+-      need_version=no
+-      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+@@ -2713,7 +2644,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2742,7 +2673,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -2751,7 +2682,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -3459,7 +3390,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -3513,11 +3444,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   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
+@@ -4265,7 +4196,7 @@
+   freebsd-elf*)
+     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+     ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -4424,7 +4355,7 @@
+     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+       KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -4526,7 +4457,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=
+@@ -5791,7 +5722,7 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   if test "$host_cpu" = ia64; then
+     symcode='[[ABCDGIRSTW]]'
+     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -6064,7 +5995,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -6107,7 +6038,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -6150,7 +6081,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -6361,7 +6292,7 @@
+       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+@@ -6502,6 +6433,9 @@
+   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'
+   ;;
+@@ -6672,7 +6606,7 @@
+       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -6698,12 +6632,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC -shared'"$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=
+@@ -7033,7 +6968,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -7135,7 +7070,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
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/configure muine-0.8.7/configure
+--- muine-0.8.7-old/configure	2007-01-21 16:51:21.000000000 +0100
++++ muine-0.8.7/configure	2007-02-21 00:45:46.891372540 +0100
+@@ -880,6 +880,7 @@
+ CCDEPMODE
+ am__fastdepCC_TRUE
+ am__fastdepCC_FALSE
++DATADIRNAME
+ CPP
+ GREP
+ EGREP
+@@ -919,6 +920,10 @@
+ MONO_LIBS
+ GTKSHARP_CFLAGS
+ GTKSHARP_LIBS
++DBUS_CFLAGS
++DBUS_LIBS
++EXTERNAL_DBUS_TRUE
++EXTERNAL_DBUS_FALSE
+ ENABLE_INOTIFY_TRUE
+ ENABLE_INOTIFY_FALSE
+ GCONFTOOL
+@@ -961,7 +966,6 @@
+ XGETTEXT
+ CATALOGS
+ CATOBJEXT
+-DATADIRNAME
+ GMOFILES
+ INSTOBJEXT
+ INTLLIBS
+@@ -997,6 +1001,8 @@
+ MONO_LIBS
+ GTKSHARP_CFLAGS
+ GTKSHARP_LIBS
++DBUS_CFLAGS
++DBUS_LIBS
+ ID3TAG_CFLAGS
+ ID3TAG_LIBS
+ MONODOC_CFLAGS
+@@ -1647,6 +1653,8 @@
+               C compiler flags for GTKSHARP, overriding pkg-config
+   GTKSHARP_LIBS
+               linker flags for GTKSHARP, overriding pkg-config
++  DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
++  DBUS_LIBS   linker flags for DBUS, overriding pkg-config
+   ID3TAG_CFLAGS
+               C compiler flags for ID3TAG, overriding pkg-config
+   ID3TAG_LIBS linker flags for ID3TAG, overriding pkg-config
+@@ -2660,99 +2668,95 @@
+ 
+ 
+ 
++DEPDIR="${am__leading_dot}deps"
+ 
+-case "$am__api_version" in
+-    1.01234)
+-	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-    ;;
+-    *)
+-    ;;
+-esac
+-
+-if test -n "0.21"; then
+-    { echo "$as_me:$LINENO: checking for intltool >= 0.21" >&5
+-echo $ECHO_N "checking for intltool >= 0.21... $ECHO_C" >&6; }
++ac_config_commands="$ac_config_commands depfiles"
+ 
+-    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.21 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+-    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+-    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ 
+-    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+-    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+-	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.21 or later." >&5
+-echo "$as_me: error: Your intltool is too old.  You need intltool 0.21 or later." >&2;}
+-   { (exit 1); exit 1; }; }
++am_make=${MAKE-make}
++cat > confinc << 'END'
++am__doit:
++	@echo done
++.PHONY: am__doit
++END
++# If we don't find an include directive, just comment out the code.
++{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
+ fi
+-
+-  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
+-     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+-      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ 
+ 
++{ echo "$as_me:$LINENO: result: $_am_result" >&5
++echo "${ECHO_T}$_am_result" >&6; }
++rm -f confinc confmf
+ 
++# Check whether --enable-dependency-tracking was given.
++if test "${enable_dependency_tracking+set}" = set; then
++  enableval=$enable_dependency_tracking;
++fi
+ 
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
+ 
+-# Use the tools built into the package, not the ones that are installed.
+-INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
+ 
+-INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
++if test "x$enable_dependency_tracking" != xno; then
++  AMDEP_TRUE=
++  AMDEP_FALSE='#'
++else
++  AMDEP_TRUE='#'
++  AMDEP_FALSE=
++fi
+ 
+-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
+ 
+ 
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++if test -n "$ac_tool_prefix"; then
++  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}gcc; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $INTLTOOL_PERL in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
++    ac_cv_prog_CC="${ac_tool_prefix}gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -2760,62 +2764,39 @@
+ done
+ IFS=$as_save_IFS
+ 
+-  ;;
+-esac
+ fi
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+-  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
+ else
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
+ 
+-if test -z "$INTLTOOL_PERL"; then
+-   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+-echo "$as_me: error: perl not found; required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+-   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+-echo "$as_me: error: perl 5.x required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-if test "x" != "xno-xml"; then
+-   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       { echo "$as_me:$LINENO: result: ok" >&5
+-echo "${ECHO_T}ok" >&6; }
+-   else
+-       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-   fi
+ fi
+-
+-# Extract the first word of "iconv", so it can be a program name with args.
+-set dummy iconv; ac_word=$2
++if test -z "$ac_cv_prog_CC"; then
++  ac_ct_CC=$CC
++  # Extract the first word of "gcc", so it can be a program name with args.
++set dummy gcc; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $INTLTOOL_ICONV in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
++    ac_cv_prog_ac_ct_CC="gcc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -2823,40 +2804,56 @@
+ done
+ IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
+-  ;;
+-esac
+ fi
+-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
+-if test -n "$INTLTOOL_ICONV"; then
+-  { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
++fi
++ac_ct_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
+ else
+   { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ fi
+ 
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  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
++    CC=$ac_ct_CC
++  fi
++else
++  CC="$ac_cv_prog_CC"
++fi
+ 
+-# Extract the first word of "msgfmt", so it can be a program name with args.
+-set dummy msgfmt; ac_word=$2
++if test -z "$CC"; then
++          if test -n "$ac_tool_prefix"; then
++    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
++set dummy ${ac_tool_prefix}cc; ac_word=$2
+ { echo "$as_me:$LINENO: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $INTLTOOL_MSGFMT in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
++    ac_cv_prog_CC="${ac_tool_prefix}cc"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+@@ -2864,23 +2861,1121 @@
+ done
+ IFS=$as_save_IFS
+ 
+-  test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
+-  ;;
+-esac
+ fi
+-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
+-if test -n "$INTLTOOL_MSGFMT"; then
+-  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&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
++  fi
++fi
++if test -z "$CC"; then
++  # Extract the first word of "cc", so it can be a program name with args.
++set dummy cc; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # Let the user override the test.
++else
++  ac_prog_rejected=no
++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
++    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
++       ac_prog_rejected=yes
++       continue
++     fi
++    ac_cv_prog_CC="cc"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++if test $ac_prog_rejected = yes; then
++  # We found a bogon in the path, so make sure we never use it.
++  set dummy $ac_cv_prog_CC
++  shift
++  if test $# != 0; then
++    # We chose a different compiler from the bogus one.
++    # However, it has the same basename, so the bogon will be chosen
++    # first if we set CC to just the basename; use the full file name.
++    shift
++    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
++  fi
++fi
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++fi
++if test -z "$CC"; then
++  if test -n "$ac_tool_prefix"; then
++  for ac_prog in cl.exe
++  do
++    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
++set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++{ echo "$as_me:$LINENO: checking for $ac_word" >&5
++echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
++if test "${ac_cv_prog_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$CC"; then
++  ac_cv_prog_CC="$CC" # 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_CC="$ac_tool_prefix$ac_prog"
++    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    break 2
++  fi
++done
++done
++IFS=$as_save_IFS
++
++fi
++fi
++CC=$ac_cv_prog_CC
++if test -n "$CC"; then
++  { echo "$as_me:$LINENO: result: $CC" >&5
++echo "${ECHO_T}$CC" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++    test -n "$CC" && break
++  done
++fi
++if test -z "$CC"; then
++  ac_ct_CC=$CC
++  for ac_prog in cl.exe
++do
++  # Extract the first word of "$ac_prog", so it can be a program name with args.
++set dummy $ac_prog; 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_CC+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -n "$ac_ct_CC"; then
++  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # 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_CC="$ac_prog"
++    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_CC=$ac_cv_prog_ac_ct_CC
++if test -n "$ac_ct_CC"; then
++  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++echo "${ECHO_T}$ac_ct_CC" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++  test -n "$ac_ct_CC" && break
++done
++
++  if test "x$ac_ct_CC" = x; then
++    CC=""
++  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
++    CC=$ac_ct_CC
++  fi
++fi
++
++fi
++
++
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&5
++echo "$as_me: error: no acceptable C compiler found in \$PATH
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++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_compiler --version >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -v >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++  (eval "$ac_compiler -V >&5") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }
++
++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
++ac_clean_files_save=$ac_clean_files
++ac_clean_files="$ac_clean_files a.out a.exe b.out"
++# Try to create an executable without -o first, disregard a.out.
++# It will help us diagnose broken compilers, and finding out an intuition
++# of exeext.
++{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
++echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
++ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
++#
++# List of possible output files, starting from the most likely.
++# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
++# only as a last resort.  b.out is created by i960 compilers.
++ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
++#
++# The IRIX 6 linker writes into existing files which may not be
++# executable, retaining their permissions.  Remove them first so a
++# subsequent execution test works.
++ac_rmfiles=
++for ac_file in $ac_files
++do
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
++  esac
++done
++rm -f $ac_rmfiles
++
++if { (ac_try="$ac_link_default"
++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_default") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
++# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
++# in a Makefile.  We should not override ac_cv_exeext if it was cached,
++# so that the user can short-circuit this test for compilers unknown to
++# Autoconf.
++for ac_file in $ac_files ''
++do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
++	;;
++    [ab].out )
++	# We found the default executable, but exeext='' is most
++	# certainly right.
++	break;;
++    *.* )
++        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	then :; else
++	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	fi
++	# We set ac_cv_exeext here because the later test for it is not
++	# safe: cross compilers may not add the suffix if given an `-o'
++	# argument, so we may need to know it at that point already.
++	# Even if this section looks crufty: it has the advantage of
++	# actually working.
++	break;;
++    * )
++	break;;
++  esac
++done
++test "$ac_cv_exeext" = no && ac_cv_exeext=
++
++else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++See \`config.log' for more details." >&5
++echo "$as_me: error: C compiler cannot create executables
++See \`config.log' for more details." >&2;}
++   { (exit 77); exit 77; }; }
++fi
++
++ac_exeext=$ac_cv_exeext
++
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
++echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
++# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
++# If not cross compiling, check that we can run a simple program.
++if test "$cross_compiling" != yes; then
++  if { ac_try='./$ac_file'
++  { (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_try") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++    fi
++  fi
++fi
++{ echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++
++rm -f a.out a.exe conftest$ac_cv_exeext b.out
++ac_clean_files=$ac_clean_files_save
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
++echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
++echo "${ECHO_T}$cross_compiling" >&6; }
++
++{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
++echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
++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>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  # If both `conftest.exe' and `conftest' are `present' (well, observable)
++# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
++# work properly (i.e., refer to `conftest.exe'), while it won't with
++# `rm'.
++for ac_file in conftest.exe conftest conftest.*; do
++  test -f "$ac_file" || continue
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
++    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
++	  break;;
++    * ) break;;
++  esac
++done
++else
++  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest$ac_cv_exeext
++{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++echo "${ECHO_T}$ac_cv_exeext" >&6; }
++
++rm -f conftest.$ac_ext
++EXEEXT=$ac_cv_exeext
++ac_exeext=$EXEEXT
++{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
++echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
++if test "${ac_cv_objext+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  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.o conftest.obj
++if { (ac_try="$ac_compile"
++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_compile") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  for ac_file in conftest.o conftest.obj conftest.*; do
++  test -f "$ac_file" || continue;
++  case $ac_file in
++    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
++    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
++       break;;
++  esac
++done
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&5
++echo "$as_me: error: cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++rm -f conftest.$ac_cv_objext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++echo "${ECHO_T}$ac_cv_objext" >&6; }
++OBJEXT=$ac_cv_objext
++ac_objext=$OBJEXT
++{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
++if test "${ac_cv_c_compiler_gnu+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++#ifndef __GNUC__
++       choke me
++#endif
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++  ac_compiler_gnu=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_compiler_gnu=no
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ac_cv_c_compiler_gnu=$ac_compiler_gnu
++
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
++GCC=`test $ac_compiler_gnu = yes && echo yes`
++ac_test_CFLAGS=${CFLAGS+set}
++ac_save_CFLAGS=$CFLAGS
++{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_g+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_save_c_werror_flag=$ac_c_werror_flag
++   ac_c_werror_flag=yes
++   ac_cv_prog_cc_g=no
++   CFLAGS="-g"
++   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
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	CFLAGS=""
++      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
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++  :
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 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
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++  ac_cv_prog_cc_g=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++   ac_c_werror_flag=$ac_save_c_werror_flag
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
++if test "$ac_test_CFLAGS" = set; then
++  CFLAGS=$ac_save_CFLAGS
++elif test $ac_cv_prog_cc_g = yes; then
++  if test "$GCC" = yes; then
++    CFLAGS="-g -O2"
++  else
++    CFLAGS="-g"
++  fi
++else
++  if test "$GCC" = yes; then
++    CFLAGS="-O2"
++  else
++    CFLAGS=
++  fi
++fi
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_cv_prog_cc_c89=no
++ac_save_CC=$CC
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++#include <stdarg.h>
++#include <stdio.h>
++#include <sys/types.h>
++#include <sys/stat.h>
++/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
++struct buf { int x; };
++FILE * (*rcsopen) (struct buf *, struct stat *, int);
++static char *e (p, i)
++     char **p;
++     int i;
++{
++  return p[i];
++}
++static char *f (char * (*g) (char **, int), char **p, ...)
++{
++  char *s;
++  va_list v;
++  va_start (v,p);
++  s = g (p, va_arg (v,int));
++  va_end (v);
++  return s;
++}
++
++/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
++   function prototypes and stuff, but not '\xHH' hex character constants.
++   These don't provoke an error unfortunately, instead are silently treated
++   as 'x'.  The following induces an error, until -std is added to get
++   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
++   array size at least.  It's necessary to write '\x00'==0 to get something
++   that's true only with -std.  */
++int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
++int test (int i, double x);
++struct s1 {int (*f) (int a);};
++struct s2 {int (*f) (double a);};
++int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
++int argc;
++char **argv;
++int
++main ()
++{
++return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++  ;
++  return 0;
++}
++_ACEOF
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
++do
++  CC="$ac_save_CC $ac_arg"
++  rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++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_compile") 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_objext; then
++  ac_cv_prog_cc_c89=$ac_arg
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
++fi
++
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
++done
++rm -f conftest.$ac_ext
++CC=$ac_save_CC
++
++fi
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
++  *)
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
++esac
++
++
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
++ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
++ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
++ac_compiler_gnu=$ac_cv_c_compiler_gnu
++
++depcc="$CC"   am_compiler_list=
++
++{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # using a relative directory.
++  cp "$am_depcomp" conftest.dir
++  cd conftest.dir
++  # We will build objects and dependencies in a subdirectory because
++  # it helps to detect inapplicable dependency modes.  For instance
++  # both Tru64's cc and ICC support -MD to output dependencies as a
++  # side effect of compilation, but ICC will put the dependencies in
++  # the current directory while Tru64 will put them in the object
++  # directory.
++  mkdir sub
++
++  am_cv_CC_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
++  fi
++  for depmode in $am_compiler_list; do
++    # Setup a source with many dependencies, because some compilers
++    # like to wrap large dependency lists on column 80 (with \), and
++    # we should not choose a depcomp mode which is confused by this.
++    #
++    # We need to recreate these files for each test, as the compiler may
++    # overwrite some of them when testing with obscure command lines.
++    # This happens at least with the AIX C compiler.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      : > sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/dev/null 2>conftest.err &&
++       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
++       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
++       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored.
++      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
++        am_cv_CC_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_CC_dependencies_compiler_type=none
++fi
++
++fi
++{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
++CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
++
++
++
++if
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
++  am__fastdepCC_TRUE=
++  am__fastdepCC_FALSE='#'
++else
++  am__fastdepCC_TRUE='#'
++  am__fastdepCC_FALSE=
++fi
++
++
++
++
++case "$am__api_version" in
++    1.01234)
++	{ { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
++echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
++   { (exit 1); exit 1; }; }
++    ;;
++    *)
++    ;;
++esac
++
++if test -n "0.21"; then
++    { echo "$as_me:$LINENO: checking for intltool >= 0.21" >&5
++echo $ECHO_N "checking for intltool >= 0.21... $ECHO_C" >&6; }
++
++    INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.21 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
++    INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
++    INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
++
++    { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
++    test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
++	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.21 or later." >&5
++echo "$as_me: error: Your intltool is too old.  You need intltool 0.21 or later." >&2;}
++   { (exit 1); exit 1; }; }
++fi
++
++  INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++     INTLTOOL_KEYS_RULE='%.keys:      %.keys.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++     INTLTOOL_PROP_RULE='%.prop:      %.prop.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_OAF_RULE='%.oaf:       %.oaf.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< $@'
++     INTLTOOL_PONG_RULE='%.pong:      %.pong.in      $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++   INTLTOOL_SERVER_RULE='%.server:    %.server.in    $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_SHEET_RULE='%.sheet:     %.sheet.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++       INTLTOOL_UI_RULE='%.ui:        %.ui.in        $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_XML_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_XML_NOMERGE_RULE='%.xml:       %.xml.in       $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
++      INTLTOOL_XAM_RULE='%.xam:       %.xml.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++      INTLTOOL_KBD_RULE='%.kbd:       %.kbd.in       $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_CAVES_RULE='%.caves:     %.caves.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++  INTLTOOL_SCHEMAS_RULE='%.schemas:   %.schemas.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_THEME_RULE='%.theme:     %.theme.in     $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++    INTLTOOL_SERVICE_RULE='%.service: %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++
++# Use the tools built into the package, not the ones that are installed.
++INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
++
++INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
++
++INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
++
++
++# Extract the first word of "perl", so it can be a program name with args.
++set dummy perl; 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_INTLTOOL_PERL+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $INTLTOOL_PERL in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # 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_INTLTOOL_PERL="$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
++INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
++if test -n "$INTLTOOL_PERL"; then
++  { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++if test -z "$INTLTOOL_PERL"; then
++   { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
++echo "$as_me: error: perl not found; required for intltool" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
++   { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
++echo "$as_me: error: perl 5.x required for intltool" >&2;}
++   { (exit 1); exit 1; }; }
++fi
++if test "x" != "xno-xml"; then
++   { echo "$as_me:$LINENO: checking for XML::Parser" >&5
++echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
++   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++       { echo "$as_me:$LINENO: result: ok" >&5
++echo "${ECHO_T}ok" >&6; }
++   else
++       { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
++echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
++   { (exit 1); exit 1; }; }
++   fi
++fi
++
++# Extract the first word of "iconv", so it can be a program name with args.
++set dummy iconv; 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_INTLTOOL_ICONV+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $INTLTOOL_ICONV in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # 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_INTLTOOL_ICONV="$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
++
++  test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
++  ;;
++esac
++fi
++INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
++if test -n "$INTLTOOL_ICONV"; then
++  { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
++echo "${ECHO_T}$INTLTOOL_ICONV" >&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_INTLTOOL_MSGFMT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $INTLTOOL_MSGFMT in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_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_INTLTOOL_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
++
++  test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
++  ;;
++esac
++fi
++INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
++if test -n "$INTLTOOL_MSGFMT"; then
++  { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
++echo "${ECHO_T}$INTLTOOL_MSGFMT" >&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_INTLTOOL_MSGMERGE+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -2914,54 +4009,197 @@
+   { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+ echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
+ else
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-fi
+-
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++# 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_INTLTOOL_XGETTEXT+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  case $INTLTOOL_XGETTEXT in
++  [\\/]* | ?:[\\/]*)
++  ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_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_INTLTOOL_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
++
++  test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
++  ;;
++esac
++fi
++INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
++if test -n "$INTLTOOL_XGETTEXT"; then
++  { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
++echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
++else
++  { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++fi
++
++
++
++# Substitute ALL_LINGUAS so we can use it in po/Makefile
++
++
++# Set DATADIRNAME correctly if it is not set yet
++# (copied from glib-gettext.m4)
++if test -z "$DATADIRNAME"; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++extern int _nl_msg_cat_cntr;
++                 return _nl_msg_cat_cntr
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) 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
++  DATADIRNAME=share
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-# 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_INTLTOOL_XGETTEXT+set}" = set; then
++	case $host in
++    *-*-solaris*)
++                        { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
++echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
++if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  case $INTLTOOL_XGETTEXT in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_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_INTLTOOL_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
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+ 
+-  test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+-  ;;
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char bind_textdomain_codeset (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef bind_textdomain_codeset
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char bind_textdomain_codeset ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
++choke me
++#endif
++
++int
++main ()
++{
++return bind_textdomain_codeset ();
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
+ esac
+-fi
+-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
+-if test -n "$INTLTOOL_XGETTEXT"; then
+-  { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
++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
++  ac_cv_func_bind_textdomain_codeset=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
++
++	ac_cv_func_bind_textdomain_codeset=no
+ fi
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
++echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
++if test $ac_cv_func_bind_textdomain_codeset = yes; then
++  DATADIRNAME=share
++else
++  DATADIRNAME=lib
++fi
+ 
++    ;;
++    *)
++    DATADIRNAME=lib
++    ;;
++    esac
++fi
+ 
+-# Substitute ALL_LINGUAS so we can use it in po/Makefile
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++      conftest$ac_exeext conftest.$ac_ext
++fi
+ 
+ 
+ 
+@@ -3270,297 +4508,54 @@
+ 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
+-    CC=$ac_ct_CC
+-  fi
+-fi
+-
+-fi
+-
+-
+-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-
+-# Provide some information about the compiler.
+-echo "$as_me:$LINENO: checking for C compiler version" >&5
+-ac_compiler=`set X $ac_compile; echo $2`
+-{ (ac_try="$ac_compiler --version >&5"
+-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_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -v >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-
+-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
+-ac_clean_files_save=$ac_clean_files
+-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+-# Try to create an executable without -o first, disregard a.out.
+-# It will help us diagnose broken compilers, and finding out an intuition
+-# of exeext.
+-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
+-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+-#
+-# List of possible output files, starting from the most likely.
+-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
+-# only as a last resort.  b.out is created by i960 compilers.
+-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
+-#
+-# The IRIX 6 linker writes into existing files which may not be
+-# executable, retaining their permissions.  Remove them first so a
+-# subsequent execution test works.
+-ac_rmfiles=
+-for ac_file in $ac_files
+-do
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+-    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
+-  esac
+-done
+-rm -f $ac_rmfiles
+-
+-if { (ac_try="$ac_link_default"
+-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_default") 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+-# in a Makefile.  We should not override ac_cv_exeext if it was cached,
+-# so that the user can short-circuit this test for compilers unknown to
+-# Autoconf.
+-for ac_file in $ac_files ''
+-do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+-	;;
+-    [ab].out )
+-	# We found the default executable, but exeext='' is most
+-	# certainly right.
+-	break;;
+-    *.* )
+-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+-	then :; else
+-	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	fi
+-	# We set ac_cv_exeext here because the later test for it is not
+-	# safe: cross compilers may not add the suffix if given an `-o'
+-	# argument, so we may need to know it at that point already.
+-	# Even if this section looks crufty: it has the advantage of
+-	# actually working.
+-	break;;
+-    * )
+-	break;;
+-  esac
+-done
+-test "$ac_cv_exeext" = no && ac_cv_exeext=
++esac
++    CC=$ac_ct_CC
++  fi
++fi
+ 
+-else
+-  ac_file=''
+ fi
+ 
+-{ echo "$as_me:$LINENO: result: $ac_file" >&5
+-echo "${ECHO_T}$ac_file" >&6; }
+-if test -z "$ac_file"; then
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
++test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&5
+-echo "$as_me: error: C compiler cannot create executables
++echo "$as_me: error: no acceptable C compiler found in \$PATH
+ See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }
+-fi
+-
+-ac_exeext=$ac_cv_exeext
++   { (exit 1); exit 1; }; }
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { (case "(($ac_try" in
++# Provide some information about the compiler.
++echo "$as_me:$LINENO: checking for C compiler version" >&5
++ac_compiler=`set X $ac_compile; echo $2`
++{ (ac_try="$ac_compiler --version >&5"
++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_try") 2>&5
++  (eval "$ac_compiler --version >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-    fi
+-  fi
+-fi
+-{ echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
+-
+-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+-ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
+-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-echo "${ECHO_T}$cross_compiling" >&6; }
+-
+-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
+-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+-if { (ac_try="$ac_link"
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -v >&5"
+ 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>&5
++  (eval "$ac_compiler -v >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
+-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+-# work properly (i.e., refer to `conftest.exe'), while it won't with
+-# `rm'.
+-for ac_file in conftest.exe conftest conftest.*; do
+-  test -f "$ac_file" || continue
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+-	  break;;
+-    * ) break;;
+-  esac
+-done
+-else
+-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+-
+-rm -f conftest.$ac_ext
+-EXEEXT=$ac_cv_exeext
+-ac_exeext=$EXEEXT
+-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
+-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+-if test "${ac_cv_objext+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  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.o conftest.obj
+-if { (ac_try="$ac_compile"
++  (exit $ac_status); }
++{ (ac_try="$ac_compiler -V >&5"
+ 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_compile") 2>&5
++  (eval "$ac_compiler -V >&5") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  for ac_file in conftest.o conftest.obj conftest.*; do
+-  test -f "$ac_file" || continue;
+-  case $ac_file in
+-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
+-       break;;
+-  esac
+-done
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
++  (exit $ac_status); }
+ 
+-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+-fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+-echo "${ECHO_T}$ac_cv_objext" >&6; }
+-OBJEXT=$ac_cv_objext
+-ac_objext=$OBJEXT
+ { echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+ echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+ if test "${ac_cv_c_compiler_gnu+set}" = set; then
+@@ -3890,71 +4885,6 @@
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+-DEPDIR="${am__leading_dot}deps"
+-
+-ac_config_commands="$ac_config_commands depfiles"
+-
+-
+-am_make=${MAKE-make}
+-cat > confinc << 'END'
+-am__doit:
+-	@echo done
+-.PHONY: am__doit
+-END
+-# If we don't find an include directive, just comment out the code.
+-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+-am__include="#"
+-am__quote=
+-_am_result=none
+-# First try GNU make style include.
+-echo "include confinc" > confmf
+-# We grep out `Entering directory' and `Leaving directory'
+-# messages which can occur if `w' ends up in MAKEFLAGS.
+-# In particular we don't look at `^make:' because GNU make might
+-# be invoked under some other name (usually "gmake"), in which
+-# case it prints its new name instead of `make'.
+-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+-   am__include=include
+-   am__quote=
+-   _am_result=GNU
+-fi
+-# Now try BSD make style include.
+-if test "$am__include" = "#"; then
+-   echo '.include "confinc"' > confmf
+-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+-      am__include=.include
+-      am__quote="\""
+-      _am_result=BSD
+-   fi
+-fi
+-
+-
+-{ echo "$as_me:$LINENO: result: $_am_result" >&5
+-echo "${ECHO_T}$_am_result" >&6; }
+-rm -f confinc confmf
+-
+-# Check whether --enable-dependency-tracking was given.
+-if test "${enable_dependency_tracking+set}" = set; then
+-  enableval=$enable_dependency_tracking;
+-fi
+-
+-if test "x$enable_dependency_tracking" != xno; then
+-  am_depcomp="$ac_aux_dir/depcomp"
+-  AMDEPBACKSLASH='\'
+-fi
+-
+-
+-if test "x$enable_dependency_tracking" != xno; then
+-  AMDEP_TRUE=
+-  AMDEP_FALSE='#'
+-else
+-  AMDEP_TRUE='#'
+-  AMDEP_FALSE=
+-fi
+-
+-
+-
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+@@ -4058,7 +4988,6 @@
+ fi
+ 
+ 
+-
+ { echo "$as_me:$LINENO: checking for library containing strerror" >&5
+ echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6; }
+ if test "${ac_cv_search_strerror+set}" = set; then
+@@ -5085,7 +6014,7 @@
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu | dragonfly*)
++freebsd* | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+@@ -5139,11 +6068,11 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   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
+@@ -5259,7 +6188,7 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 5262 "configure"' > conftest.$ac_ext
++  echo '#line 6191 "configure"' > conftest.$ac_ext
+   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+@@ -6768,7 +7697,7 @@
+   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+   ;;
+-linux*)
++linux* | k*bsd*-gnu)
+   if test "$host_cpu" = ia64; then
+     symcode='[ABCDGIRSTW]'
+     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+@@ -7482,85 +8411,24 @@
+ esac
+ 
+ enable_dlopen=no
+-enable_win32_dll=no
+-
+-# Check whether --enable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval=$enable_libtool_lock;
+-fi
+-
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+-
+-
+-# Check whether --with-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval=$with_pic; pic_mode="$withval"
+-else
+-  pic_mode=default
+-fi
+-
+-test -z "$pic_mode" && pic_mode=default
+-
+-# Check if we have a version mismatch between libtool.m4 and ltmain.sh.
+-#
+-# Note:  This should be in AC_LIBTOOL_SETUP, _after_ $ltmain have been defined.
+-#        We also should do it _before_ AC_LIBTOOL_LANG_C_CONFIG that actually
+-#        calls AC_LIBTOOL_CONFIG and creates libtool.
+-#
+-{ echo "$as_me:$LINENO: checking for correct ltmain.sh version" >&5
+-echo $ECHO_N "checking for correct ltmain.sh version... $ECHO_C" >&6; }
+-if test "x$ltmain" = "x" ; then
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-  { { echo "$as_me:$LINENO: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-" >&5
+-echo "$as_me: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** \$ltmain is not defined, please check the patch for consistency! ***
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-gentoo_lt_version="1.5.22"
+-gentoo_ltmain_version=`sed -n '/^[ 	]*VERSION=/{s/^[ 	]*VERSION=//;p;q;}' "$ltmain"`
+-if test "x$gentoo_lt_version" != "x$gentoo_ltmain_version" ; then
+-  { echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6; }
+-  { { echo "$as_me:$LINENO: error:
+-
+-*** [Gentoo] sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
+-
+-Please run:
+-
+-  libtoolize --copy --force
+-
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-" >&5
+-echo "$as_me: error:
++enable_win32_dll=no
+ 
+-*** [Gentoo] sanity check failed! ***
+-*** libtool.m4 and ltmain.sh have a version mismatch! ***
+-*** (libtool.m4 = $gentoo_lt_version, ltmain.sh = $gentoo_ltmain_version) ***
++# Check whether --enable-libtool-lock was given.
++if test "${enable_libtool_lock+set}" = set; then
++  enableval=$enable_libtool_lock;
++fi
+ 
+-Please run:
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-  libtoolize --copy --force
+ 
+-if appropriate, please contact the maintainer of this
+-package (or your distribution) for help.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++# Check whether --with-pic was given.
++if test "${with_pic+set}" = set; then
++  withval=$with_pic; pic_mode="$withval"
+ else
+-  { echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6; }
++  pic_mode=default
+ fi
+ 
++test -z "$pic_mode" && pic_mode=default
+ 
+ # Use C for the default configuration in the libtool script
+ tagname=
+@@ -7635,11 +8503,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:7638: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8506: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7642: \$? = $ac_status" >&5
++   echo "$as_me:8510: \$? = $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.
+@@ -7797,7 +8665,7 @@
+       lt_prog_compiler_static='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl='-Wl,'
+@@ -7903,11 +8771,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:7906: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8774: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:7910: \$? = $ac_status" >&5
++   echo "$as_me:8778: \$? = $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.
+@@ -8007,11 +8875,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:8010: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8878: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:8014: \$? = $ac_status" >&5
++   echo "$as_me:8882: \$? = $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
+@@ -8236,7 +9104,7 @@
+       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -8262,12 +9130,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC -shared'"$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=
+@@ -8695,7 +9564,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+@@ -8797,7 +9666,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
+@@ -9246,30 +10115,6 @@
+     esac
+     ;;
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        $archive_expsym_cmds="$archive_cmds"
+-      fi
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+@@ -9311,18 +10156,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -9334,14 +10167,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
+-  # Handle Gentoo/FreeBSD as it was Linux
+-  case $host_vendor in
+-    gentoo)
+-      version_type=linux ;;
+-    *)
+-      version_type=freebsd-$objformat ;;
+-  esac
+-
++  version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -9352,12 +10178,6 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+-    linux)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-      need_lib_prefix=no
+-      need_version=no
+-      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+@@ -9491,7 +10311,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9520,7 +10340,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -9529,7 +10349,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -10352,7 +11172,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10355 "configure"
++#line 11175 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -10452,7 +11272,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 10455 "configure"
++#line 11275 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11765,7 +12585,7 @@
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu | dragonfly*)
++  freebsd* | dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -11924,7 +12744,7 @@
+     hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
+     hardcode_libdir_separator_CXX=:
+     ;;
+-  linux*)
++  linux* | k*bsd*-gnu)
+     case $cc_basename in
+       KCC*)
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+@@ -12026,7 +12846,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=
+@@ -12593,7 +13413,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu | dragonfly*)
++      freebsd* | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -12636,7 +13456,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      linux*)
++      linux* | k*bsd*-gnu)
+ 	case $cc_basename in
+ 	  KCC*)
+ 	    # KAI C++ Compiler
+@@ -12679,7 +13499,7 @@
+ 	    ;;
+ 	esac
+ 	;;
+-      netbsd*)
++      netbsd* | netbsdelf*-gnu)
+ 	;;
+       osf3* | osf4* | osf5*)
+ 	case $cc_basename in
+@@ -12788,11 +13608,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:12791: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13611: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12795: \$? = $ac_status" >&5
++   echo "$as_me:13615: \$? = $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.
+@@ -12892,11 +13712,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:12895: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13715: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12899: \$? = $ac_status" >&5
++   echo "$as_me:13719: \$? = $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
+@@ -12964,6 +13784,9 @@
+   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'
+   ;;
+@@ -13202,30 +14025,6 @@
+     esac
+     ;;
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        $archive_expsym_cmds="$archive_cmds"
+-      fi
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+@@ -13267,18 +14066,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -13290,14 +14077,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
+-  # Handle Gentoo/FreeBSD as it was Linux
+-  case $host_vendor in
+-    gentoo)
+-      version_type=linux ;;
+-    *)
+-      version_type=freebsd-$objformat ;;
+-  esac
+-
++  version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -13308,12 +14088,6 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+-    linux)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-      need_lib_prefix=no
+-      need_version=no
+-      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+@@ -13447,7 +14221,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13476,7 +14250,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -13485,7 +14259,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -14393,7 +15167,7 @@
+       lt_prog_compiler_static_F77='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_F77='-Wl,'
+@@ -14499,11 +15273,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:14502: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15276: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:14506: \$? = $ac_status" >&5
++   echo "$as_me:15280: \$? = $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.
+@@ -14603,11 +15377,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:14606: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15380: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:14610: \$? = $ac_status" >&5
++   echo "$as_me:15384: \$? = $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
+@@ -14832,7 +15606,7 @@
+       archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -14858,12 +15632,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC -shared'"$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=
+@@ -15271,7 +16046,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+@@ -15373,7 +16148,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
+@@ -15822,30 +16597,6 @@
+     esac
+     ;;
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        $archive_expsym_cmds="$archive_cmds"
+-      fi
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+@@ -15887,18 +16638,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -15910,14 +16649,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
+-  # Handle Gentoo/FreeBSD as it was Linux
+-  case $host_vendor in
+-    gentoo)
+-      version_type=linux ;;
+-    *)
+-      version_type=freebsd-$objformat ;;
+-  esac
+-
++  version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -15928,12 +16660,6 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+-    linux)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-      need_lib_prefix=no
+-      need_version=no
+-      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+@@ -16067,7 +16793,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16096,7 +16822,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -16105,7 +16831,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -16838,11 +17564,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:16841: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17567: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:16845: \$? = $ac_status" >&5
++   echo "$as_me:17571: \$? = $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.
+@@ -17000,7 +17726,7 @@
+       lt_prog_compiler_static_GCJ='-Bstatic'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       case $cc_basename in
+       icc* | ecc*)
+ 	lt_prog_compiler_wl_GCJ='-Wl,'
+@@ -17106,11 +17832,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:17109: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17835: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:17113: \$? = $ac_status" >&5
++   echo "$as_me:17839: \$? = $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.
+@@ -17210,11 +17936,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:17213: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17939: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:17217: \$? = $ac_status" >&5
++   echo "$as_me:17943: \$? = $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
+@@ -17439,7 +18165,7 @@
+       archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+       ;;
+ 
+-    linux*)
++    linux* | k*bsd*-gnu)
+       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+ 	tmp_addflag=
+ 	case $cc_basename,$host_cpu in
+@@ -17465,12 +18191,13 @@
+   $echo "local: *; };" >> $output_objdir/$libname.ver~
+ 	  $CC -shared'"$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=
+@@ -17898,7 +18625,7 @@
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu | dragonfly*)
++    freebsd* | dragonfly*)
+       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+@@ -18000,7 +18727,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
+@@ -18449,30 +19176,6 @@
+     esac
+     ;;
+ 
+-  linux*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      supports_anon_versioning=no
+-      case `$LD -v 2>/dev/null` in
+-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
+-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+-        *\ 2.11.*) ;; # other 2.11 versions
+-        *) supports_anon_versioning=yes ;;
+-      esac
+-      if test $supports_anon_versioning = yes; then
+-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
+-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+-$echo "local: *; };" >> $output_objdir/$libname.ver~
+-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+-      else
+-        $archive_expsym_cmds="$archive_cmds"
+-      fi
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+   *)
+     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+@@ -18514,18 +19217,6 @@
+   dynamic_linker=no
+   ;;
+ 
+-kfreebsd*-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='GNU ld.so'
+-  ;;
+-
+ freebsd* | dragonfly*)
+   # DragonFly does not have aout.  When/if they implement a new
+   # versioning mechanism, adjust this.
+@@ -18537,14 +19228,7 @@
+     *) objformat=elf ;;
+     esac
+   fi
+-  # Handle Gentoo/FreeBSD as it was Linux
+-  case $host_vendor in
+-    gentoo)
+-      version_type=linux ;;
+-    *)
+-      version_type=freebsd-$objformat ;;
+-  esac
+-
++  version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+       library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+@@ -18555,12 +19239,6 @@
+       library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+-    linux)
+-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+-      soname_spec='${libname}${release}${shared_ext}$major'
+-      need_lib_prefix=no
+-      need_version=no
+-      ;;
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+@@ -18694,7 +19372,7 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -18723,7 +19401,7 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
+-knetbsd*-gnu)
++netbsdelf*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+@@ -18732,7 +19410,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+   hardcode_into_libs=yes
+-  dynamic_linker='GNU ld.so'
++  dynamic_linker='NetBSD ld.elf_so'
+   ;;
+ 
+ netbsd*)
+@@ -21045,6 +21723,101 @@
+ 	:
+ fi
+ 
++
++
++pkg_failed=no
++{ echo "$as_me:$LINENO: checking for DBUS" >&5
++echo $ECHO_N "checking for DBUS... $ECHO_C" >&6; }
++
++if test -n "$PKG_CONFIG"; then
++    if test -n "$DBUS_CFLAGS"; then
++        pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= 0.4 \\
++	ndesk-dbus-glib-1.0 >= 0.3\"") >&5
++  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3" 2>/dev/null`
++else
++  pkg_failed=yes
++fi
++    fi
++else
++	pkg_failed=untried
++fi
++if test -n "$PKG_CONFIG"; then
++    if test -n "$DBUS_LIBS"; then
++        pkg_cv_DBUS_LIBS="$DBUS_LIBS"
++    else
++        if test -n "$PKG_CONFIG" && \
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"ndesk-dbus-1.0 >= 0.4 \\
++	ndesk-dbus-glib-1.0 >= 0.3\"") >&5
++  ($PKG_CONFIG --exists --print-errors "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3") 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; then
++  pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3" 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
++	        DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3"`
++        else
++	        DBUS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "ndesk-dbus-1.0 >= 0.4 \
++	ndesk-dbus-glib-1.0 >= 0.3"`
++        fi
++	# Put the nasty error message in config.log where it belongs
++	echo "$DBUS_PKG_ERRORS" >&5
++
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_external_dbus="no"
++elif test $pkg_failed = untried; then
++	have_external_dbus="no"
++else
++	DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS
++	DBUS_LIBS=$pkg_cv_DBUS_LIBS
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++	have_external_dbus="yes"
++fi
++if test "x$have_external_dbus" != "xyes"; then
++	{ echo "$as_me:$LINENO: result: using internal copy" >&5
++echo "${ECHO_T}using internal copy" >&6; }
++fi
++
++
++if test "x$have_external_dbus" = "xyes"; then
++  EXTERNAL_DBUS_TRUE=
++  EXTERNAL_DBUS_FALSE='#'
++else
++  EXTERNAL_DBUS_TRUE='#'
++  EXTERNAL_DBUS_FALSE=
++fi
++
++
+ case "$target" in
+ 	*-*-linux*)
+ 		os_has_inotify=yes
+@@ -24222,10 +24995,6 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-
+-  ac_config_commands="$ac_config_commands po/stamp-it"
+-
+-
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -24240,6 +25009,17 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++
++  ac_config_commands="$ac_config_commands po/stamp-it"
++
++
++if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -24268,6 +25048,13 @@
+ Usually this means the macro was only invoked conditionally." >&2;}
+    { (exit 1); exit 1; }; }
+ fi
++if test -z "${EXTERNAL_DBUS_TRUE}" && test -z "${EXTERNAL_DBUS_FALSE}"; then
++  { { echo "$as_me:$LINENO: error: conditional \"EXTERNAL_DBUS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&5
++echo "$as_me: error: conditional \"EXTERNAL_DBUS\" was never defined.
++Usually this means the macro was only invoked conditionally." >&2;}
++   { (exit 1); exit 1; }; }
++fi
+ if test -z "${ENABLE_INOTIFY_TRUE}" && test -z "${ENABLE_INOTIFY_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_INOTIFY\" was never defined.
+ Usually this means the macro was only invoked conditionally." >&5
+@@ -24759,12 +25546,12 @@
+ #
+ # INIT-COMMANDS
+ #
++AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+ prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+ INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
+ INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
+ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+ 
+ 
+ _ACEOF
+@@ -24776,8 +25563,8 @@
+ do
+   case $ac_config_target in
+     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+-    "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++    "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
+     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+     "muine.spec") CONFIG_FILES="$CONFIG_FILES muine.spec" ;;
+@@ -25018,6 +25805,7 @@
+ CCDEPMODE!$CCDEPMODE$ac_delim
+ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++DATADIRNAME!$DATADIRNAME$ac_delim
+ CPP!$CPP$ac_delim
+ GREP!$GREP$ac_delim
+ EGREP!$EGREP$ac_delim
+@@ -25057,6 +25845,10 @@
+ MONO_LIBS!$MONO_LIBS$ac_delim
+ GTKSHARP_CFLAGS!$GTKSHARP_CFLAGS$ac_delim
+ GTKSHARP_LIBS!$GTKSHARP_LIBS$ac_delim
++DBUS_CFLAGS!$DBUS_CFLAGS$ac_delim
++DBUS_LIBS!$DBUS_LIBS$ac_delim
++EXTERNAL_DBUS_TRUE!$EXTERNAL_DBUS_TRUE$ac_delim
++EXTERNAL_DBUS_FALSE!$EXTERNAL_DBUS_FALSE$ac_delim
+ ENABLE_INOTIFY_TRUE!$ENABLE_INOTIFY_TRUE$ac_delim
+ ENABLE_INOTIFY_FALSE!$ENABLE_INOTIFY_FALSE$ac_delim
+ GCONFTOOL!$GCONFTOOL$ac_delim
+@@ -25094,11 +25886,6 @@
+ MONODOCER!$MONODOCER$ac_delim
+ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
+ USE_NLS!$USE_NLS$ac_delim
+-MSGFMT!$MSGFMT$ac_delim
+-GMSGFMT!$GMSGFMT$ac_delim
+-XGETTEXT!$XGETTEXT$ac_delim
+-CATALOGS!$CATALOGS$ac_delim
+-CATOBJEXT!$CATOBJEXT$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -25140,7 +25927,11 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
+-DATADIRNAME!$DATADIRNAME$ac_delim
++MSGFMT!$MSGFMT$ac_delim
++GMSGFMT!$GMSGFMT$ac_delim
++XGETTEXT!$XGETTEXT$ac_delim
++CATALOGS!$CATALOGS$ac_delim
++CATOBJEXT!$CATOBJEXT$ac_delim
+ GMOFILES!$GMOFILES$ac_delim
+ INSTOBJEXT!$INSTOBJEXT$ac_delim
+ INTLLIBS!$INTLLIBS$ac_delim
+@@ -25153,7 +25944,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 11; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+@@ -25589,27 +26380,6 @@
+ 
+ 
+   case $ac_file$ac_mode in
+-    "intltool":C)
+-
+-for file in intltool-extract intltool-merge intltool-update; do
+-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+-      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+-      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+-      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+-      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+-      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+-      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+-	< ${ac_aux_dir}/${file}.in > ${file}.out
+-  if cmp -s ${file} ${file}.out 2>/dev/null; then
+-    rm -f ${file}.out
+-  else
+-    mv -f ${file}.out ${file}
+-  fi
+-  chmod ugo+x ${file}
+-  chmod u+w ${file}
+-done
+-
+- ;;
+     "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+   # Strip MF so we end up with the name of the file.
+   mf=`echo "$mf" | sed -e 's/:.*$//'`
+@@ -25739,6 +26509,27 @@
+   done
+ done
+  ;;
++    "intltool":C)
++
++for file in intltool-extract intltool-merge intltool-update; do
++  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
++      -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
++      -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
++      -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
++      -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
++      -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
++      -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
++	< ${ac_aux_dir}/${file}.in > ${file}.out
++  if cmp -s ${file} ${file}.out 2>/dev/null; then
++    rm -f ${file}.out
++  else
++    mv -f ${file}.out ${file}
++  fi
++  chmod ugo+x ${file}
++  chmod u+w ${file}
++done
++
++ ;;
+     "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
+         sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+       esac ;;
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/data/glade/Makefile.in muine-0.8.7/data/glade/Makefile.in
+--- muine-0.8.7-old/data/glade/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/data/glade/Makefile.in	2007-02-21 00:45:48.395458255 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/data/images/Makefile.in muine-0.8.7/data/images/Makefile.in
+--- muine-0.8.7-old/data/images/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/data/images/Makefile.in	2007-02-21 00:45:48.483463270 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/data/Makefile.in muine-0.8.7/data/Makefile.in
+--- muine-0.8.7-old/data/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/data/Makefile.in	2007-02-21 00:45:48.311453466 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/data/ui/Makefile.in muine-0.8.7/data/ui/Makefile.in
+--- muine-0.8.7-old/data/ui/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/data/ui/Makefile.in	2007-02-21 00:45:48.571468283 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/DBusLib/Makefile.in muine-0.8.7/DBusLib/Makefile.in
+--- muine-0.8.7-old/DBusLib/Makefile.in	2007-01-21 16:51:22.000000000 +0100
++++ muine-0.8.7/DBusLib/Makefile.in	2007-02-21 00:45:47.971434090 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+@@ -254,9 +258,14 @@
+ 	$(srcdir)/AssemblyInfo.cs
+ 
+ 
++@EXTERNAL_DBUS_TRUE@DBUS_ASSEMBLIES = $(DBUS_LIBS)
++@EXTERNAL_DBUS_FALSE@DBUS_ASSEMBLIES = \
++@EXTERNAL_DBUS_FALSE@	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll
++
++
+ CLIENT_LIB_ASSEMBLIES = \
+ 	-r:$(top_builddir)/PluginLib/muine-plugin.dll			\
+-	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll
++	$(DBUS_ASSEMBLIES)
+ 
+ 
+ EXTRA_DIST = $(CLIENT_LIB_CSFILES)
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/deps/dbus-sharp/Makefile.in muine-0.8.7/deps/dbus-sharp/Makefile.in
+--- muine-0.8.7-old/deps/dbus-sharp/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/deps/dbus-sharp/Makefile.in	2007-02-21 00:45:48.851484241 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+@@ -278,8 +282,8 @@
+ 	-r:Mono.Posix
+ 
+ 
+-dbussharpdir = $(pkglibdir)
+-dbussharp_DATA = $(TARGET)
++@EXTERNAL_DBUS_FALSE@dbussharpdir = $(pkglibdir)
++@EXTERNAL_DBUS_FALSE@dbussharp_DATA = $(TARGET)
+ 
+ EXTRA_DIST = $(DBUSSHARP_CSFILES)
+ 
+@@ -455,10 +459,10 @@
+ 	uninstall-info-am
+ 
+ 
+-$(ASSEMBLY): $(DBUSSHARP_CSFILES)
+-	$(CSC) -t:library -unsafe $(LIBFLAGS) -out:$@ $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
++@EXTERNAL_DBUS_FALSE@$(ASSEMBLY): $(DBUSSHARP_CSFILES)
++@EXTERNAL_DBUS_FALSE@	$(CSC) -t:library -unsafe $(LIBFLAGS) -out:$@ $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
+ 
+-all: $(ASSEMBLY)
++@EXTERNAL_DBUS_FALSE@all: $(ASSEMBLY)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/deps/dbus-sharp-glib/Makefile.in muine-0.8.7/deps/dbus-sharp-glib/Makefile.in
+--- muine-0.8.7-old/deps/dbus-sharp-glib/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/deps/dbus-sharp-glib/Makefile.in	2007-02-21 00:45:48.763479225 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+@@ -258,8 +262,8 @@
+ 	-r:Mono.Posix
+ 
+ 
+-dbussharpdir = $(pkglibdir)
+-dbussharp_DATA = $(TARGET) $(TARGET).config
++@EXTERNAL_DBUS_FALSE@dbussharpdir = $(pkglibdir)
++@EXTERNAL_DBUS_FALSE@dbussharp_DATA = $(TARGET) $(TARGET).config
+ 
+ EXTRA_DIST = $(DBUSSHARP_CSFILES)
+ 
+@@ -441,10 +445,10 @@
+ 	uninstall-info-am
+ 
+ 
+-$(ASSEMBLY): $(DBUSSHARP_CSFILES)
+-	$(CSC) -t:library $(LIBFLAGS) -out:$@ -r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
++@EXTERNAL_DBUS_FALSE@$(ASSEMBLY): $(DBUSSHARP_CSFILES)
++@EXTERNAL_DBUS_FALSE@	$(CSC) -t:library $(LIBFLAGS) -out:$@ -r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll $(DBUSSHARP_CSFILES) $(DBUSSHARP_ASSEMBLIES)
+ 
+-all: $(ASSEMBLY)
++@EXTERNAL_DBUS_FALSE@all: $(ASSEMBLY)
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/deps/Makefile.in muine-0.8.7/deps/Makefile.in
+--- muine-0.8.7-old/deps/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/deps/Makefile.in	2007-02-21 00:45:48.675474212 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/doc/Makefile.in muine-0.8.7/doc/Makefile.in
+--- muine-0.8.7-old/doc/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/doc/Makefile.in	2007-02-21 00:45:48.943489484 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/intltool-extract.in muine-0.8.7/intltool-extract.in
+--- muine-0.8.7-old/intltool-extract.in	2007-01-21 16:51:16.000000000 +0100
++++ muine-0.8.7/intltool-extract.in	2007-02-21 00:45:42.431118368 +0100
+@@ -32,7 +32,7 @@
+ ## Release information
+ my $PROGRAM      = "intltool-extract";
+ my $PACKAGE      = "intltool";
+-my $VERSION      = "0.35.0";
++my $VERSION      = "0.35.4";
+ 
+ ## Loaded modules
+ use strict; 
+@@ -114,6 +114,11 @@
+ sub place_normal {
+     $FILE	 = $ARGV[0];
+     $OUTFILE     = "$FILE.h";
++
++    my $dirname = dirname ($OUTFILE);
++    if (! -d "$dirname" && $dirname ne "") {
++        system ("mkdir -p $dirname");
++    }
+ }   
+ 
+ sub place_local {
+@@ -156,7 +161,7 @@
+       --type=TYPE   Specify the file type of FILENAME. Currently supports:
+                     "gettext/glade", "gettext/ini", "gettext/keys"
+                     "gettext/rfc822deb", "gettext/schemas",
+-                    "gettext/scheme", "gettext/xml"
++                    "gettext/scheme", "gettext/xml", "gettext/quoted"
+   -l, --local       Writes output into current working directory
+                     (conflicts with --update)
+       --update      Writes output into the same directory the source file 
+@@ -212,6 +217,7 @@
+     &type_scheme if $gettext_type eq "scheme";
+     &type_schemas  if $gettext_type eq "schemas";
+     &type_rfc822deb  if $gettext_type eq "rfc822deb";
++    &type_quoted if $gettext_type eq "quoted";
+ }
+ 
+ sub entity_decode_minimal
+@@ -242,7 +248,7 @@
+ {
+     return '\"' if $_ eq '"';
+     return '\n' if $_ eq "\n";
+-    return '\\' if $_ eq '\\';
++    return '\\\\' if $_ eq '\\';
+ 
+     return $_;
+ }
+@@ -711,6 +717,17 @@
+     return @list;
+ }
+ 
++sub type_quoted {
++    while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
++        my $message = $1;
++        my $before = $`;
++        $message =~ s/\\\"/\"/g;
++        $before =~ s/[^\n]//g;
++        $messages{$message} = [];
++        $loc{$message} = length ($before) + 2;
++    }
++}
++
+ sub type_glade {
+     ### For translatable Glade XML files ###
+ 
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/intltool-merge.in muine-0.8.7/intltool-merge.in
+--- muine-0.8.7-old/intltool-merge.in	2007-01-21 16:51:16.000000000 +0100
++++ muine-0.8.7/intltool-merge.in	2007-02-21 00:45:42.443119049 +0100
+@@ -35,7 +35,7 @@
+ ## Release information
+ my $PROGRAM = "intltool-merge";
+ my $PACKAGE = "intltool";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.35.4";
+ 
+ ## Loaded modules
+ use strict; 
+@@ -60,6 +60,7 @@
+ my $DESKTOP_STYLE_ARG = 0;
+ my $SCHEMAS_STYLE_ARG = 0;
+ my $RFC822DEB_STYLE_ARG = 0;
++my $QUOTED_STYLE_ARG = 0;
+ my $QUIET_ARG = 0;
+ my $PASS_THROUGH_ARG = 0;
+ my $UTF8_ARG = 0;
+@@ -79,6 +80,7 @@
+  "desktop-style|d" => \$DESKTOP_STYLE_ARG,
+  "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
+  "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
++ "quoted-style" => \$QUOTED_STYLE_ARG,
+  "pass-through|p" => \$PASS_THROUGH_ARG,
+  "utf8|u" => \$UTF8_ARG,
+  "multiple-output|m" => \$MULTIPLE_OUTPUT,
+@@ -157,6 +159,14 @@
+ 	&rfc822deb_merge_translations;
+ 	&finalize;
+ } 
++elsif ($QUOTED_STYLE_ARG && @ARGV > 2) 
++{
++	&utf8_sanity_check;
++	&preparation;
++	&print_message;
++	&quoted_merge_translations;
++	&finalize;
++} 
+ else 
+ {
+ 	&print_help;
+@@ -193,6 +203,7 @@
+   -k, --keys-style       includes translations in the keys style
+   -s, --schemas-style    includes translations in the schemas style
+   -r, --rfc822deb-style  includes translations in the RFC822 style
++      --quoted-style     includes translations in the quoted string style
+   -x, --xml-style        includes translations in the standard xml style
+ 
+ Other options:
+@@ -415,7 +426,7 @@
+         {
+ 	    $nextfuzzy = 1 if /^#, fuzzy/;
+        
+-	    if (/^msgid "((\\.|[^\\])*)"/ ) 
++	    if (/^msgid "((\\.|[^\\]+)*)"/ ) 
+             {
+ 		$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
+ 		$msgid = "";
+@@ -431,14 +442,14 @@
+ 		$nextfuzzy = 0;
+ 	    }
+ 
+-	    if (/^msgstr "((\\.|[^\\])*)"/) 
++	    if (/^msgstr "((\\.|[^\\]+)*)"/) 
+             {
+ 	        $msgstr = unescape_po_string($1);
+ 		$inmsgstr = 1;
+ 		$inmsgid = 0;
+ 	    }
+ 
+-	    if (/^"((\\.|[^\\])*)"/) 
++	    if (/^"((\\.|[^\\]+)*)"/) 
+             {
+ 	        $msgid .= unescape_po_string($1) if $inmsgid;
+ 	        $msgstr .= unescape_po_string($1) if $inmsgstr;
+@@ -1354,3 +1365,39 @@
+     return @list;
+ }
+ 
++sub quoted_translation
++{
++    my ($lang, $string) = @_;
++
++    $string =~ s/\\\"/\"/g;
++
++    my $translation = $translations{$lang, $string};
++    $translation = $string if !$translation;
++
++    $translation =~ s/\"/\\\"/g;
++    return $translation
++}
++
++sub quoted_merge_translations
++{
++    if (!$MULTIPLE_OUTPUT) {
++        print "Quoted only supports Multiple Output.\n";
++        exit(1);
++    }
++
++    for my $lang (sort keys %po_files_by_lang) {
++        if ( ! -e $lang ) {
++            mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
++        }
++        open INPUT, "<${FILE}" or die;
++        open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
++        binmode (OUTPUT) if $^O eq 'MSWin32';
++        while (<INPUT>) 
++        {
++            s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . &quoted_translation($lang, $1) . "\""/ge;
++            print OUTPUT;
++        }
++        close OUTPUT;
++        close INPUT;
++    }
++}
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/intltool-update.in muine-0.8.7/intltool-update.in
+--- muine-0.8.7-old/intltool-update.in	2007-01-21 16:51:16.000000000 +0100
++++ muine-0.8.7/intltool-update.in	2007-02-21 00:45:42.451119508 +0100
+@@ -30,7 +30,7 @@
+ 
+ ## Release information
+ my $PROGRAM = "intltool-update";
+-my $VERSION = "0.35.0";
++my $VERSION = "0.35.4";
+ my $PACKAGE = "intltool";
+ 
+ ## Loaded modules
+@@ -90,10 +90,9 @@
+ $| = 1;
+ 
+ ## Sometimes the source tree will be rooted somewhere else.
+-my $SRCDIR = ".";
++my $SRCDIR = $ENV{"srcdir"} || ".";
+ my $POTFILES_in;
+ 
+-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
+ $POTFILES_in = "<$SRCDIR/POTFILES.in";
+ 
+ my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
+@@ -124,8 +123,10 @@
+ 
+ &Console_Write_IntltoolHelp if $arg_count > 1;
+ 
++my $PKGNAME = FindPackageName ();
++
+ # --version and --help don't require a module name
+-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
++my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
+ 
+ if ($POT_ARG)
+ {
+@@ -316,7 +317,8 @@
+ 	@buf_potfiles_ignore,
+ 	@buf_allfiles,
+ 	@buf_allfiles_sorted,
+-	@buf_potfiles_sorted
++	@buf_potfiles_sorted,
++        @buf_potfiles_ignore_sorted
+     );
+ 
+     ## Search and find all translatable files
+@@ -342,7 +344,7 @@
+     ## comparing with POTFILES.in
+     foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
+     {
+-	(-s $ignore) or next;
++	(-s "$SRCDIR/$ignore") or next;
+ 
+ 	if ("$ignore" eq "POTFILES.ignore")
+ 	{
+@@ -351,7 +353,7 @@
+ 	}
+ 
+ 	print "Found $ignore: Ignoring files...\n" if $VERBOSE;
+-	open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
++	open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
+ 	    
+ 	while (<FILE>)
+ 	{
+@@ -359,7 +361,7 @@
+ 	}
+ 	close FILE;
+ 
+-	@buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
++	@buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
+     }
+ 
+     foreach my $file (@buf_i18n_plain)
+@@ -417,7 +419,7 @@
+ 		}
+ 	    }	    
+ 
+-	    if (/\.GetString ?\(QUOTEDTEXT/)
++	    if (/\w\.GetString *\(QUOTEDTEXT/)
+ 	    {
+                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+                     ## Remove the first 3 chars and add newline
+@@ -426,7 +428,8 @@
+ 		last;
+ 	    }
+ 
+-	    if (/_\(QUOTEDTEXT/)
++            ## N_ Q_ and _ are the three macros defined in gi8n.h
++	    if (/[NQ]?_ *\(QUOTEDTEXT/)
+ 	    {
+                 if (defined isNotValidMissing (unpack("x3 A*", $file))) {
+                     ## Remove the first 3 chars and add newline
+@@ -489,6 +492,11 @@
+ 	$in2{$_} = 1;
+     }
+ 
++    foreach (@buf_potfiles_ignore_sorted) 
++    {
++	$in2{$_} = 1;
++    }
++
+     my @result;
+ 
+     foreach (@buf_allfiles_sorted)
+@@ -504,7 +512,7 @@
+     foreach (@buf_potfiles_sorted)
+     {
+ 	chomp (my $dummy = $_);
+-	if ("$dummy" ne "" and ! -f "../$dummy")
++	if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
+ 	{
+ 	    push @buf_potfiles_notexist, $_;
+ 	}
+@@ -537,7 +545,7 @@
+ 	    warn "\n" if ($VERBOSE or @result);
+ 	    warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
+ 	    warn @buf_potfiles_notexist, "\n";
+-	    warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
++	    warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
+ 		 "containing this list of absent files has been written in the current directory.\n";
+ 	}
+     }
+@@ -671,12 +679,8 @@
+ 	} 
+ 	else 
+ 	{
+-	    if ($SRCDIR eq ".") {
+-	        print OUTFILE "../$_\n";
+-	    } else {
+-	        print OUTFILE "$SRCDIR/../$_\n";
+-	    }
+-	    $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
++            print OUTFILE "$SRCDIR/../$_\n";
++	    $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
+ 	}
+ 
+ 	next if (! $gettext_support_nonascii);
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/libmuine/id3-vfs/Makefile.in muine-0.8.7/libmuine/id3-vfs/Makefile.in
+--- muine-0.8.7-old/libmuine/id3-vfs/Makefile.in	2007-01-21 16:51:24.000000000 +0100
++++ muine-0.8.7/libmuine/id3-vfs/Makefile.in	2007-02-21 00:45:49.471519578 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/libmuine/Makefile.in muine-0.8.7/libmuine/Makefile.in
+--- muine-0.8.7-old/libmuine/Makefile.in	2007-01-21 16:51:24.000000000 +0100
++++ muine-0.8.7/libmuine/Makefile.in	2007-02-21 00:45:49.103498605 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/ltmain.sh muine-0.8.7/ltmain.sh
+--- muine-0.8.7-old/ltmain.sh	2006-11-30 00:26:21.000000000 +0100
++++ muine-0.8.7/ltmain.sh	2006-06-19 20:36:49.000000000 +0200
+@@ -33,9 +33,6 @@
+ # function.
+ progpath="$0"
+ 
+-# define SED for historic ltconfig's generated by Libtool 1.3
+-test -z "$SED" && SED=sed
+-
+ # The name of this program:
+ progname=`echo "$progpath" | $SED $basename`
+ modename="$progname"
+@@ -46,7 +43,7 @@
+ 
+ PROGRAM=ltmain.sh
+ PACKAGE=libtool
+-VERSION=1.5.22
++VERSION="1.5.22 Debian 1.5.22-4"
+ TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
+ 
+ # See if we are running on zsh, and set the options which allow our
+@@ -54,13 +51,6 @@
+ if test -n "${ZSH_VERSION+set}" ; then
+   setopt NO_GLOB_SUBST
+ fi
+-# Same for EGREP, and just to be sure, do LTCC as well
+-if test "X$EGREP" = X ; then
+-    EGREP=egrep
+-fi
+-if test "X$LTCC" = X ; then
+-    LTCC=${CC-gcc}
+-fi
+ 
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+@@ -147,30 +137,6 @@
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+ 
+-if test -z "$max_cmd_len"; then
+-  i=0
+-  testring="ABCD"
+-  new_result=
+-  
+-  # If test is not a shell built-in, we'll probably end up computing a
+-  # maximum length that is only half of the actual maximum length, but
+-  # we can't tell.
+-  while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-             = "XX$testring") >/dev/null 2>&1 &&
+-          new_result=`expr "X$testring" : ".*" 2>&1` &&
+-          max_cmd_len="$new_result" &&
+-          test "$i" != 17 # 1/2 MB should be enough
+-  do
+-    i=`expr $i + 1`
+-    testring="$testring$testring"
+-  done
+-  testring=
+-  # Add a significant safety factor because C++ compilers can tack on massive
+-  # amounts of additional arguments before passing them to the linker.
+-  # It appears as though 1/2 is a usable value.
+-  max_cmd_len=`expr $max_cmd_len \/ 2`
+-fi
+-
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+@@ -291,21 +257,7 @@
+ 	    esac
+ 	    CC_quoted="$CC_quoted $arg"
+ 	  done
+-	    # user sometimes does CC=<HOST>-gcc so we need to match that to 'gcc'
+-	    trimedcc=`echo ${CC} | $SED -e "s/${host}-//g"`
+-	    # and sometimes libtool has CC=<HOST>-gcc but user does CC=gcc
+-	    extendcc=${host}-${CC}
+-	    # and sometimes libtool has CC=<OLDHOST>-gcc but user has CC=<NEWHOST>-gcc  
+-	    # (Gentoo-specific hack because we always export $CHOST)
+-	    mungedcc=${CHOST-${host}}-${trimedcc}
+ 	    case "$@ " in
+-	      "cc "* | " cc "* | "${host}-cc "* | " ${host}-cc "*|\
+-	      "gcc "* | " gcc "* | "${host}-gcc "* | " ${host}-gcc "*)
+-	      tagname=CC
+-	      break ;;
+-	      "$trimedcc "* | " $trimedcc "* | "`$echo $trimedcc` "* | " `$echo $trimedcc` "*|\
+-	      "$extendcc "* | " $extendcc "* | "`$echo $extendcc` "* | " `$echo $extendcc` "*|\
+-	      "$mungedcc "* | " $mungedcc "* | "`$echo $mungedcc` "* | " `$echo $mungedcc` "*|\
+ 	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ 	      # The compiler in the base compile command matches
+ 	      # the one in the tagged configuration.
+@@ -899,7 +851,7 @@
+     # Lock this critical section if it is needed
+     # We use this script file to make the link, it avoids creating a new file
+     if test "$need_locks" = yes; then
+-      until $run ln "$srcfile" "$lockfile" 2>/dev/null; do
++      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ 	$show "Waiting for $lockfile to be removed"
+ 	sleep 2
+       done
+@@ -2130,7 +2082,10 @@
+ 	case $pass in
+ 	dlopen) libs="$dlfiles" ;;
+ 	dlpreopen) libs="$dlprefiles" ;;
+-	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++	link)
++	  libs="$deplibs %DEPLIBS%"
++	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++	  ;;
+ 	esac
+       fi
+       if test "$pass" = dlopen; then
+@@ -3249,6 +3204,11 @@
+ 	    age="$number_minor"
+ 	    revision="$number_minor"
+ 	    ;;
++	  *)
++	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
++	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
++	    exit $EXIT_FAILURE
++	    ;;
+ 	  esac
+ 	  ;;
+ 	no)
+@@ -3690,13 +3650,6 @@
+ 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ 			esac
+ 		      done
+-		      # It is ok to link against an archive when
+-		      # building a shared library.
+-		      if $AR -t $potlib > /dev/null 2>&1; then
+-		        newdeplibs="$newdeplibs $a_deplib"
+-		        a_deplib=""
+-		        break 2
+-		      fi
+ 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ 			 | ${SED} 10q \
+ 			 | $EGREP "$file_magic_regex" > /dev/null; then
+@@ -5434,11 +5387,6 @@
+ 	$echo >> $output "\
+     if test \"\$libtool_execute_magic\" != \"$magic\"; then
+       # Run the actual program with our arguments.
+-
+-      # Make sure env LD_LIBRARY_PATH does not mess us up
+-      if test -n \"\${LD_LIBRARY_PATH+set}\"; then
+-        export LD_LIBRARY_PATH=\$progdir:\$LD_LIBRARY_PATH
+-      fi
+ "
+ 	case $host in
+ 	# Backslashes separate directories on plain windows
+@@ -5666,53 +5614,9 @@
+ 		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ 		  exit $EXIT_FAILURE
+ 		fi
+-		if test "X$EGREP" = X ; then
+-			EGREP=egrep
+-		fi
+-		# We do not want portage's install root ($D) present.  Check only for
+-		# this if the .la is being installed.
+-		if test "$installed" = yes && test "$D"; then
+-		  eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-		else
+-		  mynewdependency_lib="$libdir/$name"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+-		  if test -z "$my_little_ninja_foo_1"; then
+-		    newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
+-		;;
+-		  *)
+-		if test "$installed" = yes; then
+-		  # Rather use S=WORKDIR if our version of portage supports it.
+-		  # This is because some ebuild (gcc) do not use $S as buildroot.
+-		  if test "$PWORKDIR"; then
+-		    S="$PWORKDIR"
+-		  fi
+-		  # We do not want portage's build root ($S) present.
+-		  my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+-		  # We do not want portage's install root ($D) present.
+-		  my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+-		  if test -n "$my_little_ninja_foo_2" && test "$S"; then
+-		    mynewdependency_lib=""
+-		  elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+-		    eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-		  else
+-		    mynewdependency_lib="$deplib"
+-		  fi
+-		else
+-		  mynewdependency_lib="$deplib"
+-		fi
+-		# Do not add duplicates
+-		if test "$mynewdependency_lib"; then
+-		  my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+-		  if test -z "$my_little_ninja_foo_4"; then
+-			newdependency_libs="$newdependency_libs $mynewdependency_lib"
+-		  fi
+-		fi
++		newdependency_libs="$newdependency_libs $libdir/$name"
+ 		;;
++	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+ 	      esac
+ 	    done
+ 	    dependency_libs="$newdependency_libs"
+@@ -5764,10 +5668,6 @@
+ 	  case $host,$output,$installed,$module,$dlname in
+ 	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ 	  esac
+-	  # Do not add duplicates
+-	  if test "$installed" = yes && test "$D"; then
+-	    install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+-	  fi
+ 	  $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/m4/Makefile.in muine-0.8.7/m4/Makefile.in
+--- muine-0.8.7-old/m4/Makefile.in	2007-01-21 16:51:24.000000000 +0100
++++ muine-0.8.7/m4/Makefile.in	2007-02-21 00:45:49.575525502 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/Makefile.in muine-0.8.7/Makefile.in
+--- muine-0.8.7-old/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/Makefile.in	2007-02-21 00:45:48.107441843 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/muine.spec muine-0.8.7/muine.spec
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/PluginLib/Makefile.in muine-0.8.7/PluginLib/Makefile.in
+--- muine-0.8.7-old/PluginLib/Makefile.in	2007-01-21 16:51:23.000000000 +0100
++++ muine-0.8.7/PluginLib/Makefile.in	2007-02-21 00:45:48.191446631 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/plugins/Makefile.in muine-0.8.7/plugins/Makefile.in
+--- muine-0.8.7-old/plugins/Makefile.in	2007-01-21 16:51:24.000000000 +0100
++++ muine-0.8.7/plugins/Makefile.in	2007-02-21 00:45:49.727534167 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/po/Makefile.in.in muine-0.8.7/po/Makefile.in.in
+--- muine-0.8.7-old/po/Makefile.in.in	2007-01-21 16:51:16.000000000 +0100
++++ muine-0.8.7/po/Makefile.in.in	2007-02-21 00:45:42.459119960 +0100
+@@ -25,7 +25,7 @@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+-top_builddir = ..
++top_builddir = @top_builddir@
+ VPATH = @srcdir@
+ 
+ prefix = @prefix@
+@@ -56,15 +56,19 @@
+ 
+ PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
+ 
+-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
++USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
++
++USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
++
++POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+ 
+ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
+ EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
+ 
+ POTFILES = \
+-#This Gets Replace for some reason
++# This comment gets stripped out
+ 
+-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
++CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+ 
+ .SUFFIXES:
+ .SUFFIXES: .po .pox .gmo .mo .msg .cat
+@@ -98,11 +102,7 @@
+ install-data-no: all
+ install-data-yes: all
+ 	$(mkdir_p) $(DESTDIR)$(itlocaledir)
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
++	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+ 	  dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
+ 	  $(mkdir_p) $$dir; \
+@@ -136,17 +136,18 @@
+ installcheck:
+ 
+ uninstall:
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
++	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+ 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ 	  rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ 	done
+ 
+ check: all $(GETTEXT_PACKAGE).pot
++	rm -f missing notexist
++	srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
++	if [ -r missing -o -r notexist ]; then \
++	  exit 1; \
++	fi
+ 
+ mostlyclean:
+ 	rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
+@@ -179,11 +180,7 @@
+ update-po: Makefile
+ 	$(MAKE) $(GETTEXT_PACKAGE).pot
+ 	tmpdir=`pwd`; \
+-	if test -n "$(PO_LINGUAS)"; then \
+-	  linguas="$(PO_LINGUAS)"; \
+-	else \
+-	  linguas="$(ALL_LINGUAS)"; \
+-	fi; \
++	linguas="$(USE_LINGUAS)"; \
+ 	for lang in $$linguas; do \
+ 	  echo "$$lang:"; \
+ 	  result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
+@@ -211,8 +208,8 @@
+ 	  $(MAKE) stamp-it; \
+ 	fi
+ 
+-stamp-it: Makefile.in.in ../config.status POTFILES.in
+-	cd .. \
++stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
++	cd $(top_builddir) \
+ 	  && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
+ 	       $(SHELL) ./config.status
+ 
+diff -x'*config.sub' -x'*config.guess' -Naur muine-0.8.7-old/src/Makefile.in muine-0.8.7/src/Makefile.in
+--- muine-0.8.7-old/src/Makefile.in	2007-01-21 16:51:24.000000000 +0100
++++ muine-0.8.7/src/Makefile.in	2007-02-21 00:45:49.851541232 +0100
+@@ -61,6 +61,8 @@
+ CXXFLAGS = @CXXFLAGS@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
++DBUS_CFLAGS = @DBUS_CFLAGS@
++DBUS_LIBS = @DBUS_LIBS@
+ DEFS = @DEFS@
+ DEPDIR = @DEPDIR@
+ ECHO = @ECHO@
+@@ -73,6 +75,8 @@
+ ENABLE_MONODOC_FALSE = @ENABLE_MONODOC_FALSE@
+ ENABLE_MONODOC_TRUE = @ENABLE_MONODOC_TRUE@
+ EXEEXT = @EXEEXT@
++EXTERNAL_DBUS_FALSE = @EXTERNAL_DBUS_FALSE@
++EXTERNAL_DBUS_TRUE = @EXTERNAL_DBUS_TRUE@
+ F77 = @F77@
+ FAAD_LIBS = @FAAD_LIBS@
+ FFLAGS = @FFLAGS@
+@@ -299,11 +303,16 @@
+ 	Defines.cs
+ 
+ 
++@EXTERNAL_DBUS_TRUE@DBUS_ASSEMBLIES = $(DBUS_LIBS)
++@EXTERNAL_DBUS_FALSE@DBUS_ASSEMBLIES = \
++@EXTERNAL_DBUS_FALSE@	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll		\
++@EXTERNAL_DBUS_FALSE@	-r:$(top_builddir)/deps/dbus-sharp-glib/NDesk.DBus.GLib.dll
++
++
+ MUINE_ASSEMBLIES = \
+ 	-r:$(top_builddir)/PluginLib/muine-plugin.dll			\
+ 	-r:$(top_builddir)/DBusLib/muine-dbus.dll			\
+-	-r:$(top_builddir)/deps/dbus-sharp/NDesk.DBus.dll		\
+-	-r:$(top_builddir)/deps/dbus-sharp-glib/NDesk.DBus.GLib.dll	\
++	$(DBUS_ASSEMBLIES)						\
+ 	-r:System.Web.Services						\
+ 	-r:Mono.Posix
+ 
only in patch2:
unchanged:
--- muine-0.8.7.orig/debian/patches/muine-glib-213.diff
+++ muine-0.8.7/debian/patches/muine-glib-213.diff
@@ -0,0 +1,195 @@
+diff -ur muine-0.8.7-1.1ubuntu1/libmuine/gsequence.c f/libmuine/gsequence.c
+--- muine-0.8.7-1.1ubuntu1/libmuine/gsequence.c	2007-01-20 09:14:07.000000000 +1100
++++ f/libmuine/gsequence.c	2007-07-09 03:59:38.000000000 +1000
+@@ -63,9 +63,6 @@
+ #if 0
+ static gboolean       g_sequence_node_is_singleton (GSequenceNode    *node);
+ #endif
+-static void           g_sequence_node_split        (GSequenceNode    *node,
+-						    GSequenceNode   **left,
+-						    GSequenceNode   **right);
+ static void           g_sequence_node_insert_before (GSequenceNode *node,
+ 						     GSequenceNode *new);
+ static void           g_sequence_node_remove        (GSequenceNode *node);
+@@ -223,7 +220,7 @@
+ 			       GCompareDataFunc         cmp_func,
+ 			       gpointer                 cmp_data)
+ {
+-    GSequence *tmp;
++    GSequence *tmp = NULL;
+     GSequenceNode *begin, *end;
+ 
+     g_return_if_fail (seq != NULL);
+@@ -232,7 +229,7 @@
+     begin = g_sequence_get_begin_ptr (seq);
+     end   = g_sequence_get_end_ptr (seq);
+ 
+-    g_sequence_remove_range (begin, end, &tmp);
++    g_sequence_remove_range (begin, end);
+ 
+     while (g_sequence_get_length (tmp) > 0)
+     {
+@@ -287,43 +284,6 @@
+     g_sequence_insert_sequence (last, seq2);
+ }
+ 
+-/*
+- * The new sequence inherits the destroy notify from the sequence that
+- * beign and end comes from
+- */
+-void
+-g_sequence_remove_range       (GSequencePtr             begin,
+-			       GSequencePtr             end,
+-			       GSequence              **removed)
+-{
+-    GSequence *seq;
+-    GSequenceNode *s1, *s2, *s3;
+-
+-    seq = g_sequence_node_get_sequence (begin);
+-
+-    g_assert (end != NULL);
+-    
+-    g_return_if_fail (seq == g_sequence_node_get_sequence (end));
+-
+-    g_sequence_node_split (begin, &s1, &s2);
+-    g_sequence_node_split (end, NULL, &s3);
+-
+-    if (s1)
+-	g_sequence_node_insert_before (s3, s1);
+-
+-    seq->node = s3;
+-
+-    if (removed)
+-    {
+-	*removed = g_sequence_new (seq->data_destroy_notify);
+-	g_sequence_node_insert_before ((*removed)->node, s2);
+-    }
+-    else
+-    {
+-	g_sequence_node_free (s2, seq->data_destroy_notify);
+-    }
+-}
+-
+ gint
+ g_sequence_get_length         (GSequence               *seq)
+ {
+@@ -429,54 +389,6 @@
+     g_sequence_node_insert_sorted (seq->node, ptr, cmp_func, cmp_data);
+ }
+ 
+-/* search
+- *
+- * The only restriction on the search function is that it
+- * must not delete any nodes. It is permitted to insert new nodes,
+- * but the caller should "know what he is doing"
+- */
+-void
+-g_sequence_search             (GSequence               *seq,
+-			       GSequenceSearchFunc      f,
+-			       gpointer                 data)
+-{
+-    GQueue *intervals = g_queue_new ();
+-
+-    g_queue_push_tail (intervals, g_sequence_node_find_first (seq->node));
+-    g_queue_push_tail (intervals, g_sequence_node_find_last (seq->node));
+-
+-    while (!g_queue_is_empty (intervals))
+-    {
+-	GSequenceNode *begin = g_queue_pop_head (intervals);
+-	GSequenceNode *end   = g_queue_pop_head (intervals);
+-	
+-	if (f (begin, end, data))
+-	{
+-	    gint begin_pos = g_sequence_node_get_pos (begin);
+-	    gint end_pos   = g_sequence_node_get_pos (end);
+-
+-	    if (end_pos - begin_pos > 1)
+-	    {
+-		GSequenceNode *mid;
+-		gint mid_pos;
+-
+-		mid_pos = begin_pos + (end_pos - begin_pos) / 2;
+-		mid = g_sequence_node_find_by_pos (begin, mid_pos);
+-
+-		g_queue_push_tail (intervals, begin);
+-		g_queue_push_tail (intervals, mid);
+-
+-		g_queue_push_tail (intervals, mid);
+-		g_queue_push_tail (intervals, end);
+-	    }
+-	}
+-    }
+-
+-    g_queue_free (intervals);
+-}
+-
+-
+-
+ #if 0
+ /* aggregates */
+ void
+@@ -870,32 +782,6 @@
+ #endif
+ 
+ static void
+-g_sequence_node_split        (GSequenceNode    *node,
+-			      GSequenceNode   **left,
+-			      GSequenceNode   **right)
+-{
+-    GSequenceNode *left_tree;
+-    
+-    splay (node);
+-
+-    left_tree = node->left;
+-    if (left_tree)
+-    {
+-	left_tree->parent = NULL;
+-	g_sequence_node_update_fields (left_tree);
+-    }
+-    
+-    node->left = NULL;
+-    g_sequence_node_update_fields (node);
+-
+-    if (left)
+-	*left = left_tree;
+-
+-    if (right)
+-	*right = node;
+-}
+-
+-static void
+ g_sequence_node_insert_before (GSequenceNode *node,
+ 			       GSequenceNode *new)
+ {
+diff -ur muine-0.8.7-1.1ubuntu1/libmuine/gsequence.h f/libmuine/gsequence.h
+--- muine-0.8.7-1.1ubuntu1/libmuine/gsequence.h	2007-01-20 09:14:07.000000000 +1100
++++ f/libmuine/gsequence.h	2007-07-09 03:51:02.000000000 +1000
+@@ -22,7 +22,6 @@
+ #ifndef __GSEQUENCE_H__
+ #define __GSEQUENCE_H__
+ 
+-typedef struct _GSequence      GSequence;
+ typedef struct _GSequenceNode *GSequencePtr;
+ 
+ /* GSequence */
+@@ -46,9 +45,6 @@
+ 					    GSequence               *other_seq);
+ void         g_sequence_concatenate        (GSequence               *seq1,
+ 					    GSequence               *seq);
+-void         g_sequence_remove_range       (GSequencePtr             begin,
+-					    GSequencePtr             end,
+-					    GSequence              **removed);
+ gint	     g_sequence_get_length         (GSequence               *seq);
+ GSequencePtr g_sequence_get_end_ptr        (GSequence               *seq);
+ GSequencePtr g_sequence_get_begin_ptr      (GSequence               *seq);
+@@ -81,10 +77,6 @@
+ 					  GSequencePtr end,
+ 					  gpointer     data);
+ 
+-void         g_sequence_search             (GSequence               *seq,
+-					    GSequenceSearchFunc      f,
+-					    gpointer                 data);
+-
+ /* debug */
+ gint         g_sequence_calc_tree_height   (GSequence               *seq);
+ 
only in patch2:
unchanged:
--- muine-0.8.7.orig/libmuine/gsequence.loT
+++ muine-0.8.7/libmuine/gsequence.loT
@@ -0,0 +1,7 @@
+# gsequence.lo - a libtool object file
+# Generated by ltmain.sh - GNU libtool 1.5.22 Debian 1.5.22-4 (1.1220.2.365 2005/12/18 22:14:06)
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.

--- End Message ---

--- Begin Message ---

To: 460464-done@bugs.debian.org

Subject: Included in 0.8.8-1

From: Diego Escalante Urrelo <dieguito@gmail.com>

Date: Thu, 15 May 2008 02:28:55 -0500

Message-id: <1210836535.1323.1.camel@milkyway>
ssia. I'm trying to clean muine's BTS page, forgive me if I do something
silly in the process.

greetings,

Diego
--- End Message ---

Reply to:

Prev by Date: Bug#290923: marked as done (muine: Huge (virtual) memory leak)
Next by Date: Bug#471631: Patch from SVN attached
Previous by thread: Bug#290923: marked as done (muine: Huge (virtual) memory leak)
Next by thread: Bug#471631: Patch from SVN attached
Index(es):
- Date
- Thread