[Pkg-mono-svn-commits] rev 2683 - in beagle/trunk/debian: . patches

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Sat Aug 26 10:45:11 UTC 2006


Author: jsogo
Date: 2006-08-26 10:45:02 +0000 (Sat, 26 Aug 2006)
New Revision: 2683

Modified:
   beagle/trunk/debian/README.Debian
   beagle/trunk/debian/changelog
   beagle/trunk/debian/control
   beagle/trunk/debian/patches/relibtoolize.dpatch
   beagle/trunk/debian/rules
Log:
  beagle 0.2.8-1
   + New upstream version
   + Fixed Conflicts/Replaces for python package
   + Build depend on libevolution2.0-cil package
   + Document that beagle-search is a Gnome util intended to work in a 
     Gnome environment.
   + Do not install *mdb files


Modified: beagle/trunk/debian/README.Debian
===================================================================
--- beagle/trunk/debian/README.Debian	2006-08-23 23:35:24 UTC (rev 2682)
+++ beagle/trunk/debian/README.Debian	2006-08-26 10:45:02 UTC (rev 2683)
@@ -43,6 +43,14 @@
  If this is the first time you run beagle, you will need to wait a bit for the
  daemon to index data from different locations before you can get any result.
 
+ By default, beagle-search util will be used. This is a Gnome UI, which does 
+ integrate with Gnome desktop, so it uses Gnome desktop preferences to 
+ perform tasks like opening folders or documents. You have to open a
+ Nautilus folder and go to its preferences to change that behaviour.
+
+ You can also use other UIs for searching, like "kerry" package, which
+ is a beagle search UI aimed for people using KDE desktop.
+
   5. Evolution Data Backend
   -------------------------
 

Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog	2006-08-23 23:35:24 UTC (rev 2682)
+++ beagle/trunk/debian/changelog	2006-08-26 10:45:02 UTC (rev 2683)
@@ -1,3 +1,23 @@
+beagle (0.2.8-1) unstable; urgency=low
+
+  * New upstream version.
+     + Checks if computer is a laptop running in battery and stop
+     indexing if that is the case (Closes: #337430)
+     + Fixed bug that allowed using mouse wheel to scroll through the
+     different pages at startup. (Closes: #369814)
+
+  * Fix Conflicts/Replaces for Python transition (Closes: #383439)
+  * Build depend in libevolution2.0-cil package.
+  * As it uses new libgmime2.2-cil package, problems with indexing
+    different mail systems must have gone. (Closes: #368002, #366782)
+  * Documented that beagle-search is a Gnome UI that uses Gnome desktop
+    preferences to open files and folders, so that has to be changed
+    the Gnome way (Closes: #376957)
+  * Do not install *.mbd files, unless we are building the package with
+    nostrip otion
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sat, 26 Aug 2006 12:42:26 +0200
+
 beagle (0.2.7-3) unstable; urgency=low
 
   * Compile with new libgmime2.2-cil
@@ -28,7 +48,7 @@
      + usebash: add beagle-search, beagle-extract-content,
      beagle-index-url and other scripts to those that should use bash because
      they call exec -a (Closes: #376969, #369644, #369223)
-  * Change Maintainer field to pkg-mono group, and let me as Uploader.
+  * Change Maintainer field to pkg-mono group, and put me as Uploader.
   * Transition to comply with new Python policy.
 
  -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Mon, 31 Jul 2006 23:36:44 +0200

Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control	2006-08-23 23:35:24 UTC (rev 2682)
+++ beagle/trunk/debian/control	2006-08-26 10:45:02 UTC (rev 2683)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Mono Group <pkg-mono-group at lists.alioth.debian.org>
 Uploaders: Jose Carlos Garcia Sogo <jsogo at debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), intltool, mono-mcs (>= 1.1.13.5) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.2-cil, libevolution-cil, libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite1.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common-dev (>= 0.4.0), dpatch, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4)
+Build-Depends: debhelper (>= 5.0.37.2), intltool, mono-mcs (>= 1.1.13.5) | c-sharp-compiler, libmono-dev (>= 1.0), libgnome2.0-cil, libgmime2.2-cil, libevolution2.0-cil, libgtk2.0-dev, libexif-dev, libsqlite3-dev, libmono-sqlite1.0-cil, libxss-dev, zip, libgnomevfs2-dev (>= 2.6), libgnome2-dev (>= 2.6), libgalago-cil, cli-common-dev (>= 0.4.0), dpatch, autotools-dev, python-all-dev (>= 2.3.5-11), python2.4-gtk2, python-gtk2-dev, librsvg2-dev, libxml2-dev (>= 2.6.19), libxss-dev, libmono-sharpzip0.6-cil, libwv-dev, libgsf0.0-cil, python-support (>= 0.4)
 Standards-Version: 3.7.2
 
 Package: beagle
@@ -19,7 +19,7 @@
 
 Package: beagle-backend-evolution
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, beagle (= ${Source-Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${cli:Depends}, beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~)
 Description: evolution data backend for beagle
  Backend that allows Beagle indexing calendar and contact entries from 
  Evolution.
@@ -43,7 +43,7 @@
 Package: beagle-dev
 Architecture: any
 Section: devel
-Depends: libbeagle0 (= ${Source-Version})
+Depends: libbeagle0 (>= ${source:Version}), beagle (<< ${source:Version}.1~)
 Description: library for accessing beagle (development files)
  This library allow programmers accessing Beagle daemon and performing searches,
  and this package contains needed files for developing with it.
@@ -57,8 +57,8 @@
 Section: libs
 Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends}, python2.4-gtk2
 Provides: ${python:Provides}
-Conflicts: python2.4-beagle (<< 0.2.6-2)
-Replaces: python2.4-beagle (<< 0.2.6-2)
+Conflicts: python2.4-beagle (<< 0.2.7-1)
+Replaces: python2.4-beagle (<< 0.2.7-1)
 Description: python bindings for beagle
  Allow accessing Beagle daemon and peforming searches using Python.
  .

Modified: beagle/trunk/debian/patches/relibtoolize.dpatch
===================================================================
--- beagle/trunk/debian/patches/relibtoolize.dpatch	2006-08-23 23:35:24 UTC (rev 2682)
+++ beagle/trunk/debian/patches/relibtoolize.dpatch	2006-08-26 10:45:02 UTC (rev 2683)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad beagle-0.2.7~/aclocal.m4 beagle-0.2.7/aclocal.m4
---- beagle-0.2.7~/aclocal.m4	2006-06-19 19:54:46.000000000 +0200
-+++ beagle-0.2.7/aclocal.m4	2006-07-30 13:09:52.000000000 +0200
+diff -urNad beagle-0.2.8~/aclocal.m4 beagle-0.2.8/aclocal.m4
+--- beagle-0.2.8~/aclocal.m4	2006-08-17 18:17:05.000000000 +0200
++++ beagle-0.2.8/aclocal.m4	2006-08-24 12:00:52.000000000 +0200
 @@ -11,27 +11,429 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -836,7 +836,17 @@
        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
-@@ -7766,391 +8177,4 @@
+@@ -6688,7 +7099,8 @@
+ 
+ _PKG_TEXT
+ ])],
+-		[$4])
++		[AC_MSG_RESULT([no])
++                $4])
+ elif test $pkg_failed = untried; then
+ 	ifelse([$4], , [AC_MSG_FAILURE(dnl
+ [The pkg-config script could not be found or is too old.  Make sure it
+@@ -7766,391 +8178,4 @@
  AC_SUBST([am__untar])
  ]) # _AM_PROG_TAR
  
@@ -1228,19 +1238,23 @@
 -])dnl
 -
  m4_include([acinclude.m4])
-diff -urNad beagle-0.2.7~/config.guess beagle-0.2.7/config.guess
---- beagle-0.2.7~/config.guess	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.7/config.guess	2006-02-25 16:29:12.000000000 +0100
-@@ -3,7 +3,7 @@
+diff -urNad beagle-0.2.8~/config.guess beagle-0.2.8/config.guess
+--- beagle-0.2.8~/config.guess	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.8/config.guess	2006-08-10 17:17:12.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
  
 -timestamp='2005-07-08'
-+timestamp='2006-02-23'
++timestamp='2006-07-02'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -106,7 +106,7 @@
+@@ -106,7 +107,7 @@
  trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
  trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
  : ${TMPDIR=/tmp} ;
@@ -1249,7 +1263,7 @@
   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -138,16 +138,6 @@
+@@ -138,16 +139,6 @@
  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
@@ -1266,7 +1280,7 @@
  # Note: order is significant - the case branches are not exclusive.
  
  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-@@ -216,6 +206,9 @@
+@@ -216,8 +207,11 @@
      *:ekkoBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
  	exit ;;
@@ -1274,9 +1288,12 @@
 +	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 +	exit ;;
      macppc:MirBSD:*:*)
- 	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
++	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
  	exit ;;
-@@ -774,7 +767,12 @@
+     *:MirBSD:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+@@ -774,7 +768,14 @@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
      *:FreeBSD:*:*)
@@ -1284,32 +1301,24 @@
 +	case ${UNAME_MACHINE} in
 +	    pc98)
 +		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
++	    amd64)
++		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	    *)
 +		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 +	esac
  	exit ;;
      i*:CYGWIN*:*)
  	echo ${UNAME_MACHINE}-pc-cygwin
-@@ -782,6 +780,9 @@
-     i*:MINGW*:*)
- 	echo ${UNAME_MACHINE}-pc-mingw32
- 	exit ;;
-+    i*:MSYS_NT-*:*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-     i*:windows32*:*)
-     	# uname -m includes "-pc" on this system.
-     	echo ${UNAME_MACHINE}-mingw32
 @@ -789,8 +790,11 @@
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
 -    x86:Interix*:[34]*)
 -	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-+    x86:Interix*:[345]*)
++    x86:Interix*:[3456]*)
 +	echo i586-pc-interix${UNAME_RELEASE}
 +	exit ;;
-+    EM64T:Interix*:[345]*)
++    EM64T:Interix*:[3456]*)
 +	echo x86_64-unknown-interix${UNAME_RELEASE}
  	exit ;;
      [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -1323,12 +1332,15 @@
  	echo x86_64-unknown-cygwin
  	exit ;;
      p*:CYGWIN*:*)
-@@ -825,25 +829,25 @@
+@@ -825,25 +829,28 @@
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
      arm*:Linux:*:*)
 -	echo ${UNAME_MACHINE}-${VENDOR}-linux
 +	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
++    avr32*:Linux:*:*)
++	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      cris:Linux:*:*)
 -	echo cris-axis-linux
@@ -1356,7 +1368,7 @@
  	exit ;;
      mips:Linux:*:*)
  	eval $set_cc_for_build
-@@ -861,8 +865,12 @@
+@@ -861,8 +868,12 @@
  	#endif
  	#endif
  EOF
@@ -1371,7 +1383,7 @@
  	;;
      mips64:Linux:*:*)
  	eval $set_cc_for_build
-@@ -880,14 +888,21 @@
+@@ -880,14 +891,21 @@
  	#endif
  	#endif
  EOF
@@ -1397,7 +1409,7 @@
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-@@ -901,33 +916,36 @@
+@@ -901,33 +919,36 @@
          esac
  	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
  	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
@@ -1443,7 +1455,7 @@
  	exit ;;
      i*86:Linux:*:*)
  	# The BFD linker knows what the default object file format is, so
-@@ -942,18 +960,18 @@
+@@ -942,18 +963,18 @@
  				    p'`
          case "$ld_supported_targets" in
  	  elf32-i386)
@@ -1467,16 +1479,16 @@
  		exit ;;
  	esac
  	# Determine whether the default compiler is a.out or elf
-@@ -971,7 +989,7 @@
+@@ -971,7 +992,7 @@
  	LIBC=gnulibc1
  	# endif
  	#else
 -	#ifdef __INTEL_COMPILER
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
++	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
  	LIBC=gnu
  	#else
  	LIBC=gnuaout
-@@ -981,9 +999,13 @@
+@@ -981,9 +1002,13 @@
  	LIBC=dietlibc
  	#endif
  EOF
@@ -1492,7 +1504,7 @@
  		exit
  	}
  	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-@@ -1192,7 +1214,6 @@
+@@ -1192,7 +1217,6 @@
      *:Darwin:*:*)
  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
  	case $UNAME_PROCESSOR in
@@ -1500,7 +1512,7 @@
  	    unknown) UNAME_PROCESSOR=powerpc ;;
  	esac
  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-@@ -1271,6 +1292,9 @@
+@@ -1271,6 +1295,9 @@
      i*86:skyos:*:*)
  	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
  	exit ;;
@@ -1510,19 +1522,23 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad beagle-0.2.7~/config.sub beagle-0.2.7/config.sub
---- beagle-0.2.7~/config.sub	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.7/config.sub	2006-02-25 16:29:12.000000000 +0100
-@@ -3,7 +3,7 @@
+diff -urNad beagle-0.2.8~/config.sub beagle-0.2.8/config.sub
+--- beagle-0.2.8~/config.sub	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.8/config.sub	2006-08-10 17:17:12.000000000 +0200
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
- #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
++#   Inc.
  
 -timestamp='2005-07-08'
-+timestamp='2006-02-23'
++timestamp='2006-07-02'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -119,8 +119,9 @@
+@@ -119,8 +120,9 @@
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
@@ -1534,7 +1550,7 @@
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
      ;;
-@@ -171,6 +172,10 @@
+@@ -171,6 +173,10 @@
  	-hiux*)
  		os=-hiuxwe2
  		;;
@@ -1545,7 +1561,7 @@
  	-sco5)
  		os=-sco3.2v5
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -187,6 +192,10 @@
+@@ -187,6 +193,10 @@
  		# Don't forget version if it is 3.2v4 or newer.
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
  		;;
@@ -1556,16 +1572,26 @@
  	-sco*)
  		os=-sco3.2v2
  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-@@ -239,7 +248,7 @@
+@@ -231,7 +241,7 @@
+ 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ 	| am33_2.0 \
+-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
++	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ 	| bfin \
+ 	| c4x | clipper \
+ 	| d10v | d30v | dlx | dsp16xx \
+@@ -239,7 +249,8 @@
  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
  	| i370 | i860 | i960 | ia64 \
  	| ip2k | iq2000 \
 -	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-+	| m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
++	| m32c | m32r | m32rle | m68000 | m68k | m88k \
++	| maxq | mb | microblaze | mcore \
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
-@@ -257,8 +266,9 @@
+@@ -257,18 +268,19 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -1576,8 +1602,32 @@
  	| ns16k | ns32k \
  	| or32 \
  	| pdp10 | pdp11 | pj | pjl \
-@@ -286,6 +296,9 @@
+ 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ 	| pyramid \
+-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+ 	| sh64 | sh64le \
+-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+-	| sparcv8 | sparcv9 | sparcv9b \
+-	| strongarm \
++	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
++	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
++	| spu | strongarm \
+ 	| tahoe | thumb | tic4x | tic80 | tron \
+ 	| v850 | v850e \
+ 	| we32k \
+@@ -276,9 +288,6 @@
+ 	| z8k)
+ 		basic_machine=$basic_machine-unknown
  		;;
+-	m32c)
+-		basic_machine=$basic_machine-unknown
+-		;;
+ 	m6811 | m68hc11 | m6812 | m68hc12)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+@@ -286,6 +295,9 @@
+ 		;;
  	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  		;;
 +	ms1)
@@ -1586,7 +1636,25 @@
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -336,8 +349,9 @@
+@@ -305,7 +317,7 @@
+ 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
+-	| avr-* \
++	| avr-* | avr32-* \
+ 	| bfin-* | bs2000-* \
+ 	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ 	| clipper-* | craynv-* | cydra-* \
+@@ -316,7 +328,7 @@
+ 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ 	| i*86-* | i860-* | i960-* | ia64-* \
+ 	| ip2k-* | iq2000-* \
+-	| m32r-* | m32rle-* \
++	| m32c-* | m32r-* | m32rle-* \
+ 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ 	| m88110-* | m88k-* | maxq-* | mcore-* \
+ 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+@@ -336,19 +348,20 @@
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
  	| mipstx39-* | mipstx39el-* \
  	| mmix-* \
@@ -1597,7 +1665,30 @@
  	| none-* | np1-* | ns16k-* | ns32k-* \
  	| orion-* \
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-@@ -696,6 +710,9 @@
+ 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ 	| pyramid-* \
+ 	| romp-* | rs6000-* \
+-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+ 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
++	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ 	| sparclite-* \
+-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
++	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ 	| tron-* \
+@@ -359,8 +372,6 @@
+ 	| ymp-* \
+ 	| z8k-*)
+ 		;;
+-	m32c-*)
+-		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	386bsd)
+@@ -696,6 +707,9 @@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
@@ -1607,7 +1698,7 @@
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
-@@ -803,6 +820,12 @@
+@@ -803,6 +817,12 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -1620,7 +1711,7 @@
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -859,6 +882,10 @@
+@@ -859,6 +879,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -1631,7 +1722,16 @@
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -1174,21 +1201,23 @@
+@@ -1101,7 +1125,7 @@
+ 	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
+ 		basic_machine=sh-unknown
+ 		;;
+-	sparc | sparcv8 | sparcv9 | sparcv9b)
++	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
+ 		basic_machine=sparc-sun
+ 		;;
+ 	cydra)
+@@ -1174,21 +1198,23 @@
  	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
@@ -1654,11 +1754,11 @@
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 -	      | -skyos* | -haiku*)
-+	      | -skyos* | -haiku* | -rdos*)
++	      | -skyos* | -haiku* | -rdos* | -toppers*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1215,6 +1244,9 @@
+@@ -1215,6 +1241,9 @@
  	-linux-dietlibc)
  		os=-linux-dietlibc
  		;;
@@ -1668,9 +1768,32 @@
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  		;;
-diff -urNad beagle-0.2.7~/configure beagle-0.2.7/configure
---- beagle-0.2.7~/configure	2006-06-19 19:55:03.000000000 +0200
-+++ beagle-0.2.7/configure	2006-07-30 13:09:57.000000000 +0200
+@@ -1337,6 +1366,9 @@
+ # system, and we'll never get to this point.
+ 
+ case $basic_machine in
++        spu-*)
++		os=-elf
++		;;
+ 	*-acorn)
+ 		os=-riscix1.2
+ 		;;
+@@ -1346,9 +1378,9 @@
+ 	arm*-semi)
+ 		os=-aout
+ 		;;
+-    c4x-* | tic4x-*)
+-        os=-coff
+-        ;;
++        c4x-* | tic4x-*)
++        	os=-coff
++		;;
+ 	# This must come before the *-dec entry.
+ 	pdp10-*)
+ 		os=-tops20
+diff -urNad beagle-0.2.8~/configure beagle-0.2.8/configure
+--- beagle-0.2.8~/configure	2006-08-17 18:17:20.000000000 +0200
++++ beagle-0.2.8/configure	2006-08-24 12:00:59.000000000 +0200
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -2346,7 +2469,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -454,17 +744,351 @@
+@@ -454,17 +744,349 @@
  #endif
  #if HAVE_INTTYPES_H
  # include <inttypes.h>
@@ -2362,7 +2485,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASH ZIP MONO MCS ac_pt_PKG_CONFIG MONO_CFLAGS MONO_LIBS SHARPZIPLIB_LIBS OS_LINUX_TRUE OS_LINUX_FALSE OS_FREEBSD_TRUE OS_FREEBSD_FALSE DESKTOP_LAUNCH ENABLE_DESKTOP_LAUNCH_TRUE ENABLE_DESKTOP_LAUNCH_FALSE WSDL ENABLE_GOOGLEDRIVER_TRUE ENABLE_GOOGLEDRIVER_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB SQLITE_CFLAGS SQLITE_LIBS SQLITE3_CFLAGS SQLITE3_LIBS SQLITE_MAJ_VER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAS_LIBXSS_TRUE HAS_LIBXSS_FALSE ENABLE_GUI_TRUE ENABLE_GUI_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS BEAGLE_UI_CFLAGS BEAGLE_UI_LIBS UIGLUE_CFLAGS UIGLUE_LIBS LIBTRAYICON_CFLAGS LIBTRAYICON_LIBS OPEN_WITH_CFLAGS OPEN_WITH_LIBS ENABLE_OPEN_WITH_TRUE ENABLE_OPEN_WITH_FALSE EVO_LIBDIR EVO_CFLAGS EVO_LIBS ENABLE_EVOLUTION_TRUE ENABLE_EVOLUTION_FALSE USE_LOCAL_SQLITE_TRUE USE_LOCAL_SQLITE_FALSE ENABLE_INOTIFY_TRUE ENABLE_INOTIFY_FALSE GSF_SHARP_CFLAGS GSF_SHARP_LIBS ENABLE_GSF_SHARP_TRUE ENABLE_GSF_SHARP_FALSE LIBEXIF_CFLAGS LIBEXIF_LIBS LIBEXIF_API_CHECK_CFLAGS LIBEXIF_API_CHECK_LIBS LIBEXIF_VERSION_CHECK_CFLAGS LIBEXIF_VERSION_CHECK_LIBS EXIF_SOVERSION BEAGLED_CFLAGS BEAGLED_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBBEAGLE_VERSION_INFO LIBBEAGLE_CFLAGS LIBBEAGLE_LIBS ENABLE_LIBBEAGLE_TRUE ENABLE_LIBBEAGLE_FALSE ENABLE_BLUDGEON_TRUE ENABLE_BLUDGEON_FALSE EPIPHANY_REQUIRED LIBXML_REQUIRED LIBGLIB_REQUIRED LIBGTK_REQUIRED EPIPHANY_DEPENDENCY_CFLAGS EPIPHANY_DEPENDENCY_LIBS EPIPHANY_EXTENSIONS_DIR EPIPHANY_PREFIX ENABLE_EPIPHANY_EXTENSION_TRUE ENABLE_EPIPHANY_EXTENSION_FALSE INSTALL_EPIPHANY_EXTENSION_TRUE INSTALL_EPIPHANY_EXTENSION_FALSE GALAGO_CFLAGS GALAGO_LIBS ENABLE_GALAGO_TRUE ENABLE_GALAGO_FALSE GTK_BINARY_VERSION SYSTEMINFO_GLUE_CFLAGS SYSTEMINFO_GLUE_LIBS SYSTEMINFO_GLUE_X_LIBS WV1_CFLAGS WV1_LIBS ENABLE_WV1_TRUE ENABLE_WV1_FALSE KDE_CONFIG KDE_PREFIX ENABLE_WEBSERVICES_TRUE ENABLE_WEBSERVICES_FALSE GAC_PREFIX GNOME_PREFIX HAS_LIBCHM_TRUE HAS_LIBCHM_FALSE BEAGLE_DEFINES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYBEAGLE_CFLAGS PYBEAGLE_LIBS PYGTK_CODEGEN ENABLE_PYTHON_TRUE ENABLE_PYTHON_FALSE PYGTK_DEFSDIR LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASH ZIP MONO MCS ac_pt_PKG_CONFIG MONO_CFLAGS MONO_LIBS SHARPZIPLIB_LIBS OS_LINUX_TRUE OS_LINUX_FALSE OS_FREEBSD_TRUE OS_FREEBSD_FALSE DESKTOP_LAUNCH ENABLE_DESKTOP_LAUNCH_TRUE ENABLE_DESKTOP_LAUNCH_FALSE WSDL ENABLE_GOOGLEDRIVER_TRUE ENABLE_GOOGLEDRIVER_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB SQLITE_CFLAGS SQLITE_LIBS SQLITE3_CFLAGS SQLITE3_LIBS SQLITE_MAJ_VER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS ENABLE_LIBXSS_TRUE ENABLE_LIBXSS_FALSE ENABLE_THUNDERBIRD_TRUE ENABLE_THUNDERBIRD_FALSE ENABLE_GUI_TRUE ENABLE_GUI_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS BEAGLE_UI_CFLAGS BEAGLE_UI_LIBS UIGLUE_CFLAGS UIGLUE_LIBS LIBTRAYICON_CFLAGS LIBTRAYICON_LIBS OPEN_WITH_CFLAGS OPEN_WITH_LIBS ENABLE_OPEN_WITH_TRUE ENABLE_OPEN_WITH_FALSE EVO_LIBDIR EVO_CFLAGS EVO_LIBS ENABLE_EVOLUTION_TRUE ENABLE_EVOLUTION_FALSE USE_LOCAL_SQLITE_TRUE USE_LOCAL_SQLITE_FALSE ENABLE_INOTIFY_TRUE ENABLE_INOTIFY_FALSE GSF_SHARP_CFLAGS GSF_SHARP_LIBS ENABLE_GSF_SHARP_TRUE ENABLE_GSF_SHARP_FALSE LIBEXIF_CFLAGS LIBEXIF_LIBS LIBEXIF_API_CHECK_CFLAGS LIBEXIF_API_CHECK_LIBS LIBEXIF_VERSION_CHECK_CFLAGS LIBEXIF_VERSION_CHECK_LIBS EXIF_SOVERSION BEAGLED_CFLAGS BEAGLED_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBBEAGLE_VERSION_INFO LIBBEAGLE_CFLAGS LIBBEAGLE_LIBS ENABLE_LIBBEAGLE_TRUE ENABLE_LIBBEAGLE_FALSE ENABLE_BLUDGEON_TRUE ENABLE_BLUDGEON_FALSE EPIPHANY_REQUIRED LIBXML_REQUIRED LIBGLIB_REQUIRED LIBGTK_REQUIRED EPIPHANY_DEPENDENCY_CFLAGS EPIPHANY_DEPENDENCY_LIBS EPIPHANY_EXTENSIONS_DIR EPIPHANY_PREFIX ENABLE_EPIPHANY_EXTENSION_TRUE ENABLE_EPIPHANY_EXTENSION_FALSE INSTALL_EPIPHANY_EXTENSION_TRUE INSTALL_EPIPHANY_EXTENSION_FALSE GALAGO_CFLAGS GALAGO_LIBS ENABLE_GALAGO_TRUE ENABLE_GALAGO_FALSE GTK_BINARY_VERSION SYSTEMINFO_GLUE_X_LIBS WV1_CFLAGS WV1_LIBS ENABLE_WV1_TRUE ENABLE_WV1_FALSE KDE_CONFIG KDE_PREFIX ENABLE_WEBSERVICES_TRUE ENABLE_WEBSERVICES_FALSE GAC_PREFIX GNOME_PREFIX HAS_LIBCHM_TRUE HAS_LIBCHM_FALSE BEAGLE_DEFINES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYBEAGLE_CFLAGS PYBEAGLE_LIBS PYGTK_CODEGEN ENABLE_PYTHON_TRUE ENABLE_PYTHON_FALSE PYGTK_DEFSDIR LIBOBJS LTLIBOBJS'
 +ac_subst_vars='SHELL
 +PATH_SEPARATOR
 +PACKAGE_NAME
@@ -2541,8 +2664,10 @@
 +X_PRE_LIBS
 +X_LIBS
 +X_EXTRA_LIBS
-+HAS_LIBXSS_TRUE
-+HAS_LIBXSS_FALSE
++ENABLE_LIBXSS_TRUE
++ENABLE_LIBXSS_FALSE
++ENABLE_THUNDERBIRD_TRUE
++ENABLE_THUNDERBIRD_FALSE
 +ENABLE_GUI_TRUE
 +ENABLE_GUI_FALSE
 +GNOME_VFS_CFLAGS
@@ -2608,8 +2733,6 @@
 +ENABLE_GALAGO_TRUE
 +ENABLE_GALAGO_FALSE
 +GTK_BINARY_VERSION
-+SYSTEMINFO_GLUE_CFLAGS
-+SYSTEMINFO_GLUE_LIBS
 +SYSTEMINFO_GLUE_X_LIBS
 +WV1_CFLAGS
 +WV1_LIBS
@@ -2693,8 +2816,6 @@
 +EPIPHANY_DEPENDENCY_LIBS
 +GALAGO_CFLAGS
 +GALAGO_LIBS
-+SYSTEMINFO_GLUE_CFLAGS
-+SYSTEMINFO_GLUE_LIBS
 +WV1_CFLAGS
 +WV1_LIBS
 +PYBEAGLE_CFLAGS
@@ -2703,7 +2824,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -491,34 +1115,48 @@
+@@ -491,34 +1113,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -2759,7 +2880,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -540,12 +1178,18 @@
+@@ -540,12 +1176,18 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -2781,7 +2902,7 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -553,7 +1197,17 @@
+@@ -553,7 +1195,17 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -2800,7 +2921,7 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -562,11 +1216,7 @@
+@@ -562,11 +1214,7 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -2813,7 +2934,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -593,6 +1243,12 @@
+@@ -593,6 +1241,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -2826,7 +2947,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -617,13 +1273,16 @@
+@@ -617,13 +1271,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -2847,7 +2968,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -688,6 +1347,16 @@
+@@ -688,6 +1345,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -2864,7 +2985,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -744,11 +1413,7 @@
+@@ -744,11 +1411,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -2877,7 +2998,7 @@
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -757,7 +1422,7 @@
+@@ -757,7 +1420,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -2886,7 +3007,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -788,8 +1453,7 @@
+@@ -788,8 +1451,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -2896,7 +3017,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -809,27 +1473,19 @@
+@@ -809,27 +1471,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -2934,7 +3055,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -856,258 +1512,76 @@
+@@ -856,250 +1510,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -3203,14 +3324,6 @@
 -ac_env_GALAGO_LIBS_value=$GALAGO_LIBS
 -ac_cv_env_GALAGO_LIBS_set=${GALAGO_LIBS+set}
 -ac_cv_env_GALAGO_LIBS_value=$GALAGO_LIBS
--ac_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
--ac_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
--ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
--ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
--ac_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
--ac_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
--ac_cv_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
--ac_cv_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
 -ac_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
 -ac_env_WV1_CFLAGS_value=$WV1_CFLAGS
 -ac_cv_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
@@ -3247,7 +3360,7 @@
  
  #
  # Report the --help message.
-@@ -1136,9 +1610,6 @@
+@@ -1128,9 +1608,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -3257,7 +3370,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -1156,15 +1627,22 @@
+@@ -1148,15 +1625,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -3283,7 +3396,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1194,10 +1672,8 @@
+@@ -1186,10 +1670,8 @@
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
    --enable-maintainer-mode  enable make rules and dependencies not useful
  			  (and sometimes confusing) to the casual installer
@@ -3296,7 +3409,7 @@
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-dependency-tracking  speeds up one-time build
-@@ -1225,8 +1701,7 @@
+@@ -1220,8 +1702,7 @@
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
@@ -3306,7 +3419,7 @@
    --with-x                use the X Window System
    --with-html-dir=PATH    path to installed docs
  
-@@ -1235,8 +1710,8 @@
+@@ -1230,8 +1711,8 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
@@ -3317,7 +3430,7 @@
    CPP         C preprocessor
    CXX         C++ compiler command
    CXXFLAGS    C++ compiler flags
-@@ -1253,6 +1728,7 @@
+@@ -1248,6 +1729,7 @@
                C compiler flags for SQLITE3, overriding pkg-config
    SQLITE3_LIBS
                linker flags for SQLITE3, overriding pkg-config
@@ -3325,7 +3438,7 @@
    GNOME_VFS_CFLAGS
                C compiler flags for GNOME_VFS, overriding pkg-config
    GNOME_VFS_LIBS
-@@ -1321,118 +1797,86 @@
+@@ -1312,118 +1794,86 @@
  it to find libraries and programs with nonstandard names/locations.
  
  _ACEOF
@@ -3490,7 +3603,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1451,7 +1895,7 @@
+@@ -1442,7 +1892,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -3499,7 +3612,7 @@
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1465,6 +1909,7 @@
+@@ -1456,6 +1906,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -3507,7 +3620,7 @@
  
  } >&5
  
-@@ -1486,7 +1931,6 @@
+@@ -1477,7 +1928,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -3515,7 +3628,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1497,7 +1941,7 @@
+@@ -1488,7 +1938,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -3524,7 +3637,7 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1519,9 +1963,7 @@
+@@ -1510,9 +1960,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -3535,7 +3648,7 @@
        ;;
      esac
    done
-@@ -1532,8 +1974,8 @@
+@@ -1523,8 +1971,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -3546,7 +3659,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1546,20 +1988,34 @@
+@@ -1537,20 +1985,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -3591,7 +3704,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1570,22 +2026,28 @@
+@@ -1561,22 +2023,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -3627,7 +3740,7 @@
        done | sort
        echo
      fi
-@@ -1597,26 +2059,24 @@
+@@ -1588,26 +2056,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -3659,7 +3772,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1647,14 +2107,17 @@
+@@ -1638,14 +2104,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -3684,7 +3797,7 @@
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1670,8 +2133,8 @@
+@@ -1661,8 +2130,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -3695,7 +3808,7 @@
      esac
    fi
  else
-@@ -1683,12 +2146,11 @@
+@@ -1674,12 +2143,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -3711,7 +3824,7 @@
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1713,8 +2175,7 @@
+@@ -1704,8 +2172,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -3721,7 +3834,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1731,12 +2192,6 @@
+@@ -1722,12 +2189,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -3734,7 +3847,7 @@
  
  
  
-@@ -1753,107 +2208,162 @@
+@@ -1744,107 +2205,162 @@
  
  
  
@@ -3949,7 +4062,7 @@
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1876,8 +2386,8 @@
+@@ -1867,8 +2383,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -3960,7 +4073,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1899,7 +2409,7 @@
+@@ -1890,7 +2406,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3969,7 +4082,7 @@
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1918,21 +2428,22 @@
+@@ -1909,21 +2425,22 @@
      ;;
  esac
  done
@@ -3997,7 +4110,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1942,8 +2453,8 @@
+@@ -1933,8 +2450,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -4008,7 +4121,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1985,20 +2496,20 @@
+@@ -1976,20 +2493,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -4034,7 +4147,7 @@
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2050,8 +2561,8 @@
+@@ -2041,8 +2558,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -4045,7 +4158,7 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2064,54 +2575,57 @@
+@@ -2055,54 +2572,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4124,7 +4237,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2182,8 +2696,8 @@
+@@ -2173,8 +2693,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -4135,7 +4248,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2196,32 +2710,34 @@
+@@ -2187,32 +2707,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4177,7 +4290,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2234,27 +2750,41 @@
+@@ -2225,27 +2747,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4226,7 +4339,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2296,17 +2826,17 @@
+@@ -2287,17 +2823,17 @@
  
  ########################################################################
  
@@ -4252,7 +4365,7 @@
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -2320,7 +2850,7 @@
+@@ -2311,7 +2847,7 @@
    MAINT=$MAINTAINER_MODE_TRUE
  
  
@@ -4261,7 +4374,7 @@
  
  
  # Find a good install program.  We prefer a C program (faster),
-@@ -2336,8 +2866,8 @@
+@@ -2327,8 +2863,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -4272,7 +4385,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2359,7 +2889,7 @@
+@@ -2350,7 +2886,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4281,7 +4394,7 @@
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -2378,21 +2908,22 @@
+@@ -2369,21 +2905,22 @@
      ;;
  esac
  done
@@ -4309,7 +4422,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2402,10 +2933,9 @@
+@@ -2393,10 +2930,9 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -4322,7 +4435,7 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -2424,12 +2954,12 @@
+@@ -2415,12 +2951,12 @@
      esac
  else
    enable_shared=yes
@@ -4339,7 +4452,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -2448,12 +2978,12 @@
+@@ -2439,12 +2975,12 @@
      esac
  else
    enable_static=yes
@@ -4356,7 +4469,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -2472,11 +3002,12 @@
+@@ -2463,11 +2999,12 @@
      esac
  else
    enable_fast_install=yes
@@ -4371,7 +4484,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2486,8 +3017,8 @@
+@@ -2477,8 +3014,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -4382,7 +4495,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2514,15 +3045,15 @@
+@@ -2505,15 +3042,15 @@
  fi
  
  
@@ -4403,7 +4516,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2547,8 +3078,8 @@
+@@ -2538,8 +3075,8 @@
  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
@@ -4414,7 +4527,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2561,32 +3092,34 @@
+@@ -2552,32 +3089,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4456,7 +4569,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2599,36 +3132,51 @@
+@@ -2590,36 +3129,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4518,7 +4631,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2641,74 +3189,34 @@
+@@ -2632,74 +3186,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4602,7 +4715,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2722,7 +3230,7 @@
+@@ -2713,7 +3227,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4611,7 +4724,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2733,6 +3241,7 @@
+@@ -2724,6 +3238,7 @@
    fi
  done
  done
@@ -4619,7 +4732,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2750,22 +3259,23 @@
+@@ -2741,22 +3256,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -4650,7 +4763,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2778,36 +3288,38 @@
+@@ -2769,36 +3285,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4697,7 +4810,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2820,29 +3332,45 @@
+@@ -2811,29 +3329,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4749,7 +4862,7 @@
  fi
  
  fi
-@@ -2855,21 +3383,35 @@
+@@ -2846,21 +3380,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -4793,7 +4906,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2894,46 +3436,70 @@
+@@ -2885,46 +3433,70 @@
  # 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.
@@ -4886,7 +4999,7 @@
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2946,19 +3512,23 @@
+@@ -2937,19 +3509,23 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -4917,7 +5030,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2977,22 +3547,27 @@
+@@ -2968,22 +3544,27 @@
      fi
    fi
  fi
@@ -4956,7 +5069,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -3003,9 +3578,8 @@
+@@ -2994,9 +3575,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -4967,7 +5080,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -3019,14 +3593,14 @@
+@@ -3010,14 +3590,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -4986,7 +5099,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3046,14 +3620,20 @@
+@@ -3037,14 +3617,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -5011,7 +5124,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -3071,12 +3651,12 @@
+@@ -3062,12 +3648,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -5028,7 +5141,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3099,24 +3679,36 @@
+@@ -3090,24 +3676,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5073,7 +5186,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3125,24 +3717,28 @@
+@@ -3116,24 +3714,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -5110,7 +5223,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3158,24 +3754,36 @@
+@@ -3149,24 +3751,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5155,7 +5268,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3184,12 +3792,131 @@
+@@ -3175,12 +3789,131 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -5291,7 +5404,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3205,12 +3932,12 @@
+@@ -3196,12 +3929,12 @@
      CFLAGS=
    fi
  fi
@@ -5308,7 +5421,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3244,12 +3971,17 @@
+@@ -3235,12 +3968,17 @@
  /* 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
@@ -5328,7 +5441,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3264,205 +3996,74 @@
+@@ -3255,205 +3993,74 @@
    return 0;
  }
  _ACEOF
@@ -5573,7 +5686,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3471,8 +4072,8 @@
+@@ -3462,8 +4069,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -5584,7 +5697,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3561,8 +4162,8 @@
+@@ -3552,8 +4159,8 @@
  fi
  
  fi
@@ -5595,7 +5708,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3578,8 +4179,8 @@
+@@ -3569,8 +4176,8 @@
  fi
  
  
@@ -5606,7 +5719,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3632,37 +4233,184 @@
+@@ -3623,37 +4230,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -5680,30 +5793,30 @@
 +IFS=$as_save_IFS
 +
 +
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
-+
+ 
 +else
 +  ac_cv_path_GREP=$GREP
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++fi
  
- 
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
- 
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
 +
++
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
@@ -5808,7 +5921,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3691,11 +4439,11 @@
+@@ -3682,11 +4436,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -5824,7 +5937,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3728,17 +4476,17 @@
+@@ -3719,17 +4473,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -5848,7 +5961,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3752,20 +4500,20 @@
+@@ -3743,20 +4497,20 @@
    ;;
  esac
  fi
@@ -5875,7 +5988,7 @@
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
  "" | " "*) ;;
-@@ -3782,8 +4530,8 @@
+@@ -3773,8 +4527,8 @@
      ;;
  esac
  
@@ -5886,7 +5999,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3831,23 +4579,23 @@
+@@ -3822,23 +4576,23 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
@@ -5920,7 +6033,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3897,7 +4645,7 @@
+@@ -3888,7 +4642,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -5929,7 +6042,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -3951,11 +4699,11 @@
+@@ -3942,11 +4696,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -5943,7 +6056,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -4022,8 +4770,8 @@
+@@ -4013,8 +4767,8 @@
  esac
  
  fi
@@ -5954,7 +6067,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -4041,11 +4789,11 @@
+@@ -4032,11 +4786,11 @@
  compiler=$CC
  
  
@@ -5969,16 +6082,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -4072,7 +4820,7 @@
+@@ -4063,7 +4817,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4075 "configure"' > conftest.$ac_ext
-+  echo '#line 4823 "configure"' > conftest.$ac_ext
+-  echo '#line 4066 "configure"' > conftest.$ac_ext
++  echo '#line 4820 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4157,8 +4905,8 @@
+@@ -4148,8 +4902,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -5989,7 +6102,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4184,24 +4932,36 @@
+@@ -4175,24 +4929,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -6034,7 +6147,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4210,9 +4970,10 @@
+@@ -4201,9 +4967,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6047,7 +6160,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4221,8 +4982,8 @@
+@@ -4212,8 +4979,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -6058,7 +6171,7 @@
    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
      CFLAGS="$SAVE_CFLAGS"
-@@ -4259,8 +5020,8 @@
+@@ -4250,8 +5017,8 @@
  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
@@ -6069,7 +6182,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -4294,8 +5055,13 @@
+@@ -4285,8 +5052,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6085,7 +6198,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4320,9 +5086,10 @@
+@@ -4311,9 +5083,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6097,7 +6210,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4332,8 +5099,13 @@
+@@ -4323,8 +5096,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6113,7 +6226,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4360,6 +5132,7 @@
+@@ -4351,6 +5129,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6121,7 +6234,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4377,8 +5150,8 @@
+@@ -4368,8 +5147,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -6132,7 +6245,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -4401,8 +5174,13 @@
+@@ -4392,8 +5171,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6148,7 +6261,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4427,9 +5205,10 @@
+@@ -4418,9 +5202,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6160,7 +6273,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4439,8 +5218,13 @@
+@@ -4430,8 +5215,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6176,7 +6289,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4467,6 +5251,7 @@
+@@ -4458,6 +5248,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6184,7 +6297,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4489,8 +5274,8 @@
+@@ -4480,8 +5271,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -6195,7 +6308,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4514,24 +5299,36 @@
+@@ -4505,24 +5296,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6240,7 +6353,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4540,9 +5337,10 @@
+@@ -4531,9 +5334,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6253,7 +6366,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4598,6 +5396,7 @@
+@@ -4589,6 +5393,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -6261,7 +6374,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4617,18 +5416,27 @@
+@@ -4608,18 +5413,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -6295,7 +6408,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4641,12 +5449,14 @@
+@@ -4632,12 +5446,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -6313,7 +6426,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4669,9 +5479,9 @@
+@@ -4660,9 +5476,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6326,7 +6439,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4685,24 +5495,36 @@
+@@ -4676,24 +5492,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6371,7 +6484,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4711,12 +5533,14 @@
+@@ -4702,12 +5530,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6390,7 +6503,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -4731,18 +5555,19 @@
+@@ -4722,18 +5552,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6418,7 +6531,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4753,24 +5578,36 @@
+@@ -4744,24 +5575,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6463,7 +6576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4779,15 +5616,16 @@
+@@ -4770,15 +5613,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6486,7 +6599,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4796,8 +5634,13 @@
+@@ -4787,8 +5631,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -6502,7 +6615,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4821,9 +5664,10 @@
+@@ -4812,9 +5661,10 @@
  
    ac_header_preproc=no
  fi
@@ -6515,7 +6628,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4847,25 +5691,19 @@
+@@ -4838,25 +5688,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -6548,7 +6661,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4877,18 +5715,22 @@
+@@ -4868,18 +5712,22 @@
  
  done
  
@@ -6576,7 +6689,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4901,36 +5743,38 @@
+@@ -4892,36 +5740,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6623,7 +6736,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4943,55 +5787,85 @@
+@@ -4934,55 +5784,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6727,7 +6840,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5014,24 +5888,36 @@
+@@ -5005,24 +5885,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6772,7 +6885,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5040,24 +5926,28 @@
+@@ -5031,24 +5923,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6809,7 +6922,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5073,24 +5963,36 @@
+@@ -5064,24 +5960,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6854,7 +6967,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5099,70 +6001,53 @@
+@@ -5090,70 +5998,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6949,7 +7062,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5171,62 +6056,92 @@
+@@ -5162,62 +6053,92 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7065,7 +7178,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5234,8 +6149,8 @@
+@@ -5225,8 +6146,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -7076,7 +7189,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5324,8 +6239,8 @@
+@@ -5315,8 +6236,8 @@
  fi
  
  fi
@@ -7087,7 +7200,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -5346,13 +6261,13 @@
+@@ -5337,13 +6258,13 @@
  if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
      (test "X$CXX" != "Xg++"))) ; then
@@ -7104,7 +7217,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5382,8 +6297,13 @@
+@@ -5373,8 +6294,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7120,7 +7233,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5408,9 +6328,10 @@
+@@ -5399,9 +6325,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7132,7 +7245,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5420,8 +6341,13 @@
+@@ -5411,8 +6338,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7148,7 +7261,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5448,6 +6374,7 @@
+@@ -5439,6 +6371,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7156,7 +7269,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5465,8 +6392,8 @@
+@@ -5456,8 +6389,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -7167,7 +7280,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -5489,8 +6416,13 @@
+@@ -5480,8 +6413,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7183,7 +7296,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5515,9 +6447,10 @@
+@@ -5506,9 +6444,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7195,7 +7308,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5527,8 +6460,13 @@
+@@ -5518,8 +6457,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7211,7 +7324,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5555,6 +6493,7 @@
+@@ -5546,6 +6490,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7219,7 +7332,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5570,7 +6509,7 @@
+@@ -5561,7 +6506,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -7228,7 +7341,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5584,12 +6523,12 @@
+@@ -5575,12 +6520,12 @@
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_f77_compiler_gnu
  if test -n "$ac_tool_prefix"; then
@@ -7244,7 +7357,7 @@
  if test "${ac_cv_prog_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5602,36 +6541,38 @@
+@@ -5593,36 +6538,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7291,7 +7404,7 @@
  if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5644,48 +6585,78 @@
+@@ -5635,48 +6582,78 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7344,7 +7457,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:5674:" \
+-echo "$as_me:5665:" \
 -     "checking for Fortran 77 compiler version" >&5
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
@@ -7384,7 +7497,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -5695,8 +6666,8 @@
+@@ -5686,8 +6663,8 @@
  # input file.  (Note that this only needs to work for GNU compilers.)
  ac_save_ext=$ac_ext
  ac_ext=F
@@ -7395,7 +7508,7 @@
  if test "${ac_cv_f77_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5709,24 +6680,36 @@
+@@ -5700,24 +6677,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7440,7 +7553,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5735,20 +6718,21 @@
+@@ -5726,20 +6715,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7468,7 +7581,7 @@
  if test "${ac_cv_prog_f77_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5759,24 +6743,36 @@
+@@ -5750,24 +6740,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7513,7 +7626,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5785,13 +6781,14 @@
+@@ -5776,13 +6778,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7532,7 +7645,7 @@
  if test "$ac_test_FFLAGS" = set; then
    FFLAGS=$ac_save_FFLAGS
  elif test $ac_cv_prog_f77_g = yes; then
-@@ -5820,8 +6817,8 @@
+@@ -5811,8 +6814,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -7543,7 +7656,7 @@
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5929,19 +6926,19 @@
+@@ -5920,19 +6923,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7569,7 +7682,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5976,7 +6973,7 @@
+@@ -5967,7 +6970,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'"
    ;;
@@ -7578,7 +7691,7 @@
    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'"
-@@ -6145,15 +7142,15 @@
+@@ -6136,15 +7139,15 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -7600,7 +7713,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6167,8 +7164,8 @@
+@@ -6158,8 +7161,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -7611,7 +7724,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -6219,8 +7216,8 @@
+@@ -6210,8 +7213,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -7622,7 +7735,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6233,32 +7230,34 @@
+@@ -6224,32 +7227,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7664,7 +7777,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6271,27 +7270,41 @@
+@@ -6262,27 +7267,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7713,7 +7826,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -6299,8 +7312,8 @@
+@@ -6290,8 +7309,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -7724,7 +7837,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6313,32 +7326,34 @@
+@@ -6304,32 +7323,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7766,7 +7879,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6351,27 +7366,41 @@
+@@ -6342,27 +7363,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7815,7 +7928,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -6379,8 +7408,8 @@
+@@ -6370,8 +7405,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -7826,7 +7939,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6393,32 +7422,34 @@
+@@ -6384,32 +7419,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7868,7 +7981,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6431,27 +7462,41 @@
+@@ -6422,27 +7459,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7917,7 +8030,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -6510,8 +7555,8 @@
+@@ -6501,8 +7552,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7928,7 +8041,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6563,17 +7608,17 @@
+@@ -6554,17 +7605,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7952,7 +8065,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6625,11 +7670,11 @@
+@@ -6616,11 +7667,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7968,7 +8081,7 @@
  fi
  
    else
-@@ -6644,21 +7689,21 @@
+@@ -6635,21 +7686,21 @@
  enable_dlopen=no
  enable_win32_dll=no
  
@@ -7997,7 +8110,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -6716,8 +7761,8 @@
+@@ -6707,8 +7758,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -8008,21 +8121,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6734,11 +7779,11 @@
+@@ -6725,11 +7776,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:6737: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:6728: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7779: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:6741: \$? = $ac_status" >&5
-+   echo "$as_me:7786: \$? = $ac_status" >&5
+-   echo "$as_me:6732: \$? = $ac_status" >&5
++   echo "$as_me:7783: \$? = $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.
-@@ -6751,8 +7796,8 @@
+@@ -6742,8 +7793,8 @@
     $rm conftest*
  
  fi
@@ -8033,7 +8146,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -6766,8 +7811,8 @@
+@@ -6757,8 +7808,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -8044,7 +8157,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -6896,7 +7941,7 @@
+@@ -6887,7 +7938,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -8053,7 +8166,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl='-Wl,'
-@@ -6976,16 +8021,16 @@
+@@ -6967,16 +8018,16 @@
      esac
    fi
  
@@ -8074,21 +8187,21 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7002,11 +8047,11 @@
+@@ -6993,11 +8044,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:7005: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8050: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:6996: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8047: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7009: \$? = $ac_status" >&5
-+   echo "$as_me:8054: \$? = $ac_status" >&5
+-   echo "$as_me:7000: \$? = $ac_status" >&5
++   echo "$as_me:8051: \$? = $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.
-@@ -7019,8 +8064,8 @@
+@@ -7010,8 +8061,8 @@
     $rm conftest*
  
  fi
@@ -8099,7 +8212,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -7047,8 +8092,8 @@
+@@ -7038,8 +8089,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -8110,7 +8223,7 @@
  if test "${lt_prog_compiler_static_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7075,8 +8120,8 @@
+@@ -7066,8 +8117,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -8121,7 +8234,7 @@
  
  if test x"$lt_prog_compiler_static_works" = xyes; then
      :
-@@ -7085,8 +8130,8 @@
+@@ -7076,8 +8127,8 @@
  fi
  
  
@@ -8132,21 +8245,21 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7106,11 +8151,11 @@
+@@ -7097,11 +8148,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:7109: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7100: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:8151: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:7113: \$? = $ac_status" >&5
-+   echo "$as_me:8158: \$? = $ac_status" >&5
+-   echo "$as_me:7104: \$? = $ac_status" >&5
++   echo "$as_me:8155: \$? = $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
-@@ -7132,23 +8177,23 @@
+@@ -7123,23 +8174,23 @@
     $rm conftest*
  
  fi
@@ -8176,7 +8289,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -7158,8 +8203,8 @@
+@@ -7149,8 +8200,8 @@
    need_locks=no
  fi
  
@@ -8187,7 +8300,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -7335,7 +8380,7 @@
+@@ -7326,7 +8377,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'
        ;;
  
@@ -8196,7 +8309,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -7361,12 +8406,13 @@
+@@ -7352,12 +8403,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
@@ -8211,7 +8324,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -7574,24 +8620,36 @@
+@@ -7565,24 +8617,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8256,7 +8369,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7605,8 +8663,10 @@
+@@ -7596,8 +8660,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8268,7 +8381,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -7635,24 +8695,36 @@
+@@ -7626,24 +8692,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8313,7 +8426,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7666,8 +8738,10 @@
+@@ -7657,8 +8735,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8325,7 +8438,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -7798,7 +8872,7 @@
+@@ -7789,7 +8869,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8334,7 +8447,7 @@
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -7900,7 +8974,7 @@
+@@ -7891,7 +8971,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -8343,7 +8456,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -8116,8 +9190,8 @@
+@@ -8107,8 +9187,8 @@
      esac
    fi
  
@@ -8354,7 +8467,7 @@
  test "$ld_shlibs" = no && can_build_shared=no
  
  #
-@@ -8137,8 +9211,8 @@
+@@ -8128,8 +9208,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -8365,7 +8478,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -8175,16 +9249,16 @@
+@@ -8166,16 +9246,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -8386,7 +8499,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -8390,18 +9464,6 @@
+@@ -8381,18 +9461,6 @@
    dynamic_linker=no
    ;;
  
@@ -8405,7 +8518,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -8557,7 +9619,7 @@
+@@ -8548,7 +9616,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -8414,7 +8527,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8586,7 +9648,7 @@
+@@ -8577,7 +9645,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8423,7 +8536,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8595,7 +9657,7 @@
+@@ -8586,7 +9654,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -8432,7 +8545,7 @@
    ;;
  
  netbsd*)
-@@ -8771,8 +9833,8 @@
+@@ -8762,8 +9830,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -8443,7 +8556,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -8780,8 +9842,8 @@
+@@ -8771,8 +9839,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -8454,7 +8567,7 @@
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -8805,8 +9867,8 @@
+@@ -8796,8 +9864,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -8465,7 +8578,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -8819,29 +9881,29 @@
+@@ -8810,29 +9878,29 @@
  
  striplib=
  old_striplib=
@@ -8505,7 +8618,7 @@
      ;;
    esac
  fi
-@@ -8873,8 +9935,8 @@
+@@ -8864,8 +9932,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -8516,7 +8629,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8887,40 +9949,52 @@
+@@ -8878,40 +9946,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8581,7 +8694,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8929,14 +10003,15 @@
+@@ -8920,14 +10000,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8601,7 +8714,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -8950,8 +10025,8 @@
+@@ -8941,8 +10022,8 @@
     ;;
  
    *)
@@ -8612,7 +8725,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8978,53 +10053,59 @@
+@@ -8969,53 +10050,59 @@
  
  #undef shl_load
  
@@ -8691,7 +8804,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9033,18 +10114,19 @@
+@@ -9024,18 +10111,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8717,7 +8830,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9057,40 +10139,52 @@
+@@ -9048,40 +10136,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8782,7 +8895,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9099,19 +10193,20 @@
+@@ -9090,19 +10190,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8809,7 +8922,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9138,53 +10233,59 @@
+@@ -9129,53 +10230,59 @@
  
  #undef dlopen
  
@@ -8888,7 +9001,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9193,18 +10294,19 @@
+@@ -9184,18 +10291,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8914,7 +9027,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9217,40 +10319,52 @@
+@@ -9208,40 +10316,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8979,7 +9092,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9259,19 +10373,20 @@
+@@ -9250,19 +10370,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9006,7 +9119,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9284,40 +10399,52 @@
+@@ -9275,40 +10396,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -9071,7 +9184,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9326,19 +10453,20 @@
+@@ -9317,19 +10450,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9098,7 +9211,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9351,40 +10479,52 @@
+@@ -9342,40 +10476,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -9163,7 +9276,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9393,14 +10533,15 @@
+@@ -9384,14 +10530,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9183,7 +9296,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -9440,8 +10581,8 @@
+@@ -9431,8 +10578,8 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -9194,16 +9307,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9451,7 +10592,7 @@
+@@ -9442,7 +10589,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9454 "configure"
-+#line 10595 "configure"
+-#line 9445 "configure"
++#line 10592 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9535,13 +10676,13 @@
+@@ -9526,13 +10673,13 @@
  
  
  fi
@@ -9221,16 +9334,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9551,7 +10692,7 @@
+@@ -9542,7 +10689,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9554 "configure"
-+#line 10695 "configure"
+-#line 9545 "configure"
++#line 10692 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9635,8 +10776,8 @@
+@@ -9626,8 +10773,8 @@
  
  
  fi
@@ -9241,7 +9354,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -9658,13 +10799,13 @@
+@@ -9649,13 +10796,13 @@
  
  
  # Report which library types will actually be built
@@ -9261,7 +9374,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -9684,15 +10825,15 @@
+@@ -9675,15 +10822,15 @@
    fi
      ;;
  esac
@@ -9283,7 +9396,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -10184,11 +11325,11 @@
+@@ -10175,11 +11322,11 @@
  CC="$lt_save_CC"
  
  
@@ -9299,7 +9412,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -10242,7 +11383,7 @@
+@@ -10233,7 +11380,7 @@
  	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  	    (test "X$CXX" != "Xg++"))) ; then
@@ -9308,7 +9421,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -10361,18 +11502,18 @@
+@@ -10352,18 +11499,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -9333,7 +9446,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -10401,11 +11542,11 @@
+@@ -10392,11 +11539,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -9349,7 +9462,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10438,17 +11579,17 @@
+@@ -10429,17 +11576,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -9373,7 +9486,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10462,8 +11603,8 @@
+@@ -10453,8 +11600,8 @@
    ;;
  esac
  fi
@@ -9384,7 +9497,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -10513,8 +11654,8 @@
+@@ -10504,8 +11651,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -9395,7 +9508,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -10626,24 +11767,36 @@
+@@ -10617,24 +11764,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9440,7 +9553,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10657,8 +11810,10 @@
+@@ -10648,8 +11807,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9452,7 +9565,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10688,24 +11843,36 @@
+@@ -10679,24 +11840,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9497,7 +9610,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10719,8 +11886,10 @@
+@@ -10710,8 +11883,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9509,7 +9622,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10868,7 +12037,7 @@
+@@ -10859,7 +12034,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -9518,7 +9631,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -11027,7 +12196,7 @@
+@@ -11018,7 +12193,7 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -9527,7 +9640,7 @@
      case $cc_basename in
        KCC*)
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11129,7 +12298,7 @@
+@@ -11120,7 +12295,7 @@
  	;;
      esac
      ;;
@@ -9536,7 +9649,7 @@
      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=
-@@ -11451,8 +12620,8 @@
+@@ -11442,8 +12617,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -9547,7 +9660,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -11591,8 +12760,8 @@
+@@ -11582,8 +12757,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -9558,7 +9671,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -11696,7 +12865,7 @@
+@@ -11687,7 +12862,7 @@
  	    ;;
  	esac
  	;;
@@ -9567,7 +9680,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -11739,7 +12908,7 @@
+@@ -11730,7 +12905,7 @@
  	    ;;
  	esac
  	;;
@@ -9576,7 +9689,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -11782,7 +12951,7 @@
+@@ -11773,7 +12948,7 @@
  	    ;;
  	esac
  	;;
@@ -9585,7 +9698,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -11865,16 +13034,16 @@
+@@ -11856,16 +13031,16 @@
      esac
    fi
  
@@ -9606,21 +9719,21 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11891,11 +13060,11 @@
+@@ -11882,11 +13057,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:11894: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13063: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11885: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13060: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:11898: \$? = $ac_status" >&5
-+   echo "$as_me:13067: \$? = $ac_status" >&5
+-   echo "$as_me:11889: \$? = $ac_status" >&5
++   echo "$as_me:13064: \$? = $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.
-@@ -11908,8 +13077,8 @@
+@@ -11899,8 +13074,8 @@
     $rm conftest*
  
  fi
@@ -9631,7 +9744,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -11936,8 +13105,8 @@
+@@ -11927,8 +13102,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
@@ -9642,7 +9755,7 @@
  if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11964,8 +13133,8 @@
+@@ -11955,8 +13130,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9653,7 +9766,7 @@
  
  if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
      :
-@@ -11974,8 +13143,8 @@
+@@ -11965,8 +13140,8 @@
  fi
  
  
@@ -9664,21 +9777,21 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11995,11 +13164,11 @@
+@@ -11986,11 +13161,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:11998: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13167: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11989: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:13164: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:12002: \$? = $ac_status" >&5
-+   echo "$as_me:13171: \$? = $ac_status" >&5
+-   echo "$as_me:11993: \$? = $ac_status" >&5
++   echo "$as_me:13168: \$? = $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
-@@ -12021,23 +13190,23 @@
+@@ -12012,23 +13187,23 @@
     $rm conftest*
  
  fi
@@ -9708,7 +9821,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -12047,8 +13216,8 @@
+@@ -12038,8 +13213,8 @@
    need_locks=no
  fi
  
@@ -9719,7 +9832,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -12067,13 +13236,16 @@
+@@ -12058,13 +13233,16 @@
    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'
    ;;
@@ -9738,7 +9851,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  #
-@@ -12093,8 +13265,8 @@
+@@ -12084,8 +13262,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -9749,7 +9862,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -12131,16 +13303,16 @@
+@@ -12122,16 +13300,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -9770,7 +9883,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -12346,18 +13518,6 @@
+@@ -12337,18 +13515,6 @@
    dynamic_linker=no
    ;;
  
@@ -9789,7 +9902,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -12513,7 +13673,7 @@
+@@ -12504,7 +13670,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -9798,7 +9911,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -12542,7 +13702,7 @@
+@@ -12533,7 +13699,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9807,7 +9920,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -12551,7 +13711,7 @@
+@@ -12542,7 +13708,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -9816,7 +9929,7 @@
    ;;
  
  netbsd*)
-@@ -12727,8 +13887,8 @@
+@@ -12718,8 +13884,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -9827,7 +9940,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -12736,8 +13896,8 @@
+@@ -12727,8 +13893,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -9838,7 +9951,7 @@
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
     test -n "$runpath_var_CXX" || \
-@@ -12761,8 +13921,8 @@
+@@ -12752,8 +13918,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -9849,7 +9962,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -13287,13 +14447,13 @@
+@@ -13278,13 +14444,13 @@
  cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
  
@@ -9869,7 +9982,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -13312,15 +14472,15 @@
+@@ -13303,15 +14469,15 @@
    fi
    ;;
  esac
@@ -9891,7 +10004,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -13329,8 +14489,8 @@
+@@ -13320,8 +14486,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -9902,7 +10015,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -13459,7 +14619,7 @@
+@@ -13450,7 +14616,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -9911,7 +10024,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_F77='-Wl,'
-@@ -13539,16 +14699,16 @@
+@@ -13530,16 +14696,16 @@
      esac
    fi
  
@@ -9932,21 +10045,21 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13565,11 +14725,11 @@
+@@ -13556,11 +14722,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:13568: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14728: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13559: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14725: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13572: \$? = $ac_status" >&5
-+   echo "$as_me:14732: \$? = $ac_status" >&5
+-   echo "$as_me:13563: \$? = $ac_status" >&5
++   echo "$as_me:14729: \$? = $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.
-@@ -13582,8 +14742,8 @@
+@@ -13573,8 +14739,8 @@
     $rm conftest*
  
  fi
@@ -9957,7 +10070,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -13610,8 +14770,8 @@
+@@ -13601,8 +14767,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
@@ -9968,7 +10081,7 @@
  if test "${lt_prog_compiler_static_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13638,8 +14798,8 @@
+@@ -13629,8 +14795,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9979,7 +10092,7 @@
  
  if test x"$lt_prog_compiler_static_works_F77" = xyes; then
      :
-@@ -13648,8 +14808,8 @@
+@@ -13639,8 +14805,8 @@
  fi
  
  
@@ -9990,21 +10103,21 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13669,11 +14829,11 @@
+@@ -13660,11 +14826,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:13672: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14832: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13663: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14829: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13676: \$? = $ac_status" >&5
-+   echo "$as_me:14836: \$? = $ac_status" >&5
+-   echo "$as_me:13667: \$? = $ac_status" >&5
++   echo "$as_me:14833: \$? = $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
-@@ -13695,23 +14855,23 @@
+@@ -13686,23 +14852,23 @@
     $rm conftest*
  
  fi
@@ -10034,7 +10147,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -13721,8 +14881,8 @@
+@@ -13712,8 +14878,8 @@
    need_locks=no
  fi
  
@@ -10045,7 +10158,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -13898,7 +15058,7 @@
+@@ -13889,7 +15055,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'
        ;;
  
@@ -10054,7 +10167,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -13924,12 +15084,13 @@
+@@ -13915,12 +15081,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
@@ -10069,7 +10182,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -14127,24 +15288,36 @@
+@@ -14118,24 +15285,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10114,7 +10227,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14158,8 +15331,10 @@
+@@ -14149,8 +15328,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10126,7 +10239,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14178,24 +15353,36 @@
+@@ -14169,24 +15350,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10171,7 +10284,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14209,8 +15396,10 @@
+@@ -14200,8 +15393,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10183,7 +10296,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14341,7 +15530,7 @@
+@@ -14332,7 +15527,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10192,7 +10305,7 @@
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -14443,7 +15632,7 @@
+@@ -14434,7 +15629,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -10201,7 +10314,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -14659,8 +15848,8 @@
+@@ -14650,8 +15845,8 @@
      esac
    fi
  
@@ -10212,7 +10325,7 @@
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
  #
-@@ -14680,8 +15869,8 @@
+@@ -14671,8 +15866,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -10223,7 +10336,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14718,16 +15907,16 @@
+@@ -14709,16 +15904,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -10244,7 +10357,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -14933,18 +16122,6 @@
+@@ -14924,18 +16119,6 @@
    dynamic_linker=no
    ;;
  
@@ -10263,7 +10376,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -15100,7 +16277,7 @@
+@@ -15091,7 +16274,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -10272,7 +10385,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -15129,7 +16306,7 @@
+@@ -15120,7 +16303,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10281,7 +10394,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -15138,7 +16315,7 @@
+@@ -15129,7 +16312,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -10290,7 +10403,7 @@
    ;;
  
  netbsd*)
-@@ -15314,8 +16491,8 @@
+@@ -15305,8 +16488,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -10301,7 +10414,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15323,8 +16500,8 @@
+@@ -15314,8 +16497,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -10312,7 +10425,7 @@
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
     test -n "$runpath_var_F77" || \
-@@ -15348,8 +16525,8 @@
+@@ -15339,8 +16522,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -10323,7 +10436,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -15786,7 +16963,6 @@
+@@ -15777,7 +16960,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -10331,7 +10444,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -15854,8 +17030,8 @@
+@@ -15845,8 +17027,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -10342,21 +10455,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15872,11 +17048,11 @@
+@@ -15863,11 +17045,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:15875: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17051: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15866: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17048: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15879: \$? = $ac_status" >&5
-+   echo "$as_me:17055: \$? = $ac_status" >&5
+-   echo "$as_me:15870: \$? = $ac_status" >&5
++   echo "$as_me:17052: \$? = $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.
-@@ -15889,8 +17065,8 @@
+@@ -15880,8 +17062,8 @@
     $rm conftest*
  
  fi
@@ -10367,7 +10480,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -15904,8 +17080,8 @@
+@@ -15895,8 +17077,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -10378,7 +10491,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16034,7 +17210,7 @@
+@@ -16025,7 +17207,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -10387,7 +10500,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16114,16 +17290,16 @@
+@@ -16105,16 +17287,16 @@
      esac
    fi
  
@@ -10408,21 +10521,21 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16140,11 +17316,11 @@
+@@ -16131,11 +17313,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:16143: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17319: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16134: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17316: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16147: \$? = $ac_status" >&5
-+   echo "$as_me:17323: \$? = $ac_status" >&5
+-   echo "$as_me:16138: \$? = $ac_status" >&5
++   echo "$as_me:17320: \$? = $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.
-@@ -16157,8 +17333,8 @@
+@@ -16148,8 +17330,8 @@
     $rm conftest*
  
  fi
@@ -10433,7 +10546,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -16185,8 +17361,8 @@
+@@ -16176,8 +17358,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
@@ -10444,7 +10557,7 @@
  if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16213,8 +17389,8 @@
+@@ -16204,8 +17386,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -10455,7 +10568,7 @@
  
  if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
      :
-@@ -16223,8 +17399,8 @@
+@@ -16214,8 +17396,8 @@
  fi
  
  
@@ -10466,21 +10579,21 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16244,11 +17420,11 @@
+@@ -16235,11 +17417,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:16247: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17423: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16238: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17420: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16251: \$? = $ac_status" >&5
-+   echo "$as_me:17427: \$? = $ac_status" >&5
+-   echo "$as_me:16242: \$? = $ac_status" >&5
++   echo "$as_me:17424: \$? = $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
-@@ -16270,23 +17446,23 @@
+@@ -16261,23 +17443,23 @@
     $rm conftest*
  
  fi
@@ -10510,7 +10623,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16296,8 +17472,8 @@
+@@ -16287,8 +17469,8 @@
    need_locks=no
  fi
  
@@ -10521,7 +10634,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -16473,7 +17649,7 @@
+@@ -16464,7 +17646,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'
        ;;
  
@@ -10530,7 +10643,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -16499,12 +17675,13 @@
+@@ -16490,12 +17672,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
@@ -10545,7 +10658,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -16712,24 +17889,36 @@
+@@ -16703,24 +17886,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10590,7 +10703,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16743,8 +17932,10 @@
+@@ -16734,8 +17929,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10602,7 +10715,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16773,24 +17964,36 @@
+@@ -16764,24 +17961,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10647,7 +10760,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16804,8 +18007,10 @@
+@@ -16795,8 +18004,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10659,7 +10772,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16936,7 +18141,7 @@
+@@ -16927,7 +18138,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10668,7 +10781,7 @@
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -17038,7 +18243,7 @@
+@@ -17029,7 +18240,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -10677,7 +10790,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17254,8 +18459,8 @@
+@@ -17245,8 +18456,8 @@
      esac
    fi
  
@@ -10688,7 +10801,7 @@
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
  #
-@@ -17275,8 +18480,8 @@
+@@ -17266,8 +18477,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -10699,7 +10812,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17313,16 +18518,16 @@
+@@ -17304,16 +18515,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -10720,7 +10833,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -17528,18 +18733,6 @@
+@@ -17519,18 +18730,6 @@
    dynamic_linker=no
    ;;
  
@@ -10739,7 +10852,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -17695,7 +18888,7 @@
+@@ -17686,7 +18885,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -10748,7 +10861,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17724,7 +18917,7 @@
+@@ -17715,7 +18914,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10757,7 +10870,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17733,7 +18926,7 @@
+@@ -17724,7 +18923,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -10766,7 +10879,7 @@
    ;;
  
  netbsd*)
-@@ -17909,8 +19102,8 @@
+@@ -17900,8 +19099,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -10777,7 +10890,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17918,8 +19111,8 @@
+@@ -17909,8 +19108,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -10788,7 +10901,7 @@
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
     test -n "$runpath_var_GCJ" || \
-@@ -17943,8 +19136,8 @@
+@@ -17934,8 +19133,8 @@
    # directories.
    hardcode_action_GCJ=unsupported
  fi
@@ -10799,7 +10912,7 @@
  
  if test "$hardcode_action_GCJ" = relink; then
    # Fast installation is not supported
-@@ -18380,7 +19573,6 @@
+@@ -18371,7 +19570,6 @@
        RC)
  
  
@@ -10807,7 +10920,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -18911,18 +20103,22 @@
+@@ -18902,18 +20100,22 @@
  
  
  
@@ -10835,7 +10948,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18935,36 +20131,38 @@
+@@ -18926,36 +20128,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10882,7 +10995,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18977,55 +20175,85 @@
+@@ -18968,55 +20172,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10986,7 +11099,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19048,24 +20276,36 @@
+@@ -19039,24 +20273,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11031,7 +11144,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19074,24 +20314,28 @@
+@@ -19065,24 +20311,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11068,7 +11181,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19107,24 +20351,36 @@
+@@ -19098,24 +20348,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11113,7 +11226,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19133,70 +20389,53 @@
+@@ -19124,70 +20386,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11208,7 +11321,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19205,61 +20444,91 @@
+@@ -19196,61 +20441,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11294,12 +11407,12 @@
 -  echo '#endif'             >>confdefs.h
 +
 +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
- fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -11322,7 +11435,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -19268,8 +20537,8 @@
+@@ -19259,8 +20534,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -11333,7 +11446,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19358,8 +20627,8 @@
+@@ -19349,8 +20624,8 @@
  fi
  
  fi
@@ -11344,7 +11457,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -19381,8 +20650,8 @@
+@@ -19372,8 +20647,8 @@
  
  # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -11355,7 +11468,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19397,28 +20666,29 @@
+@@ -19388,28 +20663,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11391,7 +11504,7 @@
  if test "x$PKG_CONFIG" = "xno"; then
  	{ { echo "$as_me:$LINENO: error: You need to install pkg-config" >&5
  echo "$as_me: error: You need to install pkg-config" >&2;}
-@@ -19427,8 +20697,8 @@
+@@ -19418,8 +20694,8 @@
  
  # Extract the first word of "bash", so it can be a program name with args.
  set dummy bash; ac_word=$2
@@ -11402,7 +11515,7 @@
  if test "${ac_cv_path_BASH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19443,34 +20713,35 @@
+@@ -19434,34 +20710,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11446,7 +11559,7 @@
  if test "${ac_cv_path_ZIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19485,32 +20756,33 @@
+@@ -19476,32 +20753,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11488,7 +11601,7 @@
  if test "${ac_cv_path_MONO+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19525,31 +20797,32 @@
+@@ -19516,31 +20794,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11529,7 +11642,7 @@
  if test "${ac_cv_path_MCS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19564,37 +20837,38 @@
+@@ -19555,37 +20834,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11578,7 +11691,7 @@
  fi
  
  # check that we have the require version of mono
-@@ -19604,8 +20878,8 @@
+@@ -19595,8 +20875,8 @@
  	if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
@@ -11589,7 +11702,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19620,34 +20894,35 @@
+@@ -19611,34 +20891,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11633,7 +11746,7 @@
  if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19662,28 +20937,42 @@
+@@ -19653,28 +20934,42 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11683,7 +11796,7 @@
  else
    PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
  fi
-@@ -19691,22 +20980,22 @@
+@@ -19682,22 +20977,22 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -11714,7 +11827,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$MONO_CFLAGS"; then
-@@ -19810,8 +21099,8 @@
+@@ -19801,8 +21096,8 @@
  else
  	MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
  	MONO_LIBS=$pkg_cv_MONO_LIBS
@@ -11725,7 +11838,7 @@
  	:
  fi
  
-@@ -19826,15 +21115,15 @@
+@@ -19817,15 +21112,15 @@
  # check for various mono DLLs that we need.
  needed_dlls="Mono.Data.SqliteClient Mono.Posix System.Runtime.Remoting System.Web System.Web.Services"
  for i in $needed_dlls; do
@@ -11745,7 +11858,7 @@
    fi
  done
  
-@@ -19881,18 +21170,19 @@
+@@ -19872,18 +21167,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11773,7 +11886,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19903,24 +21193,36 @@
+@@ -19894,24 +21190,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11818,7 +11931,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19929,15 +21231,16 @@
+@@ -19920,15 +21228,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11841,7 +11954,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19946,8 +21249,13 @@
+@@ -19937,8 +21246,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -11857,7 +11970,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -19971,9 +21279,10 @@
+@@ -19962,9 +21276,10 @@
  
    ac_header_preproc=no
  fi
@@ -11870,7 +11983,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -19997,25 +21306,19 @@
+@@ -19988,25 +21303,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -11903,7 +12016,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20031,9 +21334,9 @@
+@@ -20022,9 +21331,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11916,7 +12029,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -20059,53 +21362,59 @@
+@@ -20050,53 +21359,59 @@
  
  #undef $ac_func
  
@@ -11995,7 +12108,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20114,13 +21423,15 @@
+@@ -20105,13 +21420,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12015,7 +12128,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -20129,8 +21440,8 @@
+@@ -20120,8 +21437,8 @@
  fi
  done
  
@@ -12026,7 +12139,7 @@
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20225,15 +21536,15 @@
+@@ -20216,15 +21533,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -12045,7 +12158,7 @@
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -20241,17 +21552,17 @@
+@@ -20232,17 +21549,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -12068,7 +12181,7 @@
  
    /* Finally, make sure that changes to the mapped area do not
       percolate back to the file as seen by read().  (This is a bug on
-@@ -20260,24 +21571,33 @@
+@@ -20251,24 +21568,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -12110,7 +12223,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20290,11 +21610,13 @@
+@@ -20281,11 +21607,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -12127,7 +12240,7 @@
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20309,8 +21631,8 @@
+@@ -20300,8 +21628,8 @@
  
  # Extract the first word of "desktop-launch", so it can be a program name with args.
  set dummy desktop-launch; ac_word=$2
@@ -12138,7 +12251,7 @@
  if test "${ac_cv_path_DESKTOP_LAUNCH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20325,30 +21647,31 @@
+@@ -20316,30 +21644,31 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12176,7 +12289,7 @@
  if test "x$DESKTOP_LAUNCH" != "xno"; then
    ENABLE_DESKTOP_LAUNCH_TRUE=
    ENABLE_DESKTOP_LAUNCH_FALSE='#'
-@@ -20360,20 +21683,20 @@
+@@ -20351,20 +21680,20 @@
  
  # Google QueryDriver
  # Disable GoogleDriver by default, enable if you want know what you are doing
@@ -12203,7 +12316,7 @@
  if test "${ac_cv_path_WSDL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20388,27 +21711,28 @@
+@@ -20379,27 +21708,28 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12238,7 +12351,7 @@
  fi
  
  
-@@ -20427,25 +21751,30 @@
+@@ -20418,25 +21748,30 @@
  #
  
  
@@ -12284,7 +12397,7 @@
  fi
  
    INTLTOOL_DESKTOP_RULE='%.desktop:   %.desktop.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -20465,6 +21794,7 @@
+@@ -20456,6 +21791,7 @@
      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 $< $@'
@@ -12292,7 +12405,7 @@
  
  
  
-@@ -20484,20 +21814,19 @@
+@@ -20475,20 +21811,19 @@
  
  
  
@@ -12318,7 +12431,7 @@
  if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20512,27 +21841,28 @@
+@@ -20503,27 +21838,28 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12353,7 +12466,7 @@
  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;}
-@@ -20544,11 +21874,11 @@
+@@ -20535,11 +21871,11 @@
     { (exit 1); exit 1; }; }
  fi
  if test "x" != "xno-xml"; then
@@ -12369,7 +12482,7 @@
     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;}
-@@ -20558,8 +21888,8 @@
+@@ -20549,8 +21885,8 @@
  
  # Extract the first word of "iconv", so it can be a program name with args.
  set dummy iconv; ac_word=$2
@@ -12380,7 +12493,7 @@
  if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20574,32 +21904,33 @@
+@@ -20565,32 +21901,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12422,7 +12535,7 @@
  if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20614,32 +21945,33 @@
+@@ -20605,32 +21942,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12464,7 +12577,7 @@
  if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20654,32 +21986,33 @@
+@@ -20645,32 +21983,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12506,7 +12619,7 @@
  if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20694,40 +22027,37 @@
+@@ -20685,40 +22024,37 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12541,21 +12654,21 @@
  
 -# Remove file type tags (using []) from po/POTFILES.
 -
--
  
 +# Substitute ALL_LINGUAS so we can use it in po/Makefile
  
  
  
  
+ 
 -# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
- 
+-
 -          ac_config_commands="$ac_config_commands intltool"
 +ac_config_commands="$ac_config_commands intltool"
  
  
  
-@@ -20739,18 +22069,19 @@
+@@ -20730,18 +22066,19 @@
  for ac_header in locale.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12583,7 +12696,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20761,24 +22092,36 @@
+@@ -20752,24 +22089,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12628,7 +12741,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20787,15 +22130,16 @@
+@@ -20778,15 +22127,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12651,7 +12764,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20804,8 +22148,13 @@
+@@ -20795,8 +22145,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12667,7 +12780,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -20829,9 +22178,10 @@
+@@ -20820,9 +22175,10 @@
  
    ac_header_preproc=no
  fi
@@ -12680,7 +12793,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -20855,25 +22205,19 @@
+@@ -20846,25 +22202,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -12713,7 +12826,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20886,8 +22230,8 @@
+@@ -20877,8 +22227,8 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -12724,7 +12837,7 @@
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20907,24 +22251,36 @@
+@@ -20898,24 +22248,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12769,7 +12882,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20933,13 +22289,14 @@
+@@ -20924,13 +22286,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12788,7 +12901,7 @@
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20958,17 +22315,17 @@
+@@ -20949,17 +22312,17 @@
      INTLLIBS=
  
      if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -12812,7 +12925,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20979,24 +22336,36 @@
+@@ -20970,24 +22333,36 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12857,7 +12970,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21005,15 +22374,16 @@
+@@ -20996,15 +22371,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12880,7 +12993,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21022,8 +22392,13 @@
+@@ -21013,8 +22389,13 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -12896,7 +13009,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -21047,9 +22422,10 @@
+@@ -21038,9 +22419,10 @@
  
    ac_header_preproc=no
  fi
@@ -12909,7 +13022,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -21073,25 +22449,18 @@
+@@ -21064,25 +22446,18 @@
  echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
@@ -12940,7 +13053,7 @@
  
  fi
  if test $ac_cv_header_libintl_h = yes; then
-@@ -21101,8 +22470,8 @@
+@@ -21092,8 +22467,8 @@
        #
        # First check in libc
        #
@@ -12951,7 +13064,7 @@
  if test "${gt_cv_func_ngettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21124,24 +22493,36 @@
+@@ -21115,24 +22490,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12996,7 +13109,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21150,18 +22531,19 @@
+@@ -21141,18 +22528,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13022,7 +13135,7 @@
  if test "${gt_cv_func_dgettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21183,24 +22565,36 @@
+@@ -21174,24 +22562,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13067,7 +13180,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21209,14 +22603,15 @@
+@@ -21200,14 +22600,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13087,7 +13200,7 @@
        fi
  
        if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-@@ -21224,9 +22619,9 @@
+@@ -21215,9 +22616,9 @@
  for ac_func in bind_textdomain_codeset
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13100,7 +13213,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21252,53 +22647,59 @@
+@@ -21243,53 +22644,59 @@
  
  #undef $ac_func
  
@@ -13179,7 +13292,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21307,13 +22708,15 @@
+@@ -21298,13 +22705,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13199,7 +13312,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21331,8 +22734,8 @@
+@@ -21322,8 +22731,8 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -13210,7 +13323,7 @@
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21345,40 +22748,52 @@
+@@ -21336,40 +22745,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13275,7 +13388,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21387,17 +22802,18 @@
+@@ -21378,17 +22799,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13300,7 +13413,7 @@
  if test "${ac_cv_lib_intl_ngettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21410,40 +22826,52 @@
+@@ -21401,40 +22823,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13365,7 +13478,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21452,17 +22880,18 @@
+@@ -21443,17 +22877,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13390,7 +13503,7 @@
  if test "${ac_cv_lib_intl_dgettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21475,40 +22904,52 @@
+@@ -21466,40 +22901,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13455,7 +13568,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21517,14 +22958,15 @@
+@@ -21508,14 +22955,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13475,7 +13588,7 @@
  if test $ac_cv_lib_intl_dgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  fi
-@@ -21535,12 +22977,12 @@
+@@ -21526,12 +22974,12 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13494,7 +13607,7 @@
  if test "${ac_cv_lib_intl_ngettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21553,40 +22995,52 @@
+@@ -21544,40 +22992,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13559,7 +13672,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21595,17 +23049,18 @@
+@@ -21586,17 +23046,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13584,7 +13697,7 @@
  if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21618,40 +23073,52 @@
+@@ -21609,40 +23070,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13649,7 +13762,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21660,14 +23127,15 @@
+@@ -21651,14 +23124,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13669,7 +13782,7 @@
  if test $ac_cv_lib_intl_dcgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
-@@ -21694,9 +23162,9 @@
+@@ -21685,9 +23159,9 @@
  for ac_func in bind_textdomain_codeset
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13682,7 +13795,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21722,53 +23190,59 @@
+@@ -21713,53 +23187,59 @@
  
  #undef $ac_func
  
@@ -13761,7 +13874,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21777,13 +23251,15 @@
+@@ -21768,13 +23248,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13781,7 +13894,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21822,8 +23298,8 @@
+@@ -21813,8 +23295,8 @@
  
  	# Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -13792,7 +13905,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21849,11 +23325,11 @@
+@@ -21840,11 +23322,11 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -13808,7 +13921,7 @@
  fi
  	if test "$MSGFMT" != "no"; then
            glib_save_LIBS="$LIBS"
-@@ -21862,9 +23338,9 @@
+@@ -21853,9 +23335,9 @@
  for ac_func in dcgettext
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13821,7 +13934,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21890,53 +23366,59 @@
+@@ -21881,53 +23363,59 @@
  
  #undef $ac_func
  
@@ -13900,7 +14013,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21945,13 +23427,15 @@
+@@ -21936,13 +23424,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13920,7 +14033,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21962,8 +23446,8 @@
+@@ -21953,8 +23443,8 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -13931,7 +14044,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21978,32 +23462,33 @@
+@@ -21969,32 +23459,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13973,7 +14086,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22029,11 +23514,11 @@
+@@ -22020,11 +23511,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -13989,7 +14102,7 @@
  fi
  
  	  cat >conftest.$ac_ext <<_ACEOF
-@@ -22053,24 +23538,36 @@
+@@ -22044,24 +23535,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14034,7 +14147,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22080,10 +23577,10 @@
+@@ -22071,10 +23574,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14048,7 +14161,7 @@
  if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22110,53 +23607,59 @@
+@@ -22101,53 +23604,59 @@
  
  #undef bind_textdomain_codeset
  
@@ -14127,7 +14240,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22165,13 +23668,14 @@
+@@ -22156,13 +23665,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14146,7 +14259,7 @@
  if test $ac_cv_func_bind_textdomain_codeset = yes; then
    CATOBJEXT=.gmo
                 DATADIRNAME=share
-@@ -22187,7 +23691,8 @@
+@@ -22178,7 +23688,8 @@
  	    ;;
  	    esac
  fi
@@ -14156,7 +14269,7 @@
        conftest$ac_exeext conftest.$ac_ext
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
-@@ -22212,8 +23717,8 @@
+@@ -22203,8 +23714,8 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -14167,7 +14280,7 @@
          XGETTEXT=":"
        fi
      fi
-@@ -22221,7 +23726,7 @@
+@@ -22212,7 +23723,7 @@
      # We need to process the po/ directory.
      POSUB=po
  
@@ -14176,7 +14289,7 @@
  
  
                  for lang in $ALL_LINGUAS; do
-@@ -22245,8 +23750,8 @@
+@@ -22236,8 +23747,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -14187,7 +14300,7 @@
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
           useit=no
-@@ -22270,8 +23775,8 @@
+@@ -22261,8 +23772,8 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -14198,7 +14311,7 @@
       fi
  
            if test -n "$LINGUAS"; then
-@@ -22279,6 +23784,15 @@
+@@ -22270,6 +23781,15 @@
       fi
     fi
  
@@ -14214,7 +14327,7 @@
           test -d po || mkdir po
     if test "x$srcdir" != "x."; then
       if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -22305,8 +23819,8 @@
+@@ -22296,8 +23816,8 @@
  SQLITE_MAJ_VER="0"
  
  pkg_failed=no
@@ -14225,7 +14338,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$SQLITE_CFLAGS"; then
-@@ -22368,16 +23882,16 @@
+@@ -22353,22 +23873,24 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SQLITE_PKG_ERRORS" >&5
+ 
+-	do_nothing="1"
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                do_nothing="1"
+ elif test $pkg_failed = untried; then
+ 	do_nothing="1"
  else
  	SQLITE_CFLAGS=$pkg_cv_SQLITE_CFLAGS
  	SQLITE_LIBS=$pkg_cv_SQLITE_LIBS
@@ -14246,7 +14368,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$SQLITE3_CFLAGS"; then
-@@ -22439,8 +23953,8 @@
+@@ -22424,14 +23946,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SQLITE3_PKG_ERRORS" >&5
+ 
+-	do_nothing="1"
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                do_nothing="1"
+ elif test $pkg_failed = untried; then
+ 	do_nothing="1"
  else
  	SQLITE3_CFLAGS=$pkg_cv_SQLITE3_CFLAGS
  	SQLITE3_LIBS=$pkg_cv_SQLITE3_LIBS
@@ -14257,17 +14388,29 @@
  	SQLITE_MAJ_VER="3"
  fi
  
-@@ -22455,44 +23969,49 @@
+@@ -22446,52 +23970,57 @@
  
  
  
+-# Check whether --enable-xss or --disable-xss was given.
++# Check whether --enable-xss was given.
+ if test "${enable_xss+set}" = set; then
+-  enableval="$enable_xss"
+-  enable_xss=$enableval
++  enableval=$enable_xss; enable_xss=$enableval
+ else
+   enable_xss=yes
+-fi;
++fi
+ 
 -echo "$as_me:$LINENO: checking for X" >&5
 -echo $ECHO_N "checking for X... $ECHO_C" >&6
+ 
 +{ echo "$as_me:$LINENO: checking for X" >&5
 +echo $ECHO_N "checking for X... $ECHO_C" >&6; }
  
- 
 -# Check whether --with-x or --without-x was given.
++
 +# Check whether --with-x was given.
  if test "${with_x+set}" = set; then
 -  withval="$with_x"
@@ -14325,7 +14468,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -22500,7 +24019,7 @@
+@@ -22499,7 +24028,7 @@
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -14334,7 +14477,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -22509,7 +24028,7 @@
+@@ -22508,7 +24037,7 @@
      esac
    fi
    cd ..
@@ -14343,7 +14486,7 @@
  fi
  
  # Standard set of common directories for X headers.
-@@ -22550,7 +24069,7 @@
+@@ -22549,7 +24078,7 @@
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -14352,7 +14495,7 @@
    # First, try using that file with no special directory specified.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22558,10 +24077,15 @@
+@@ -22557,10 +24086,15 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -14371,7 +14514,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -22585,12 +24109,13 @@
+@@ -22584,12 +24118,13 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    for ac_dir in $ac_x_header_dirs; do
@@ -14386,7 +14529,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
-@@ -22606,34 +24131,46 @@
+@@ -22605,34 +24140,46 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -14443,7 +14586,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22644,49 +24181,54 @@
+@@ -22643,49 +24190,54 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14517,7 +14660,7 @@
  fi
  
  if test "$no_x" = yes; then
-@@ -22709,8 +24251,8 @@
+@@ -22708,8 +24260,8 @@
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
      "SunOS 5"*)
@@ -14528,7 +14671,7 @@
        ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22728,24 +24270,36 @@
+@@ -22727,24 +24279,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14573,7 +14716,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22754,13 +24308,14 @@
+@@ -22753,13 +24317,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14592,7 +14735,7 @@
  	X_LIBS="$X_LIBS -R$x_libraries"
        else
  	LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -22780,24 +24335,36 @@
+@@ -22779,24 +24344,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14637,7 +14780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22806,17 +24373,18 @@
+@@ -22805,17 +24382,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14662,7 +14805,7 @@
  	fi
        fi
        LIBS=$ac_xsave_LIBS
-@@ -22841,40 +24409,52 @@
+@@ -22840,40 +24418,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14727,7 +14870,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22883,8 +24463,8 @@
+@@ -22882,8 +24472,8 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14738,7 +14881,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22897,40 +24477,52 @@
+@@ -22896,40 +24486,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14803,7 +14946,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22939,21 +24531,22 @@
+@@ -22938,21 +24540,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14832,7 +14975,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22966,40 +24559,52 @@
+@@ -22965,40 +24568,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14897,7 +15040,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23008,21 +24613,23 @@
+@@ -23007,21 +24622,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14926,7 +15069,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
  
-@@ -23034,8 +24641,8 @@
+@@ -23033,8 +24650,8 @@
      # on Irix 5.2, according to T.E. Dickey.
      # The functions gethostbyname, getservbyname, and inet_addr are
      # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
@@ -14937,7 +15080,7 @@
  if test "${ac_cv_func_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23062,53 +24669,59 @@
+@@ -23061,53 +24678,59 @@
  
  #undef gethostbyname
  
@@ -15016,7 +15159,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23117,17 +24730,18 @@
+@@ -23116,17 +24739,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15041,7 +15184,7 @@
  if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23140,40 +24754,52 @@
+@@ -23139,40 +24763,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15106,7 +15249,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23182,21 +24808,22 @@
+@@ -23181,21 +24817,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15135,7 +15278,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23209,40 +24836,52 @@
+@@ -23208,40 +24845,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15200,7 +15343,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23251,14 +24890,15 @@
+@@ -23250,14 +24899,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15220,7 +15363,7 @@
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-@@ -23273,8 +24913,8 @@
+@@ -23272,8 +24922,8 @@
      # variants that don't use the name server (or something).  -lsocket
      # must be given before -lnsl if both are needed.  We assume that
      # if connect needs -lnsl, so does gethostbyname.
@@ -15231,7 +15374,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23301,53 +24941,59 @@
+@@ -23300,53 +24950,59 @@
  
  #undef connect
  
@@ -15310,7 +15453,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23356,17 +25002,18 @@
+@@ -23355,17 +25011,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15335,7 +15478,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23379,40 +25026,52 @@
+@@ -23378,40 +25035,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15400,7 +15543,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23421,14 +25080,15 @@
+@@ -23420,14 +25089,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15420,7 +15563,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
-@@ -23436,8 +25096,8 @@
+@@ -23435,8 +25105,8 @@
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -15431,7 +15574,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23464,53 +25124,59 @@
+@@ -23463,53 +25133,59 @@
  
  #undef remove
  
@@ -15510,7 +15653,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23519,17 +25185,18 @@
+@@ -23518,17 +25194,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15535,7 +15678,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23542,40 +25209,52 @@
+@@ -23541,40 +25218,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15600,7 +15743,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23584,14 +25263,15 @@
+@@ -23583,14 +25272,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15620,7 +15763,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23599,8 +25279,8 @@
+@@ -23598,8 +25288,8 @@
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -15631,7 +15774,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23627,53 +25307,59 @@
+@@ -23626,53 +25316,59 @@
  
  #undef shmat
  
@@ -15710,7 +15853,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23682,17 +25368,18 @@
+@@ -23681,17 +25377,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15735,7 +15878,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23705,40 +25392,52 @@
+@@ -23704,40 +25401,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15800,7 +15943,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23747,14 +25446,15 @@
+@@ -23746,14 +25455,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15820,7 +15963,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23771,8 +25471,8 @@
+@@ -23770,8 +25480,8 @@
    # These have to be linked with before -lX11, unlike the other
    # libraries we check for below, so use a different variable.
    # John Interrante, Karl Berry
@@ -15831,7 +15974,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23785,40 +25485,52 @@
+@@ -23784,40 +25494,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15896,7 +16039,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23827,14 +25539,15 @@
+@@ -23826,14 +25548,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15916,7 +16059,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-@@ -23852,17 +25565,17 @@
+@@ -23851,17 +25574,17 @@
  CFLAGS="$CFLAGS $X_CFLAGS"
  LDFLAGS="$LDFLAGS $X_LIBS"
  if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
@@ -15940,7 +16083,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23873,24 +25586,36 @@
+@@ -23872,24 +25595,36 @@
  #include <X11/extensions/scrnsaver.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -15985,7 +16128,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23899,15 +25624,16 @@
+@@ -23898,15 +25633,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16008,7 +16151,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23916,8 +25642,13 @@
+@@ -23915,8 +25651,13 @@
  /* end confdefs.h.  */
  #include <X11/extensions/scrnsaver.h>
  _ACEOF
@@ -16024,7 +16167,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23941,9 +25672,10 @@
+@@ -23940,9 +25681,10 @@
  
    ac_header_preproc=no
  fi
@@ -16037,7 +16180,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23967,25 +25699,18 @@
+@@ -23966,25 +25708,18 @@
  echo "$as_me: WARNING: X11/extensions/scrnsaver.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/extensions/scrnsaver.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/extensions/scrnsaver.h: in the future, the compiler will take precedence" >&2;}
@@ -16068,7 +16211,7 @@
  
  fi
  if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
-@@ -23995,8 +25720,8 @@
+@@ -23994,8 +25729,8 @@
  fi
  
  
@@ -16079,7 +16222,7 @@
  if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24009,40 +25734,52 @@
+@@ -24008,40 +25743,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16144,7 +16287,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24051,14 +25788,15 @@
+@@ -24050,14 +25797,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16164,10 +16307,28 @@
  if test $ac_cv_lib_Xss_XScreenSaverQueryExtension = yes; then
    enable_libxss=yes
  else
-@@ -24083,13 +25821,13 @@
+@@ -24088,13 +25836,13 @@
+ LDFLAGS="$OLD_LDFLAGS"
  LIBS="$OLD_LIBS"
  
+-# Check whether --enable-thunderbird or --disable-thunderbird was given.
++# Check whether --enable-thunderbird was given.
+ if test "${enable_thunderbird+set}" = set; then
+-  enableval="$enable_thunderbird"
+-  enable_tbird=$enableval
++  enableval=$enable_thunderbird; enable_tbird=$enableval
+ else
+   enable_tbird=yes
+-fi;
++fi
++
  
+ 
+ if test "x$enable_tbird" = "xyes"; then
+@@ -24107,13 +25855,13 @@
+ 
+ 
+ 
 -# Check whether --enable-gui or --disable-gui was given.
 +# Check whether --enable-gui was given.
  if test "${enable_gui+set}" = set; then
@@ -16182,7 +16343,7 @@
  
  
  
-@@ -24108,8 +25846,8 @@
+@@ -24132,8 +25880,8 @@
  	# we get the GNOME prefix from libgnome-2.0
  
  pkg_failed=no
@@ -16193,7 +16354,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GNOME_VFS_CFLAGS"; then
-@@ -24213,16 +25951,16 @@
+@@ -24237,16 +25985,16 @@
  else
  	GNOME_VFS_CFLAGS=$pkg_cv_GNOME_VFS_CFLAGS
  	GNOME_VFS_LIBS=$pkg_cv_GNOME_VFS_LIBS
@@ -16214,7 +16375,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$BEAGLE_UI_CFLAGS"; then
-@@ -24396,16 +26134,16 @@
+@@ -24420,16 +26168,16 @@
  else
  	BEAGLE_UI_CFLAGS=$pkg_cv_BEAGLE_UI_CFLAGS
  	BEAGLE_UI_LIBS=$pkg_cv_BEAGLE_UI_LIBS
@@ -16235,7 +16396,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$UIGLUE_CFLAGS"; then
-@@ -24509,8 +26247,8 @@
+@@ -24533,8 +26281,8 @@
  else
  	UIGLUE_CFLAGS=$pkg_cv_UIGLUE_CFLAGS
  	UIGLUE_LIBS=$pkg_cv_UIGLUE_LIBS
@@ -16246,7 +16407,7 @@
  	:
  fi
  
-@@ -24522,8 +26260,8 @@
+@@ -24546,8 +26294,8 @@
  
  
  pkg_failed=no
@@ -16257,7 +16418,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBTRAYICON_CFLAGS"; then
-@@ -24657,8 +26395,8 @@
+@@ -24681,8 +26429,8 @@
  else
  	LIBTRAYICON_CFLAGS=$pkg_cv_LIBTRAYICON_CFLAGS
  	LIBTRAYICON_LIBS=$pkg_cv_LIBTRAYICON_LIBS
@@ -16268,7 +16429,7 @@
  	:
  fi
  
-@@ -24669,8 +26407,8 @@
+@@ -24693,8 +26441,8 @@
  
  
  pkg_failed=no
@@ -16279,7 +16440,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$OPEN_WITH_CFLAGS"; then
-@@ -24748,8 +26486,8 @@
+@@ -24766,14 +26514,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$OPEN_WITH_PKG_ERRORS" >&5
+ 
+-	OPEN_WITH=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                OPEN_WITH=no
+ elif test $pkg_failed = untried; then
+ 	OPEN_WITH=no
  else
  	OPEN_WITH_CFLAGS=$pkg_cv_OPEN_WITH_CFLAGS
  	OPEN_WITH_LIBS=$pkg_cv_OPEN_WITH_LIBS
@@ -16290,7 +16460,7 @@
  	OPEN_WITH=yes
  fi
  
-@@ -24764,13 +26502,13 @@
+@@ -24788,13 +26538,13 @@
  
  
  
@@ -16308,7 +16478,7 @@
  
  
  EVO_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix evolution-sharp`
-@@ -24780,8 +26518,8 @@
+@@ -24804,8 +26554,8 @@
  
  
  pkg_failed=no
@@ -16319,7 +16489,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$EVO_CFLAGS"; then
-@@ -24859,8 +26597,8 @@
+@@ -24877,14 +26627,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVO_PKG_ERRORS" >&5
+ 
+-	have_evo_dependencies=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_evo_dependencies=no
+ elif test $pkg_failed = untried; then
+ 	have_evo_dependencies=no
  else
  	EVO_CFLAGS=$pkg_cv_EVO_CFLAGS
  	EVO_LIBS=$pkg_cv_EVO_LIBS
@@ -16330,7 +16509,7 @@
  	have_evo_dependencies=yes
  fi
  
-@@ -24912,13 +26650,13 @@
+@@ -24936,13 +26688,13 @@
  
  
  
@@ -16348,7 +16527,7 @@
  
  if test "x$os_has_inotify" = "xno"; then
  
-@@ -24955,8 +26693,8 @@
+@@ -24979,8 +26731,8 @@
  
  
  pkg_failed=no
@@ -16359,7 +16538,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GSF_SHARP_CFLAGS"; then
-@@ -25018,8 +26756,8 @@
+@@ -25036,14 +26788,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GSF_SHARP_PKG_ERRORS" >&5
+ 
+-	enable_gsf_sharp=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                enable_gsf_sharp=no
+ elif test $pkg_failed = untried; then
+ 	enable_gsf_sharp=no
  else
  	GSF_SHARP_CFLAGS=$pkg_cv_GSF_SHARP_CFLAGS
  	GSF_SHARP_LIBS=$pkg_cv_GSF_SHARP_LIBS
@@ -16370,7 +16558,7 @@
  	enable_gsf_sharp=yes
  fi
  
-@@ -25041,8 +26779,8 @@
+@@ -25065,8 +26819,8 @@
  
  
  pkg_failed=no
@@ -16381,7 +16569,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_CFLAGS"; then
-@@ -25146,14 +26884,14 @@
+@@ -25170,14 +26924,14 @@
  else
  	LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
  	LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
@@ -16400,7 +16588,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_API_CHECK_CFLAGS"; then
-@@ -25215,8 +26953,8 @@
+@@ -25233,14 +26987,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBEXIF_API_CHECK_PKG_ERRORS" >&5
+ 
+-	have_old_libexif=yes
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_old_libexif=yes
+ elif test $pkg_failed = untried; then
+ 	have_old_libexif=yes
  else
  	LIBEXIF_API_CHECK_CFLAGS=$pkg_cv_LIBEXIF_API_CHECK_CFLAGS
  	LIBEXIF_API_CHECK_LIBS=$pkg_cv_LIBEXIF_API_CHECK_LIBS
@@ -16411,7 +16608,7 @@
  	have_old_libexif=no
  fi
  
-@@ -25225,8 +26963,8 @@
+@@ -25249,8 +27005,8 @@
  else
  
  pkg_failed=no
@@ -16422,7 +16619,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_VERSION_CHECK_CFLAGS"; then
-@@ -25288,8 +27026,8 @@
+@@ -25306,14 +27062,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBEXIF_VERSION_CHECK_PKG_ERRORS" >&5
+ 
+-	EXIF_SOVERSION=10
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                EXIF_SOVERSION=10
+ elif test $pkg_failed = untried; then
+ 	EXIF_SOVERSION=10
  else
  	LIBEXIF_VERSION_CHECK_CFLAGS=$pkg_cv_LIBEXIF_VERSION_CHECK_CFLAGS
  	LIBEXIF_VERSION_CHECK_LIBS=$pkg_cv_LIBEXIF_VERSION_CHECK_LIBS
@@ -16433,7 +16639,7 @@
  	EXIF_SOVERSION=12
  fi
  fi
-@@ -25297,8 +27035,8 @@
+@@ -25321,8 +27079,8 @@
  
  
  pkg_failed=no
@@ -16444,7 +16650,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$BEAGLED_CFLAGS"; then
-@@ -25442,8 +27180,8 @@
+@@ -25466,8 +27224,8 @@
  else
  	BEAGLED_CFLAGS=$pkg_cv_BEAGLED_CFLAGS
  	BEAGLED_LIBS=$pkg_cv_BEAGLED_LIBS
@@ -16455,7 +16661,7 @@
  	:
  fi
  	BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_LIBS"
-@@ -25456,31 +27194,31 @@
+@@ -25480,31 +27238,31 @@
  
  
  
@@ -16497,7 +16703,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25495,28 +27233,29 @@
+@@ -25519,28 +27277,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16533,7 +16739,7 @@
      fi
      if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
        have_gtk_doc=yes
-@@ -25524,14 +27263,14 @@
+@@ -25548,14 +27307,14 @@
  
    gtk_doc_min_version=1.0
      if test "$have_gtk_doc" = yes; then
@@ -16554,7 +16760,7 @@
          have_gtk_doc=no
        fi
      fi
-@@ -25563,13 +27302,13 @@
+@@ -25587,13 +27346,13 @@
  
  
  
@@ -16572,7 +16778,7 @@
  
  LIBBEAGLE_CURRENT=0
  
-@@ -25582,8 +27321,8 @@
+@@ -25606,8 +27365,8 @@
  
  
  pkg_failed=no
@@ -16583,7 +16789,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBBEAGLE_CFLAGS"; then
-@@ -25669,8 +27408,8 @@
+@@ -25687,14 +27446,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBBEAGLE_PKG_ERRORS" >&5
+ 
+-	have_libbeagle_deps=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_libbeagle_deps=no
+ elif test $pkg_failed = untried; then
+ 	have_libbeagle_deps=no
  else
  	LIBBEAGLE_CFLAGS=$pkg_cv_LIBBEAGLE_CFLAGS
  	LIBBEAGLE_LIBS=$pkg_cv_LIBBEAGLE_LIBS
@@ -16594,7 +16809,7 @@
  	have_libbeagle_deps=yes
  fi
  
-@@ -25705,13 +27444,13 @@
+@@ -25729,13 +27490,13 @@
  fi
  
  
@@ -16612,7 +16827,7 @@
  
  
  if test "x$enable_bludgeon" = "xyes"; then
-@@ -25725,13 +27464,13 @@
+@@ -25749,13 +27510,13 @@
  
  
  
@@ -16630,7 +16845,7 @@
  
  if $PKG_CONFIG --exists epiphany-2.14; then
          EPIPHANY_MAJOR=2.14
-@@ -25759,8 +27498,8 @@
+@@ -25783,8 +27544,8 @@
  
  
  pkg_failed=no
@@ -16641,7 +16856,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$EPIPHANY_DEPENDENCY_CFLAGS"; then
-@@ -25862,8 +27601,8 @@
+@@ -25880,14 +27641,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EPIPHANY_DEPENDENCY_PKG_ERRORS" >&5
+ 
+-	have_epiphany_dependencies=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_epiphany_dependencies=no
+ elif test $pkg_failed = untried; then
+ 	have_epiphany_dependencies=no
  else
  	EPIPHANY_DEPENDENCY_CFLAGS=$pkg_cv_EPIPHANY_DEPENDENCY_CFLAGS
  	EPIPHANY_DEPENDENCY_LIBS=$pkg_cv_EPIPHANY_DEPENDENCY_LIBS
@@ -16652,7 +16876,7 @@
  	have_epiphany_dependencies=yes
  fi
  
-@@ -25893,13 +27632,13 @@
+@@ -25917,13 +27680,13 @@
  fi
  
  
@@ -16670,7 +16894,7 @@
  
  
  
-@@ -25916,8 +27655,8 @@
+@@ -25940,8 +27703,8 @@
  
  
  pkg_failed=no
@@ -16681,7 +16905,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GALAGO_CFLAGS"; then
-@@ -25979,8 +27718,8 @@
+@@ -25997,14 +27760,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GALAGO_PKG_ERRORS" >&5
+ 
+-	enable_galago=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                enable_galago=no
+ elif test $pkg_failed = untried; then
+ 	enable_galago=no
  else
  	GALAGO_CFLAGS=$pkg_cv_GALAGO_CFLAGS
  	GALAGO_LIBS=$pkg_cv_GALAGO_LIBS
@@ -16692,32 +16925,10 @@
  	enable_galago=yes
  fi
  
-@@ -26003,8 +27742,8 @@
+@@ -26032,8 +27797,8 @@
  
  
  pkg_failed=no
--echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
--echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6
-+{ echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
-+echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6; }
- 
- if test -n "$PKG_CONFIG"; then
-     if test -n "$SYSTEMINFO_GLUE_CFLAGS"; then
-@@ -26108,8 +27847,8 @@
- else
- 	SYSTEMINFO_GLUE_CFLAGS=$pkg_cv_SYSTEMINFO_GLUE_CFLAGS
- 	SYSTEMINFO_GLUE_LIBS=$pkg_cv_SYSTEMINFO_GLUE_LIBS
--        echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-+        { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 	:
- fi
- SYSTEMINFO_GLUE_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $XSS_LIBS $X_EXTRA_LIBS"
-@@ -26119,8 +27858,8 @@
- 
- 
- pkg_failed=no
 -echo "$as_me:$LINENO: checking for WV1" >&5
 -echo $ECHO_N "checking for WV1... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for WV1" >&5
@@ -16725,7 +16936,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$WV1_CFLAGS"; then
-@@ -26182,8 +27921,8 @@
+@@ -26089,14 +27854,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$WV1_PKG_ERRORS" >&5
+ 
+-	enable_wv1=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                enable_wv1=no
+ elif test $pkg_failed = untried; then
+ 	enable_wv1=no
  else
  	WV1_CFLAGS=$pkg_cv_WV1_CFLAGS
  	WV1_LIBS=$pkg_cv_WV1_LIBS
@@ -16736,7 +16956,7 @@
  	enable_wv1=yes
  fi
  
-@@ -26203,8 +27942,8 @@
+@@ -26116,8 +27883,8 @@
  kde_prefix_print="unknown; will guess at runtime"
  # Extract the first word of "kde-config", so it can be a program name with args.
  set dummy kde-config; ac_word=$2
@@ -16747,7 +16967,7 @@
  if test "${ac_cv_path_KDE_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26219,28 +27958,29 @@
+@@ -26132,28 +27899,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16783,7 +17003,7 @@
  if test ! "x$KDE_CONFIG" = "xno"; then
  	KDE_PREFIX=`$KDE_CONFIG --prefix`
  	kde_prefix_print="$KDE_PREFIX"
-@@ -26274,8 +28014,8 @@
+@@ -26187,8 +27955,8 @@
  
  
  # Check for libchm for CHM filter
@@ -16794,7 +17014,7 @@
  if test "${ac_cv_lib_chm_chm_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26288,40 +28028,52 @@
+@@ -26201,40 +27969,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16859,7 +17079,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26330,14 +28082,15 @@
+@@ -26243,14 +28023,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16879,7 +17099,7 @@
  if test $ac_cv_lib_chm_chm_open = yes; then
    has_libchm=yes
  else
-@@ -26359,13 +28112,13 @@
+@@ -26272,13 +28053,13 @@
  
  BEAGLE_DEFINES=""
  
@@ -16897,7 +17117,7 @@
  
  if test "x$enable_xml_dump" = "xyes"; then
  
-@@ -26380,13 +28133,13 @@
+@@ -26293,13 +28074,13 @@
  
  
  
@@ -16915,7 +17135,7 @@
  
  have_python=no
  if test "x$enable_libbeagle" = "xyes" -a "x$enable_python" != "xno"; then
-@@ -26399,14 +28152,69 @@
+@@ -26312,14 +28093,69 @@
  
  
  
@@ -16993,7 +17213,7 @@
  if test "${ac_cv_path_PYTHON+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26421,33 +28229,31 @@
+@@ -26334,33 +28170,31 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17035,7 +17255,7 @@
  
  
    if test "$PYTHON" = :; then
-@@ -26457,15 +28263,15 @@
+@@ -26370,15 +28204,15 @@
    else
  
  
@@ -17055,7 +17275,7 @@
    PYTHON_VERSION=$am_cv_python_version
  
  
-@@ -26476,30 +28282,30 @@
+@@ -26389,30 +28223,30 @@
  
  
  
@@ -17094,7 +17314,7 @@
    pythondir=$am_cv_python_pythondir
  
  
-@@ -26507,16 +28313,16 @@
+@@ -26420,16 +28254,16 @@
    pkgpythondir=\${pythondir}/$PACKAGE
  
  
@@ -17115,7 +17335,7 @@
    pyexecdir=$am_cv_python_pyexecdir
  
  
-@@ -26557,8 +28363,8 @@
+@@ -26470,8 +28304,8 @@
  echo "$as_me: WARNING: Python version $PYTHON_REQUIRED not found" >&2;}
  	else
  
@@ -17126,7 +17346,7 @@
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
  PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
-@@ -26576,8 +28382,13 @@
+@@ -26489,8 +28323,13 @@
  /* end confdefs.h.  */
  #include <Python.h>
  _ACEOF
@@ -17142,7 +17362,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -26594,17 +28405,18 @@
+@@ -26507,17 +28346,18 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
@@ -17165,7 +17385,7 @@
  rm -f conftest.err conftest.$ac_ext
  CPPFLAGS="$save_CPPFLAGS"
  
-@@ -26616,8 +28428,8 @@
+@@ -26529,8 +28369,8 @@
  	else
  
  pkg_failed=no
@@ -17176,7 +17396,16 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$PYBEAGLE_CFLAGS"; then
-@@ -26687,8 +28499,8 @@
+@@ -26594,14 +28434,16 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$PYBEAGLE_PKG_ERRORS" >&5
+ 
+-	have_pygtk_deps=no
++	{ echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++                have_pygtk_deps=no
+ elif test $pkg_failed = untried; then
+ 	have_pygtk_deps=no
  else
  	PYBEAGLE_CFLAGS=$pkg_cv_PYBEAGLE_CFLAGS
  	PYBEAGLE_LIBS=$pkg_cv_PYBEAGLE_LIBS
@@ -17187,7 +17416,7 @@
  	have_pygtk_deps=yes
  fi
  	fi
-@@ -26699,8 +28511,8 @@
+@@ -26612,8 +28454,8 @@
  	else
  		# Extract the first word of "pygtk-codegen-2.0", so it can be a program name with args.
  set dummy pygtk-codegen-2.0; ac_word=$2
@@ -17198,7 +17427,7 @@
  if test "${ac_cv_path_PYGTK_CODEGEN+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26715,39 +28527,40 @@
+@@ -26628,39 +28470,40 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17249,17 +17478,17 @@
  
  		have_python=yes
  	fi
-@@ -26780,7 +28593,8 @@
+@@ -26693,7 +28536,8 @@
  
  
  
--                                                                                                                                                                                                                                                                              ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
-+ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
+-                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile ContactViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
++ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile ContactViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
 +
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
  # tests run on this system so they can be shared between configure
-@@ -26799,39 +28613,58 @@
+@@ -26712,39 +28556,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -17334,7 +17563,7 @@
    fi
  fi
  rm -f confcache
-@@ -26840,32 +28673,18 @@
+@@ -26753,32 +28616,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -17373,7 +17602,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -26936,9 +28755,8 @@
+@@ -26849,9 +28698,8 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -17383,9 +17612,9 @@
 +  ac_config_commands="$ac_config_commands po/stamp-it"
 +
  
- if test -z "${HAS_LIBXSS_TRUE}" && test -z "${HAS_LIBXSS_FALSE}"; then
-   { { echo "$as_me:$LINENO: error: conditional \"HAS_LIBXSS\" was never defined.
-@@ -27097,11 +28915,35 @@
+ if test -z "${ENABLE_LIBXSS_TRUE}" && test -z "${ENABLE_LIBXSS_FALSE}"; then
+   { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LIBXSS\" was never defined.
+@@ -27017,11 +28865,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -17423,7 +17652,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -27110,8 +28952,43 @@
+@@ -27030,8 +28902,43 @@
  fi
  
  
@@ -17468,7 +17697,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -27125,18 +29002,19 @@
+@@ -27045,18 +28952,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -17491,7 +17720,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -27144,159 +29022,120 @@
+@@ -27064,159 +28972,120 @@
  
  
  # Name of the executable.
@@ -17508,14 +17737,6 @@
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 -
--
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
@@ -17530,6 +17751,16 @@
 +	  }
 +	  s/.*/./; q'`
  
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
++# CDPATH.
++$as_unset CDPATH
+ 
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
@@ -17542,14 +17773,12 @@
 -  fi
 -  rm -f conf$$.sh
 -fi
-+# CDPATH.
-+$as_unset CDPATH
  
  
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
+   as_lineno_1=$LINENO
+   as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
+   test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
 -  # Find who we are.  Look in the path if we contain no path at all
 -  # relative or not.
@@ -17562,7 +17791,7 @@
 -  test -z "$as_dir" && as_dir=.
 -  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
 -done
- 
+-
 -       ;;
 -  esac
 -  # We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -17586,10 +17815,10 @@
 -	 case $as_dir in
 -	 /*)
 -	   if ("$as_dir/$as_base" -c '
-   as_lineno_1=$LINENO
-   as_lineno_2=$LINENO
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
 -  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-   test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
 -  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
 -	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
 -	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
@@ -17722,7 +17951,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -27305,7 +29144,19 @@
+@@ -27225,7 +29094,19 @@
    as_mkdir_p=false
  fi
  
@@ -17743,7 +17972,7 @@
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -27314,31 +29165,14 @@
+@@ -27234,31 +29115,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -17779,7 +18008,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -27346,30 +29180,20 @@
+@@ -27266,30 +29130,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -17818,7 +18047,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -27396,19 +29220,21 @@
+@@ -27316,19 +29170,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -17846,7 +18075,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -27419,39 +29245,24 @@
+@@ -27339,39 +29195,24 @@
  do
    case $1 in
    --*=*)
@@ -17892,7 +18121,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -27461,18 +29272,24 @@
+@@ -27381,18 +29222,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -17922,7 +18151,7 @@
  
    esac
    shift
-@@ -27488,70 +29305,84 @@
+@@ -27408,71 +29255,85 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -17986,6 +18215,7 @@
 -  "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
 -  "search/Makefile" ) CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
 -  "ImLogViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
+-  "ContactViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ContactViewer/Makefile" ;;
 -  "libbeagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
 -  "libbeagle/libbeagle-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
 -  "libbeagle/beagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
@@ -18022,6 +18252,7 @@
 +    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
 +    "search/Makefile") CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
 +    "ImLogViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
++    "ContactViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ContactViewer/Makefile" ;;
 +    "libbeagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
 +    "libbeagle/libbeagle-0.0.pc") CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
 +    "libbeagle/beagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
@@ -18050,7 +18281,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -27563,525 +29394,675 @@
+@@ -27484,774 +29345,806 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -18274,8 +18505,10 @@
 -s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
 -s, at X_LIBS@,$X_LIBS,;t t
 -s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
--s, at HAS_LIBXSS_TRUE@,$HAS_LIBXSS_TRUE,;t t
--s, at HAS_LIBXSS_FALSE@,$HAS_LIBXSS_FALSE,;t t
+-s, at ENABLE_LIBXSS_TRUE@,$ENABLE_LIBXSS_TRUE,;t t
+-s, at ENABLE_LIBXSS_FALSE@,$ENABLE_LIBXSS_FALSE,;t t
+-s, at ENABLE_THUNDERBIRD_TRUE@,$ENABLE_THUNDERBIRD_TRUE,;t t
+-s, at ENABLE_THUNDERBIRD_FALSE@,$ENABLE_THUNDERBIRD_FALSE,;t t
 -s, at ENABLE_GUI_TRUE@,$ENABLE_GUI_TRUE,;t t
 -s, at ENABLE_GUI_FALSE@,$ENABLE_GUI_FALSE,;t t
 -s, at GNOME_VFS_CFLAGS@,$GNOME_VFS_CFLAGS,;t t
@@ -18341,8 +18574,6 @@
 -s, at ENABLE_GALAGO_TRUE@,$ENABLE_GALAGO_TRUE,;t t
 -s, at ENABLE_GALAGO_FALSE@,$ENABLE_GALAGO_FALSE,;t t
 -s, at GTK_BINARY_VERSION@,$GTK_BINARY_VERSION,;t t
--s, at SYSTEMINFO_GLUE_CFLAGS@,$SYSTEMINFO_GLUE_CFLAGS,;t t
--s, at SYSTEMINFO_GLUE_LIBS@,$SYSTEMINFO_GLUE_LIBS,;t t
 -s, at SYSTEMINFO_GLUE_X_LIBS@,$SYSTEMINFO_GLUE_X_LIBS,;t t
 -s, at WV1_CFLAGS@,$WV1_CFLAGS,;t t
 -s, at WV1_LIBS@,$WV1_LIBS,;t t
@@ -18641,8 +18872,10 @@
 +X_PRE_LIBS!$X_PRE_LIBS$ac_delim
 +X_LIBS!$X_LIBS$ac_delim
 +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-+HAS_LIBXSS_TRUE!$HAS_LIBXSS_TRUE$ac_delim
-+HAS_LIBXSS_FALSE!$HAS_LIBXSS_FALSE$ac_delim
++ENABLE_LIBXSS_TRUE!$ENABLE_LIBXSS_TRUE$ac_delim
++ENABLE_LIBXSS_FALSE!$ENABLE_LIBXSS_FALSE$ac_delim
++ENABLE_THUNDERBIRD_TRUE!$ENABLE_THUNDERBIRD_TRUE$ac_delim
++ENABLE_THUNDERBIRD_FALSE!$ENABLE_THUNDERBIRD_FALSE$ac_delim
 +ENABLE_GUI_TRUE!$ENABLE_GUI_TRUE$ac_delim
 +ENABLE_GUI_FALSE!$ENABLE_GUI_FALSE$ac_delim
 +GNOME_VFS_CFLAGS!$GNOME_VFS_CFLAGS$ac_delim
@@ -18655,10 +18888,8 @@
 +LIBTRAYICON_LIBS!$LIBTRAYICON_LIBS$ac_delim
 +OPEN_WITH_CFLAGS!$OPEN_WITH_CFLAGS$ac_delim
 +OPEN_WITH_LIBS!$OPEN_WITH_LIBS$ac_delim
-+ENABLE_OPEN_WITH_TRUE!$ENABLE_OPEN_WITH_TRUE$ac_delim
-+ENABLE_OPEN_WITH_FALSE!$ENABLE_OPEN_WITH_FALSE$ac_delim
 +_ACEOF
-+
+ 
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
@@ -18698,6 +18929,8 @@
 +ac_delim='%!_!# '
 +for ac_last_try in false false false false false :; do
 +  cat >conf$$subs.sed <<_ACEOF
++ENABLE_OPEN_WITH_TRUE!$ENABLE_OPEN_WITH_TRUE$ac_delim
++ENABLE_OPEN_WITH_FALSE!$ENABLE_OPEN_WITH_FALSE$ac_delim
 +EVO_LIBDIR!$EVO_LIBDIR$ac_delim
 +EVO_CFLAGS!$EVO_CFLAGS$ac_delim
 +EVO_LIBS!$EVO_LIBS$ac_delim
@@ -18749,8 +18982,6 @@
 +ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
 +ENABLE_GALAGO_FALSE!$ENABLE_GALAGO_FALSE$ac_delim
 +GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim
-+SYSTEMINFO_GLUE_CFLAGS!$SYSTEMINFO_GLUE_CFLAGS$ac_delim
-+SYSTEMINFO_GLUE_LIBS!$SYSTEMINFO_GLUE_LIBS$ac_delim
 +SYSTEMINFO_GLUE_X_LIBS!$SYSTEMINFO_GLUE_X_LIBS$ac_delim
 +WV1_CFLAGS!$WV1_CFLAGS$ac_delim
 +WV1_LIBS!$WV1_LIBS$ac_delim
@@ -18783,7 +19014,7 @@
 +PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
 +LIBOBJS!$LIBOBJS$ac_delim
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
-+_ACEOF
+ _ACEOF
 +
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
 +    break
@@ -18795,7 +19026,7 @@
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
 +done
- 
++
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
@@ -18805,7 +19036,7 @@
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
 +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
- _ACEOF
++_ACEOF
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
@@ -18856,7 +19087,7 @@
 +do
 +  case $ac_tag in
 +  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
+   esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
 +  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -18864,7 +19095,7 @@
 +   { (exit 1); exit 1; }; };;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
++  esac
 +  ac_save_IFS=$IFS
 +  IFS=:
 +  set x $ac_tag
@@ -19168,8 +19399,8 @@
 +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
 +  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF
 +  ac_datarootdir_hack='
 +  s&@datadir@&$datadir&g
 +  s&@docdir@&$docdir&g
@@ -19178,15 +19409,15 @@
 +  s&@mandir@&$mandir&g
 +    s&\\\${datarootdir}&$datarootdir&g' ;;
 +esac
- _ACEOF
++_ACEOF
 +
 +# Neutralize VPATH when `$srcdir' = `.'.
 +# Shell code in configure.ac might set extrasub.
 +# FIXME: do we really want to maintain this feature?
- cat >>$CONFIG_STATUS <<_ACEOF
++cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -28089,248 +30070,130 @@
+ _ACEOF
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -19534,7 +19765,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -28341,135 +30204,39 @@
+@@ -28262,135 +30155,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -19696,7 +19927,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -28479,18 +30246,29 @@
+@@ -28400,18 +30197,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -19734,7 +19965,7 @@
    else
      continue
    fi
-@@ -28512,96 +30290,126 @@
+@@ -28433,96 +30241,126 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -19928,9 +20159,2567 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -urNad beagle-0.2.7~/ltmain.sh beagle-0.2.7/ltmain.sh
---- beagle-0.2.7~/ltmain.sh	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.7/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
+diff -urNad beagle-0.2.8~/configure.rej beagle-0.2.8/configure.rej
+--- beagle-0.2.8~/configure.rej	1970-01-01 01:00:00.000000000 +0100
++++ beagle-0.2.8/configure.rej	2006-08-24 11:59:38.000000000 +0200
+@@ -0,0 +1,2554 @@
++***************
++*** 454,470 ****
++  #endif
++  #if HAVE_INTTYPES_H
++  # include <inttypes.h>
++- #else
++- # if HAVE_STDINT_H
++- #  include <stdint.h>
++- # endif
++  #endif
++  #if HAVE_UNISTD_H
++  # include <unistd.h>
++  #endif"
++  
++- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASH ZIP MONO MCS ac_pt_PKG_CONFIG MONO_CFLAGS MONO_LIBS SHARPZIPLIB_LIBS OS_LINUX_TRUE OS_LINUX_FALSE OS_FREEBSD_TRUE OS_FREEBSD_FALSE DESKTOP_LAUNCH ENABLE_DESKTOP_LAUNCH_TRUE ENABLE_DESKTOP_LAUNCH_FALSE WSDL ENABLE_GOOGLEDRIVER_TRUE ENABLE_GOOGLEDRIVER_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB SQLITE_CFLAGS SQLITE_LIBS SQLITE3_CFLAGS SQLITE3_LIBS SQLITE_MAJ_VER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAS_LIBXSS_TRUE HAS_LIBXSS_FALSE ENABLE_GUI_TRUE ENABLE_GUI_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS BEAGLE_UI_CFLAGS BEAGLE_UI_LIBS UIGLUE_CFLAGS UIGLUE_LIBS LIBTRAYICON_CFLAGS LIBTRAYICON_LIBS OPEN_WITH_CFLAGS OPEN_WITH_LIBS ENABLE_OPEN_WITH_TRUE ENABLE_OPEN_WITH_FALSE EVO_LIBDIR EVO_CFLAGS EVO_LIBS ENABLE_EVOLUTION_TRUE ENABLE_EVOLUTION_FALSE USE_LOCAL_SQLITE_TRUE USE_LOCAL_SQLITE_FALSE ENABLE_INOTIFY_TRUE ENABLE_INOTIFY_FALSE GSF_SHARP_CFLAGS GSF_SHARP_LIBS ENABLE_GSF_SHARP_TRUE ENABLE_GSF_SHARP_FALSE LIBEXIF_CFLAGS LIBEXIF_LIBS LIBEXIF_API_CHECK_CFLAGS LIBEXIF_API_CHECK_LIBS LIBEXIF_VERSION_CHECK_CFLAGS LIBEXIF_VERSION_CHECK_LIBS EXIF_SOVERSION BEAGLED_CFLAGS BEAGLED_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBBEAGLE_VERSION_INFO LIBBEAGLE_CFLAGS LIBBEAGLE_LIBS ENABLE_LIBBEAGLE_TRUE ENABLE_LIBBEAGLE_FALSE ENABLE_BLUDGEON_TRUE ENABLE_BLUDGEON_FALSE EPIPHANY_REQUIRED LIBXML_REQUIRED LIBGLIB_REQUIRED LIBGTK_REQUIRED EPIPHANY_DEPENDENCY_CFLAGS EPIPHANY_DEPENDENCY_LIBS EPIPHANY_EXTENSIONS_DIR EPIPHANY_PREFIX ENABLE_EPIPHANY_EXTENSION_TRUE ENABLE_EPIPHANY_EXTENSION_FALSE INSTALL_EPIPHANY_EXTENSION_TRUE INSTALL_EPIPHANY_EXTENSION_FALSE GALAGO_CFLAGS GALAGO_LIBS ENABLE_GALAGO_TRUE ENABLE_GALAGO_FALSE GTK_BINARY_VERSION SYSTEMINFO_GLUE_CFLAGS SYSTEMINFO_GLUE_LIBS SYSTEMINFO_GLUE_X_LIBS WV1_CFLAGS WV1_LIBS ENABLE_WV1_TRUE ENABLE_WV1_FALSE KDE_CONFIG KDE_PREFIX ENABLE_WEBSERVICES_TRUE ENABLE_WEBSERVICES_FALSE GAC_PREFIX GNOME_PREFIX HAS_LIBCHM_TRUE HAS_LIBCHM_FALSE BEAGLE_DEFINES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYBEAGLE_CFLAGS PYBEAGLE_LIBS PYGTK_CODEGEN ENABLE_PYTHON_TRUE ENABLE_PYTHON_FALSE PYGTK_DEFSDIR LIBOBJS LTLIBOBJS'
++  ac_subst_files=''
++  
++  # Initialize some variables set by options.
++  ac_init_help=
++--- 744,1094 ----
++  #endif
++  #if HAVE_INTTYPES_H
++  # include <inttypes.h>
+++ #endif
+++ #if HAVE_STDINT_H
+++ # include <stdint.h>
++  #endif
++  #if HAVE_UNISTD_H
++  # include <unistd.h>
++  #endif"
++  
+++ ac_subst_vars='SHELL
+++ PATH_SEPARATOR
+++ PACKAGE_NAME
+++ PACKAGE_TARNAME
+++ PACKAGE_VERSION
+++ PACKAGE_STRING
+++ PACKAGE_BUGREPORT
+++ exec_prefix
+++ prefix
+++ program_transform_name
+++ bindir
+++ sbindir
+++ libexecdir
+++ datarootdir
+++ datadir
+++ sysconfdir
+++ sharedstatedir
+++ localstatedir
+++ includedir
+++ oldincludedir
+++ docdir
+++ infodir
+++ htmldir
+++ dvidir
+++ pdfdir
+++ psdir
+++ libdir
+++ localedir
+++ mandir
+++ DEFS
+++ ECHO_C
+++ ECHO_N
+++ ECHO_T
+++ LIBS
+++ build_alias
+++ host_alias
+++ target_alias
+++ build
+++ build_cpu
+++ build_vendor
+++ build_os
+++ host
+++ host_cpu
+++ host_vendor
+++ host_os
+++ target
+++ target_cpu
+++ target_vendor
+++ target_os
+++ INSTALL_PROGRAM
+++ INSTALL_SCRIPT
+++ INSTALL_DATA
+++ CYGPATH_W
+++ PACKAGE
+++ VERSION
+++ ACLOCAL
+++ AUTOCONF
+++ AUTOMAKE
+++ AUTOHEADER
+++ MAKEINFO
+++ install_sh
+++ STRIP
+++ INSTALL_STRIP_PROGRAM
+++ mkdir_p
+++ AWK
+++ SET_MAKE
+++ am__leading_dot
+++ AMTAR
+++ am__tar
+++ am__untar
+++ MAINTAINER_MODE_TRUE
+++ MAINTAINER_MODE_FALSE
+++ MAINT
+++ CC
+++ CFLAGS
+++ LDFLAGS
+++ CPPFLAGS
+++ ac_ct_CC
+++ EXEEXT
+++ OBJEXT
+++ DEPDIR
+++ am__include
+++ am__quote
+++ AMDEP_TRUE
+++ AMDEP_FALSE
+++ AMDEPBACKSLASH
+++ CCDEPMODE
+++ am__fastdepCC_TRUE
+++ am__fastdepCC_FALSE
+++ GREP
+++ EGREP
+++ LN_S
+++ ECHO
+++ AR
+++ RANLIB
+++ CPP
+++ CXX
+++ CXXFLAGS
+++ ac_ct_CXX
+++ CXXDEPMODE
+++ am__fastdepCXX_TRUE
+++ am__fastdepCXX_FALSE
+++ CXXCPP
+++ F77
+++ FFLAGS
+++ ac_ct_F77
+++ LIBTOOL
+++ PKG_CONFIG
+++ BASH
+++ ZIP
+++ MONO
+++ MCS
+++ MONO_CFLAGS
+++ MONO_LIBS
+++ SHARPZIPLIB_LIBS
+++ OS_LINUX_TRUE
+++ OS_LINUX_FALSE
+++ OS_FREEBSD_TRUE
+++ OS_FREEBSD_FALSE
+++ DESKTOP_LAUNCH
+++ ENABLE_DESKTOP_LAUNCH_TRUE
+++ ENABLE_DESKTOP_LAUNCH_FALSE
+++ WSDL
+++ ENABLE_GOOGLEDRIVER_TRUE
+++ ENABLE_GOOGLEDRIVER_FALSE
+++ INTLTOOL_DESKTOP_RULE
+++ INTLTOOL_DIRECTORY_RULE
+++ INTLTOOL_KEYS_RULE
+++ INTLTOOL_PROP_RULE
+++ INTLTOOL_OAF_RULE
+++ INTLTOOL_PONG_RULE
+++ INTLTOOL_SERVER_RULE
+++ INTLTOOL_SHEET_RULE
+++ INTLTOOL_SOUNDLIST_RULE
+++ INTLTOOL_UI_RULE
+++ INTLTOOL_XAM_RULE
+++ INTLTOOL_KBD_RULE
+++ INTLTOOL_XML_RULE
+++ INTLTOOL_XML_NOMERGE_RULE
+++ INTLTOOL_CAVES_RULE
+++ INTLTOOL_SCHEMAS_RULE
+++ INTLTOOL_THEME_RULE
+++ INTLTOOL_SERVICE_RULE
+++ INTLTOOL_EXTRACT
+++ INTLTOOL_MERGE
+++ INTLTOOL_UPDATE
+++ INTLTOOL_PERL
+++ INTLTOOL_ICONV
+++ INTLTOOL_MSGFMT
+++ INTLTOOL_MSGMERGE
+++ INTLTOOL_XGETTEXT
+++ ALL_LINGUAS
+++ GETTEXT_PACKAGE
+++ USE_NLS
+++ MSGFMT
+++ GMSGFMT
+++ XGETTEXT
+++ CATALOGS
+++ CATOBJEXT
+++ DATADIRNAME
+++ GMOFILES
+++ INSTOBJEXT
+++ INTLLIBS
+++ PO_IN_DATADIR_TRUE
+++ PO_IN_DATADIR_FALSE
+++ POFILES
+++ POSUB
+++ MKINSTALLDIRS
+++ SQLITE_CFLAGS
+++ SQLITE_LIBS
+++ SQLITE3_CFLAGS
+++ SQLITE3_LIBS
+++ SQLITE_MAJ_VER
+++ XMKMF
+++ X_CFLAGS
+++ X_PRE_LIBS
+++ X_LIBS
+++ X_EXTRA_LIBS
+++ HAS_LIBXSS_TRUE
+++ HAS_LIBXSS_FALSE
+++ ENABLE_GUI_TRUE
+++ ENABLE_GUI_FALSE
+++ GNOME_VFS_CFLAGS
+++ GNOME_VFS_LIBS
+++ BEAGLE_UI_CFLAGS
+++ BEAGLE_UI_LIBS
+++ UIGLUE_CFLAGS
+++ UIGLUE_LIBS
+++ LIBTRAYICON_CFLAGS
+++ LIBTRAYICON_LIBS
+++ OPEN_WITH_CFLAGS
+++ OPEN_WITH_LIBS
+++ ENABLE_OPEN_WITH_TRUE
+++ ENABLE_OPEN_WITH_FALSE
+++ EVO_LIBDIR
+++ EVO_CFLAGS
+++ EVO_LIBS
+++ ENABLE_EVOLUTION_TRUE
+++ ENABLE_EVOLUTION_FALSE
+++ USE_LOCAL_SQLITE_TRUE
+++ USE_LOCAL_SQLITE_FALSE
+++ ENABLE_INOTIFY_TRUE
+++ ENABLE_INOTIFY_FALSE
+++ GSF_SHARP_CFLAGS
+++ GSF_SHARP_LIBS
+++ ENABLE_GSF_SHARP_TRUE
+++ ENABLE_GSF_SHARP_FALSE
+++ LIBEXIF_CFLAGS
+++ LIBEXIF_LIBS
+++ LIBEXIF_API_CHECK_CFLAGS
+++ LIBEXIF_API_CHECK_LIBS
+++ LIBEXIF_VERSION_CHECK_CFLAGS
+++ LIBEXIF_VERSION_CHECK_LIBS
+++ EXIF_SOVERSION
+++ BEAGLED_CFLAGS
+++ BEAGLED_LIBS
+++ HTML_DIR
+++ ENABLE_GTK_DOC_TRUE
+++ ENABLE_GTK_DOC_FALSE
+++ GTK_DOC_USE_LIBTOOL_TRUE
+++ GTK_DOC_USE_LIBTOOL_FALSE
+++ LIBBEAGLE_VERSION_INFO
+++ LIBBEAGLE_CFLAGS
+++ LIBBEAGLE_LIBS
+++ ENABLE_LIBBEAGLE_TRUE
+++ ENABLE_LIBBEAGLE_FALSE
+++ ENABLE_BLUDGEON_TRUE
+++ ENABLE_BLUDGEON_FALSE
+++ EPIPHANY_REQUIRED
+++ LIBXML_REQUIRED
+++ LIBGLIB_REQUIRED
+++ LIBGTK_REQUIRED
+++ EPIPHANY_DEPENDENCY_CFLAGS
+++ EPIPHANY_DEPENDENCY_LIBS
+++ EPIPHANY_EXTENSIONS_DIR
+++ EPIPHANY_PREFIX
+++ ENABLE_EPIPHANY_EXTENSION_TRUE
+++ ENABLE_EPIPHANY_EXTENSION_FALSE
+++ INSTALL_EPIPHANY_EXTENSION_TRUE
+++ INSTALL_EPIPHANY_EXTENSION_FALSE
+++ GALAGO_CFLAGS
+++ GALAGO_LIBS
+++ ENABLE_GALAGO_TRUE
+++ ENABLE_GALAGO_FALSE
+++ GTK_BINARY_VERSION
+++ SYSTEMINFO_GLUE_CFLAGS
+++ SYSTEMINFO_GLUE_LIBS
+++ SYSTEMINFO_GLUE_X_LIBS
+++ WV1_CFLAGS
+++ WV1_LIBS
+++ ENABLE_WV1_TRUE
+++ ENABLE_WV1_FALSE
+++ KDE_CONFIG
+++ KDE_PREFIX
+++ ENABLE_WEBSERVICES_TRUE
+++ ENABLE_WEBSERVICES_FALSE
+++ GAC_PREFIX
+++ GNOME_PREFIX
+++ HAS_LIBCHM_TRUE
+++ HAS_LIBCHM_FALSE
+++ BEAGLE_DEFINES
+++ PYTHON
+++ PYTHON_VERSION
+++ PYTHON_PREFIX
+++ PYTHON_EXEC_PREFIX
+++ PYTHON_PLATFORM
+++ pythondir
+++ pkgpythondir
+++ pyexecdir
+++ pkgpyexecdir
+++ PYTHON_INCLUDES
+++ PYBEAGLE_CFLAGS
+++ PYBEAGLE_LIBS
+++ PYGTK_CODEGEN
+++ ENABLE_PYTHON_TRUE
+++ ENABLE_PYTHON_FALSE
+++ PYGTK_DEFSDIR
+++ LIBOBJS
+++ LTLIBOBJS'
++  ac_subst_files=''
+++       ac_precious_vars='build_alias
+++ host_alias
+++ target_alias
+++ CC
+++ CFLAGS
+++ LDFLAGS
+++ CPPFLAGS
+++ CPP
+++ CXX
+++ CXXFLAGS
+++ CCC
+++ CXXCPP
+++ F77
+++ FFLAGS
+++ PKG_CONFIG
+++ MONO_CFLAGS
+++ MONO_LIBS
+++ SQLITE_CFLAGS
+++ SQLITE_LIBS
+++ SQLITE3_CFLAGS
+++ SQLITE3_LIBS
+++ XMKMF
+++ GNOME_VFS_CFLAGS
+++ GNOME_VFS_LIBS
+++ BEAGLE_UI_CFLAGS
+++ BEAGLE_UI_LIBS
+++ UIGLUE_CFLAGS
+++ UIGLUE_LIBS
+++ LIBTRAYICON_CFLAGS
+++ LIBTRAYICON_LIBS
+++ OPEN_WITH_CFLAGS
+++ OPEN_WITH_LIBS
+++ EVO_CFLAGS
+++ EVO_LIBS
+++ GSF_SHARP_CFLAGS
+++ GSF_SHARP_LIBS
+++ LIBEXIF_CFLAGS
+++ LIBEXIF_LIBS
+++ LIBEXIF_API_CHECK_CFLAGS
+++ LIBEXIF_API_CHECK_LIBS
+++ LIBEXIF_VERSION_CHECK_CFLAGS
+++ LIBEXIF_VERSION_CHECK_LIBS
+++ BEAGLED_CFLAGS
+++ BEAGLED_LIBS
+++ LIBBEAGLE_CFLAGS
+++ LIBBEAGLE_LIBS
+++ EPIPHANY_DEPENDENCY_CFLAGS
+++ EPIPHANY_DEPENDENCY_LIBS
+++ GALAGO_CFLAGS
+++ GALAGO_LIBS
+++ SYSTEMINFO_GLUE_CFLAGS
+++ SYSTEMINFO_GLUE_LIBS
+++ WV1_CFLAGS
+++ WV1_LIBS
+++ PYBEAGLE_CFLAGS
+++ PYBEAGLE_LIBS'
+++ 
++  
++  # Initialize some variables set by options.
++  ac_init_help=
++***************
++*** 856,1113 ****
++  test "$silent" = yes && exec 6>/dev/null
++  
++  
++  # Find the source files, if location was not specified.
++  if test -z "$srcdir"; then
++    ac_srcdir_defaulted=yes
++-   # Try the directory containing this script, then its parent.
++-   ac_confdir=`(dirname "$0") 2>/dev/null ||
++  $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$0" : 'X\(//\)[^/]' \| \
++  	 X"$0" : 'X\(//\)$' \| \
++- 	 X"$0" : 'X\(/\)' \| \
++- 	 .     : '\(.\)' 2>/dev/null ||
++  echo X"$0" |
++-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++-   	  /^X\(\/\/\)$/{ s//\1/; q; }
++-   	  /^X\(\/\).*/{ s//\1/; q; }
++-   	  s/.*/./; q'`
++    srcdir=$ac_confdir
++-   if test ! -r $srcdir/$ac_unique_file; then
++      srcdir=..
++    fi
++  else
++    ac_srcdir_defaulted=no
++  fi
++- if test ! -r $srcdir/$ac_unique_file; then
++-   if test "$ac_srcdir_defaulted" = yes; then
++-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
++-    { (exit 1); exit 1; }; }
++-   else
++-     { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++     { (exit 1); exit 1; }; }
++-   fi
++  fi
++- (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
++-   { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
++     { (exit 1); exit 1; }; }
++- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
++- ac_env_build_alias_set=${build_alias+set}
++- ac_env_build_alias_value=$build_alias
++- ac_cv_env_build_alias_set=${build_alias+set}
++- ac_cv_env_build_alias_value=$build_alias
++- ac_env_host_alias_set=${host_alias+set}
++- ac_env_host_alias_value=$host_alias
++- ac_cv_env_host_alias_set=${host_alias+set}
++- ac_cv_env_host_alias_value=$host_alias
++- ac_env_target_alias_set=${target_alias+set}
++- ac_env_target_alias_value=$target_alias
++- ac_cv_env_target_alias_set=${target_alias+set}
++- ac_cv_env_target_alias_value=$target_alias
++- ac_env_CC_set=${CC+set}
++- ac_env_CC_value=$CC
++- ac_cv_env_CC_set=${CC+set}
++- ac_cv_env_CC_value=$CC
++- ac_env_CFLAGS_set=${CFLAGS+set}
++- ac_env_CFLAGS_value=$CFLAGS
++- ac_cv_env_CFLAGS_set=${CFLAGS+set}
++- ac_cv_env_CFLAGS_value=$CFLAGS
++- ac_env_LDFLAGS_set=${LDFLAGS+set}
++- ac_env_LDFLAGS_value=$LDFLAGS
++- ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
++- ac_cv_env_LDFLAGS_value=$LDFLAGS
++- ac_env_CPPFLAGS_set=${CPPFLAGS+set}
++- ac_env_CPPFLAGS_value=$CPPFLAGS
++- ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
++- ac_cv_env_CPPFLAGS_value=$CPPFLAGS
++- ac_env_CPP_set=${CPP+set}
++- ac_env_CPP_value=$CPP
++- ac_cv_env_CPP_set=${CPP+set}
++- ac_cv_env_CPP_value=$CPP
++- ac_env_CXX_set=${CXX+set}
++- ac_env_CXX_value=$CXX
++- ac_cv_env_CXX_set=${CXX+set}
++- ac_cv_env_CXX_value=$CXX
++- ac_env_CXXFLAGS_set=${CXXFLAGS+set}
++- ac_env_CXXFLAGS_value=$CXXFLAGS
++- ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
++- ac_cv_env_CXXFLAGS_value=$CXXFLAGS
++- ac_env_CXXCPP_set=${CXXCPP+set}
++- ac_env_CXXCPP_value=$CXXCPP
++- ac_cv_env_CXXCPP_set=${CXXCPP+set}
++- ac_cv_env_CXXCPP_value=$CXXCPP
++- ac_env_F77_set=${F77+set}
++- ac_env_F77_value=$F77
++- ac_cv_env_F77_set=${F77+set}
++- ac_cv_env_F77_value=$F77
++- ac_env_FFLAGS_set=${FFLAGS+set}
++- ac_env_FFLAGS_value=$FFLAGS
++- ac_cv_env_FFLAGS_set=${FFLAGS+set}
++- ac_cv_env_FFLAGS_value=$FFLAGS
++- ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++- ac_env_PKG_CONFIG_value=$PKG_CONFIG
++- ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
++- ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
++- ac_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
++- ac_env_MONO_CFLAGS_value=$MONO_CFLAGS
++- ac_cv_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
++- ac_cv_env_MONO_CFLAGS_value=$MONO_CFLAGS
++- ac_env_MONO_LIBS_set=${MONO_LIBS+set}
++- ac_env_MONO_LIBS_value=$MONO_LIBS
++- ac_cv_env_MONO_LIBS_set=${MONO_LIBS+set}
++- ac_cv_env_MONO_LIBS_value=$MONO_LIBS
++- ac_env_SQLITE_CFLAGS_set=${SQLITE_CFLAGS+set}
++- ac_env_SQLITE_CFLAGS_value=$SQLITE_CFLAGS
++- ac_cv_env_SQLITE_CFLAGS_set=${SQLITE_CFLAGS+set}
++- ac_cv_env_SQLITE_CFLAGS_value=$SQLITE_CFLAGS
++- ac_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
++- ac_env_SQLITE_LIBS_value=$SQLITE_LIBS
++- ac_cv_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
++- ac_cv_env_SQLITE_LIBS_value=$SQLITE_LIBS
++- ac_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
++- ac_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
++- ac_cv_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
++- ac_cv_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
++- ac_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
++- ac_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
++- ac_cv_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
++- ac_cv_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
++- ac_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
++- ac_env_GNOME_VFS_CFLAGS_value=$GNOME_VFS_CFLAGS
++- ac_cv_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
++- ac_cv_env_GNOME_VFS_CFLAGS_value=$GNOME_VFS_CFLAGS
++- ac_env_GNOME_VFS_LIBS_set=${GNOME_VFS_LIBS+set}
++- ac_env_GNOME_VFS_LIBS_value=$GNOME_VFS_LIBS
++- ac_cv_env_GNOME_VFS_LIBS_set=${GNOME_VFS_LIBS+set}
++- ac_cv_env_GNOME_VFS_LIBS_value=$GNOME_VFS_LIBS
++- ac_env_BEAGLE_UI_CFLAGS_set=${BEAGLE_UI_CFLAGS+set}
++- ac_env_BEAGLE_UI_CFLAGS_value=$BEAGLE_UI_CFLAGS
++- ac_cv_env_BEAGLE_UI_CFLAGS_set=${BEAGLE_UI_CFLAGS+set}
++- ac_cv_env_BEAGLE_UI_CFLAGS_value=$BEAGLE_UI_CFLAGS
++- ac_env_BEAGLE_UI_LIBS_set=${BEAGLE_UI_LIBS+set}
++- ac_env_BEAGLE_UI_LIBS_value=$BEAGLE_UI_LIBS
++- ac_cv_env_BEAGLE_UI_LIBS_set=${BEAGLE_UI_LIBS+set}
++- ac_cv_env_BEAGLE_UI_LIBS_value=$BEAGLE_UI_LIBS
++- ac_env_UIGLUE_CFLAGS_set=${UIGLUE_CFLAGS+set}
++- ac_env_UIGLUE_CFLAGS_value=$UIGLUE_CFLAGS
++- ac_cv_env_UIGLUE_CFLAGS_set=${UIGLUE_CFLAGS+set}
++- ac_cv_env_UIGLUE_CFLAGS_value=$UIGLUE_CFLAGS
++- ac_env_UIGLUE_LIBS_set=${UIGLUE_LIBS+set}
++- ac_env_UIGLUE_LIBS_value=$UIGLUE_LIBS
++- ac_cv_env_UIGLUE_LIBS_set=${UIGLUE_LIBS+set}
++- ac_cv_env_UIGLUE_LIBS_value=$UIGLUE_LIBS
++- ac_env_LIBTRAYICON_CFLAGS_set=${LIBTRAYICON_CFLAGS+set}
++- ac_env_LIBTRAYICON_CFLAGS_value=$LIBTRAYICON_CFLAGS
++- ac_cv_env_LIBTRAYICON_CFLAGS_set=${LIBTRAYICON_CFLAGS+set}
++- ac_cv_env_LIBTRAYICON_CFLAGS_value=$LIBTRAYICON_CFLAGS
++- ac_env_LIBTRAYICON_LIBS_set=${LIBTRAYICON_LIBS+set}
++- ac_env_LIBTRAYICON_LIBS_value=$LIBTRAYICON_LIBS
++- ac_cv_env_LIBTRAYICON_LIBS_set=${LIBTRAYICON_LIBS+set}
++- ac_cv_env_LIBTRAYICON_LIBS_value=$LIBTRAYICON_LIBS
++- ac_env_OPEN_WITH_CFLAGS_set=${OPEN_WITH_CFLAGS+set}
++- ac_env_OPEN_WITH_CFLAGS_value=$OPEN_WITH_CFLAGS
++- ac_cv_env_OPEN_WITH_CFLAGS_set=${OPEN_WITH_CFLAGS+set}
++- ac_cv_env_OPEN_WITH_CFLAGS_value=$OPEN_WITH_CFLAGS
++- ac_env_OPEN_WITH_LIBS_set=${OPEN_WITH_LIBS+set}
++- ac_env_OPEN_WITH_LIBS_value=$OPEN_WITH_LIBS
++- ac_cv_env_OPEN_WITH_LIBS_set=${OPEN_WITH_LIBS+set}
++- ac_cv_env_OPEN_WITH_LIBS_value=$OPEN_WITH_LIBS
++- ac_env_EVO_CFLAGS_set=${EVO_CFLAGS+set}
++- ac_env_EVO_CFLAGS_value=$EVO_CFLAGS
++- ac_cv_env_EVO_CFLAGS_set=${EVO_CFLAGS+set}
++- ac_cv_env_EVO_CFLAGS_value=$EVO_CFLAGS
++- ac_env_EVO_LIBS_set=${EVO_LIBS+set}
++- ac_env_EVO_LIBS_value=$EVO_LIBS
++- ac_cv_env_EVO_LIBS_set=${EVO_LIBS+set}
++- ac_cv_env_EVO_LIBS_value=$EVO_LIBS
++- ac_env_GSF_SHARP_CFLAGS_set=${GSF_SHARP_CFLAGS+set}
++- ac_env_GSF_SHARP_CFLAGS_value=$GSF_SHARP_CFLAGS
++- ac_cv_env_GSF_SHARP_CFLAGS_set=${GSF_SHARP_CFLAGS+set}
++- ac_cv_env_GSF_SHARP_CFLAGS_value=$GSF_SHARP_CFLAGS
++- ac_env_GSF_SHARP_LIBS_set=${GSF_SHARP_LIBS+set}
++- ac_env_GSF_SHARP_LIBS_value=$GSF_SHARP_LIBS
++- ac_cv_env_GSF_SHARP_LIBS_set=${GSF_SHARP_LIBS+set}
++- ac_cv_env_GSF_SHARP_LIBS_value=$GSF_SHARP_LIBS
++- ac_env_LIBEXIF_CFLAGS_set=${LIBEXIF_CFLAGS+set}
++- ac_env_LIBEXIF_CFLAGS_value=$LIBEXIF_CFLAGS
++- ac_cv_env_LIBEXIF_CFLAGS_set=${LIBEXIF_CFLAGS+set}
++- ac_cv_env_LIBEXIF_CFLAGS_value=$LIBEXIF_CFLAGS
++- ac_env_LIBEXIF_LIBS_set=${LIBEXIF_LIBS+set}
++- ac_env_LIBEXIF_LIBS_value=$LIBEXIF_LIBS
++- ac_cv_env_LIBEXIF_LIBS_set=${LIBEXIF_LIBS+set}
++- ac_cv_env_LIBEXIF_LIBS_value=$LIBEXIF_LIBS
++- ac_env_LIBEXIF_API_CHECK_CFLAGS_set=${LIBEXIF_API_CHECK_CFLAGS+set}
++- ac_env_LIBEXIF_API_CHECK_CFLAGS_value=$LIBEXIF_API_CHECK_CFLAGS
++- ac_cv_env_LIBEXIF_API_CHECK_CFLAGS_set=${LIBEXIF_API_CHECK_CFLAGS+set}
++- ac_cv_env_LIBEXIF_API_CHECK_CFLAGS_value=$LIBEXIF_API_CHECK_CFLAGS
++- ac_env_LIBEXIF_API_CHECK_LIBS_set=${LIBEXIF_API_CHECK_LIBS+set}
++- ac_env_LIBEXIF_API_CHECK_LIBS_value=$LIBEXIF_API_CHECK_LIBS
++- ac_cv_env_LIBEXIF_API_CHECK_LIBS_set=${LIBEXIF_API_CHECK_LIBS+set}
++- ac_cv_env_LIBEXIF_API_CHECK_LIBS_value=$LIBEXIF_API_CHECK_LIBS
++- ac_env_LIBEXIF_VERSION_CHECK_CFLAGS_set=${LIBEXIF_VERSION_CHECK_CFLAGS+set}
++- ac_env_LIBEXIF_VERSION_CHECK_CFLAGS_value=$LIBEXIF_VERSION_CHECK_CFLAGS
++- ac_cv_env_LIBEXIF_VERSION_CHECK_CFLAGS_set=${LIBEXIF_VERSION_CHECK_CFLAGS+set}
++- ac_cv_env_LIBEXIF_VERSION_CHECK_CFLAGS_value=$LIBEXIF_VERSION_CHECK_CFLAGS
++- ac_env_LIBEXIF_VERSION_CHECK_LIBS_set=${LIBEXIF_VERSION_CHECK_LIBS+set}
++- ac_env_LIBEXIF_VERSION_CHECK_LIBS_value=$LIBEXIF_VERSION_CHECK_LIBS
++- ac_cv_env_LIBEXIF_VERSION_CHECK_LIBS_set=${LIBEXIF_VERSION_CHECK_LIBS+set}
++- ac_cv_env_LIBEXIF_VERSION_CHECK_LIBS_value=$LIBEXIF_VERSION_CHECK_LIBS
++- ac_env_BEAGLED_CFLAGS_set=${BEAGLED_CFLAGS+set}
++- ac_env_BEAGLED_CFLAGS_value=$BEAGLED_CFLAGS
++- ac_cv_env_BEAGLED_CFLAGS_set=${BEAGLED_CFLAGS+set}
++- ac_cv_env_BEAGLED_CFLAGS_value=$BEAGLED_CFLAGS
++- ac_env_BEAGLED_LIBS_set=${BEAGLED_LIBS+set}
++- ac_env_BEAGLED_LIBS_value=$BEAGLED_LIBS
++- ac_cv_env_BEAGLED_LIBS_set=${BEAGLED_LIBS+set}
++- ac_cv_env_BEAGLED_LIBS_value=$BEAGLED_LIBS
++- ac_env_LIBBEAGLE_CFLAGS_set=${LIBBEAGLE_CFLAGS+set}
++- ac_env_LIBBEAGLE_CFLAGS_value=$LIBBEAGLE_CFLAGS
++- ac_cv_env_LIBBEAGLE_CFLAGS_set=${LIBBEAGLE_CFLAGS+set}
++- ac_cv_env_LIBBEAGLE_CFLAGS_value=$LIBBEAGLE_CFLAGS
++- ac_env_LIBBEAGLE_LIBS_set=${LIBBEAGLE_LIBS+set}
++- ac_env_LIBBEAGLE_LIBS_value=$LIBBEAGLE_LIBS
++- ac_cv_env_LIBBEAGLE_LIBS_set=${LIBBEAGLE_LIBS+set}
++- ac_cv_env_LIBBEAGLE_LIBS_value=$LIBBEAGLE_LIBS
++- ac_env_EPIPHANY_DEPENDENCY_CFLAGS_set=${EPIPHANY_DEPENDENCY_CFLAGS+set}
++- ac_env_EPIPHANY_DEPENDENCY_CFLAGS_value=$EPIPHANY_DEPENDENCY_CFLAGS
++- ac_cv_env_EPIPHANY_DEPENDENCY_CFLAGS_set=${EPIPHANY_DEPENDENCY_CFLAGS+set}
++- ac_cv_env_EPIPHANY_DEPENDENCY_CFLAGS_value=$EPIPHANY_DEPENDENCY_CFLAGS
++- ac_env_EPIPHANY_DEPENDENCY_LIBS_set=${EPIPHANY_DEPENDENCY_LIBS+set}
++- ac_env_EPIPHANY_DEPENDENCY_LIBS_value=$EPIPHANY_DEPENDENCY_LIBS
++- ac_cv_env_EPIPHANY_DEPENDENCY_LIBS_set=${EPIPHANY_DEPENDENCY_LIBS+set}
++- ac_cv_env_EPIPHANY_DEPENDENCY_LIBS_value=$EPIPHANY_DEPENDENCY_LIBS
++- ac_env_GALAGO_CFLAGS_set=${GALAGO_CFLAGS+set}
++- ac_env_GALAGO_CFLAGS_value=$GALAGO_CFLAGS
++- ac_cv_env_GALAGO_CFLAGS_set=${GALAGO_CFLAGS+set}
++- ac_cv_env_GALAGO_CFLAGS_value=$GALAGO_CFLAGS
++- ac_env_GALAGO_LIBS_set=${GALAGO_LIBS+set}
++- ac_env_GALAGO_LIBS_value=$GALAGO_LIBS
++- ac_cv_env_GALAGO_LIBS_set=${GALAGO_LIBS+set}
++- ac_cv_env_GALAGO_LIBS_value=$GALAGO_LIBS
++- ac_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
++- ac_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
++- ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
++- ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
++- ac_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
++- ac_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
++- ac_cv_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
++- ac_cv_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
++- ac_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
++- ac_env_WV1_CFLAGS_value=$WV1_CFLAGS
++- ac_cv_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
++- ac_cv_env_WV1_CFLAGS_value=$WV1_CFLAGS
++- ac_env_WV1_LIBS_set=${WV1_LIBS+set}
++- ac_env_WV1_LIBS_value=$WV1_LIBS
++- ac_cv_env_WV1_LIBS_set=${WV1_LIBS+set}
++- ac_cv_env_WV1_LIBS_value=$WV1_LIBS
++- ac_env_PYBEAGLE_CFLAGS_set=${PYBEAGLE_CFLAGS+set}
++- ac_env_PYBEAGLE_CFLAGS_value=$PYBEAGLE_CFLAGS
++- ac_cv_env_PYBEAGLE_CFLAGS_set=${PYBEAGLE_CFLAGS+set}
++- ac_cv_env_PYBEAGLE_CFLAGS_value=$PYBEAGLE_CFLAGS
++- ac_env_PYBEAGLE_LIBS_set=${PYBEAGLE_LIBS+set}
++- ac_env_PYBEAGLE_LIBS_value=$PYBEAGLE_LIBS
++- ac_cv_env_PYBEAGLE_LIBS_set=${PYBEAGLE_LIBS+set}
++- ac_cv_env_PYBEAGLE_LIBS_value=$PYBEAGLE_LIBS
++  
++  #
++  # Report the --help message.
++--- 1512,1587 ----
++  test "$silent" = yes && exec 6>/dev/null
++  
++  
+++ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+++ ac_ls_di=`ls -di .` &&
+++ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+++   { echo "$as_me: error: Working directory cannot be determined" >&2
+++    { (exit 1); exit 1; }; }
+++ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+++   { echo "$as_me: error: pwd does not report name of working directory" >&2
+++    { (exit 1); exit 1; }; }
+++ 
+++ 
++  # Find the source files, if location was not specified.
++  if test -z "$srcdir"; then
++    ac_srcdir_defaulted=yes
+++   # Try the directory containing this script, then the parent directory.
+++   ac_confdir=`$as_dirname -- "$0" ||
++  $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$0" : 'X\(//\)[^/]' \| \
++  	 X"$0" : 'X\(//\)$' \| \
+++ 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++  echo X"$0" |
+++     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)[^/].*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\).*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  s/.*/./; q'`
++    srcdir=$ac_confdir
+++   if test ! -r "$srcdir/$ac_unique_file"; then
++      srcdir=..
++    fi
++  else
++    ac_srcdir_defaulted=no
++  fi
+++ if test ! -r "$srcdir/$ac_unique_file"; then
+++   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+++   { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
++     { (exit 1); exit 1; }; }
++  fi
+++ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+++ ac_abs_confdir=`(
+++ 	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
++     { (exit 1); exit 1; }; }
+++ 	pwd)`
+++ # When building in place, set srcdir=.
+++ if test "$ac_abs_confdir" = "$ac_pwd"; then
+++   srcdir=.
+++ fi
+++ # Remove unnecessary trailing slashes from srcdir.
+++ # Double slashes in file names in object file debugging info
+++ # mess up M-x gdb in Emacs.
+++ case $srcdir in
+++ */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
+++ esac
+++ for ac_var in $ac_precious_vars; do
+++   eval ac_env_${ac_var}_set=\${${ac_var}+set}
+++   eval ac_env_${ac_var}_value=\$${ac_var}
+++   eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
+++   eval ac_cv_env_${ac_var}_value=\$${ac_var}
+++ done
++  
++  #
++  # Report the --help message.
++***************
++*** 4063,4069 ****
++    ;;
++  *-*-irix6*)
++    # Find out which ABI we are using.
++-   echo '#line 4075 "configure"' > conftest.$ac_ext
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++    (eval $ac_compile) 2>&5
++    ac_status=$?
++--- 4811,4817 ----
++    ;;
++  *-*-irix6*)
++    # Find out which ABI we are using.
+++   echo '#line 4823 "configure"' > conftest.$ac_ext
++    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++    (eval $ac_compile) 2>&5
++    ac_status=$?
++***************
++*** 5635,5682 ****
++    IFS=$as_save_IFS
++    test -z "$as_dir" && as_dir=.
++    for ac_exec_ext in '' $ac_executable_extensions; do
++-   if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++      ac_cv_prog_ac_ct_F77="$ac_prog"
++      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++      break 2
++    fi
++  done
++  done
++  
++  fi
++  fi
++  ac_ct_F77=$ac_cv_prog_ac_ct_F77
++  if test -n "$ac_ct_F77"; then
++-   echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
++- echo "${ECHO_T}$ac_ct_F77" >&6
++  else
++-   echo "$as_me:$LINENO: result: no" >&5
++- echo "${ECHO_T}no" >&6
++  fi
++  
++    test -n "$ac_ct_F77" && break
++  done
++  
++-   F77=$ac_ct_F77
++  fi
++  
++  
++  # Provide some information about the compiler.
++- echo "$as_me:5674:" \
++-      "checking for Fortran 77 compiler version" >&5
++  ac_compiler=`set X $ac_compile; echo $2`
++- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
++-   (eval $ac_compiler --version </dev/null >&5) 2>&5
++    ac_status=$?
++    echo "$as_me:$LINENO: \$? = $ac_status" >&5
++    (exit $ac_status); }
++- { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
++-   (eval $ac_compiler -v </dev/null >&5) 2>&5
++    ac_status=$?
++    echo "$as_me:$LINENO: \$? = $ac_status" >&5
++    (exit $ac_status); }
++- { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
++-   (eval $ac_compiler -V </dev/null >&5) 2>&5
++    ac_status=$?
++    echo "$as_me:$LINENO: \$? = $ac_status" >&5
++    (exit $ac_status); }
++--- 6576,6653 ----
++    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_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++      ac_cv_prog_ac_ct_F77="$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_F77=$ac_cv_prog_ac_ct_F77
++  if test -n "$ac_ct_F77"; then
+++   { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+++ echo "${ECHO_T}$ac_ct_F77" >&6; }
++  else
+++   { echo "$as_me:$LINENO: result: no" >&5
+++ echo "${ECHO_T}no" >&6; }
++  fi
++  
+++ 
++    test -n "$ac_ct_F77" && break
++  done
++  
+++   if test "x$ac_ct_F77" = x; then
+++     F77=""
+++   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 at 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 at gnu.org." >&2;}
+++ ac_tool_warned=yes ;;
+++ esac
+++     F77=$ac_ct_F77
+++   fi
++  fi
++  
++  
++  # Provide some information about the compiler.
+++ echo "$as_me:$LINENO: checking for Fortran 77 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); }
++***************
++*** 6725,6735 ****
++     -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:6737: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:6741: \$? = $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.
++--- 7770,7780 ----
++     -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:7782: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:7786: \$? = $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.
++***************
++*** 6993,7003 ****
++     -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:7005: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:7009: \$? = $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.
++--- 8038,8048 ----
++     -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:8050: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:8054: \$? = $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.
++***************
++*** 7097,7107 ****
++     -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:7109: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
++-    echo "$as_me:7113: \$? = $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
++--- 8142,8152 ----
++     -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:8154: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
+++    echo "$as_me:8158: \$? = $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
++***************
++*** 9442,9448 ****
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++    lt_status=$lt_dlunknown
++    cat > conftest.$ac_ext <<EOF
++- #line 9454 "configure"
++  #include "confdefs.h"
++  
++  #if HAVE_DLFCN_H
++--- 10583,10589 ----
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++    lt_status=$lt_dlunknown
++    cat > conftest.$ac_ext <<EOF
+++ #line 10595 "configure"
++  #include "confdefs.h"
++  
++  #if HAVE_DLFCN_H
++***************
++*** 9542,9548 ****
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++    lt_status=$lt_dlunknown
++    cat > conftest.$ac_ext <<EOF
++- #line 9554 "configure"
++  #include "confdefs.h"
++  
++  #if HAVE_DLFCN_H
++--- 10683,10689 ----
++    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
++    lt_status=$lt_dlunknown
++    cat > conftest.$ac_ext <<EOF
+++ #line 10695 "configure"
++  #include "confdefs.h"
++  
++  #if HAVE_DLFCN_H
++***************
++*** 11882,11892 ****
++     -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:11894: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:11898: \$? = $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.
++--- 13051,13061 ----
++     -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:13063: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:13067: \$? = $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.
++***************
++*** 11986,11996 ****
++     -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:11998: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
++-    echo "$as_me:12002: \$? = $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
++--- 13155,13165 ----
++     -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:13167: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
+++    echo "$as_me:13171: \$? = $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
++***************
++*** 13556,13566 ****
++     -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:13568: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:13572: \$? = $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.
++--- 14716,14726 ----
++     -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:14728: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:14732: \$? = $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.
++***************
++*** 13660,13670 ****
++     -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:13672: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
++-    echo "$as_me:13676: \$? = $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
++--- 14820,14830 ----
++     -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:14832: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
+++    echo "$as_me:14836: \$? = $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
++***************
++*** 15863,15873 ****
++     -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:15875: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:15879: \$? = $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.
++--- 17039,17049 ----
++     -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:17051: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:17055: \$? = $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.
++***************
++*** 16131,16141 ****
++     -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:16143: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
++-    echo "$as_me:16147: \$? = $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.
++--- 17307,17317 ----
++     -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:17319: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>conftest.err)
++     ac_status=$?
++     cat conftest.err >&5
+++    echo "$as_me:17323: \$? = $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.
++***************
++*** 16235,16245 ****
++     -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:16247: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
++-    echo "$as_me:16251: \$? = $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
++--- 17411,17421 ----
++     -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:17423: $lt_compile\"" >&5)
++     (eval "$lt_compile" 2>out/conftest.err)
++     ac_status=$?
++     cat out/conftest.err >&5
+++    echo "$as_me:17427: \$? = $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
++***************
++*** 26027,26034 ****
++  
++  
++  pkg_failed=no
++- echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
++- echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6
++  
++  if test -n "$PKG_CONFIG"; then
++      if test -n "$SYSTEMINFO_GLUE_CFLAGS"; then
++--- 27766,27773 ----
++  
++  
++  pkg_failed=no
+++ { echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
+++ echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6; }
++  
++  if test -n "$PKG_CONFIG"; then
++      if test -n "$SYSTEMINFO_GLUE_CFLAGS"; then
++***************
++*** 26132,26139 ****
++  else
++  	SYSTEMINFO_GLUE_CFLAGS=$pkg_cv_SYSTEMINFO_GLUE_CFLAGS
++  	SYSTEMINFO_GLUE_LIBS=$pkg_cv_SYSTEMINFO_GLUE_LIBS
++-         echo "$as_me:$LINENO: result: yes" >&5
++- echo "${ECHO_T}yes" >&6
++  	:
++  fi
++  SYSTEMINFO_GLUE_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $XSS_LIBS $X_EXTRA_LIBS"
++--- 27871,27878 ----
++  else
++  	SYSTEMINFO_GLUE_CFLAGS=$pkg_cv_SYSTEMINFO_GLUE_CFLAGS
++  	SYSTEMINFO_GLUE_LIBS=$pkg_cv_SYSTEMINFO_GLUE_LIBS
+++         { echo "$as_me:$LINENO: result: yes" >&5
+++ echo "${ECHO_T}yes" >&6; }
++  	:
++  fi
++  SYSTEMINFO_GLUE_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $XSS_LIBS $X_EXTRA_LIBS"
++***************
++*** 26693,26699 ****
++  
++  
++  
++-                                                                                                                                                                                                                                                                               ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
++  cat >confcache <<\_ACEOF
++  # This file is a shell script that caches the results of configure
++  # tests run on this system so they can be shared between configure
++--- 28506,28513 ----
++  
++  
++  
+++ ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
+++ 
++  cat >confcache <<\_ACEOF
++  # This file is a shell script that caches the results of configure
++  # tests run on this system so they can be shared between configure
++***************
++*** 27408,27477 ****
++  _ACEOF
++  cat >>$CONFIG_STATUS <<_ACEOF
++  if \$ac_cs_recheck; then
++-   echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
++-   exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  fi
++  
++  _ACEOF
++  
++  cat >>$CONFIG_STATUS <<_ACEOF
++  #
++- # INIT-COMMANDS section.
++  #
++- 
++  AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
++- INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
++- INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
++- MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
++- XGETTEXT='${INTLTOOL_XGETTEXT}'
++  
++  
++  _ACEOF
++  
++- 
++- 
++  cat >>$CONFIG_STATUS <<\_ACEOF
++  for ac_config_target in $ac_config_targets
++  do
++-   case "$ac_config_target" in
++-   # Handling of arguments.
++-   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
++-   "Util/Makefile" ) CONFIG_FILES="$CONFIG_FILES Util/Makefile" ;;
++-   "Util/Util.dll.config" ) CONFIG_FILES="$CONFIG_FILES Util/Util.dll.config" ;;
++-   "images/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
++-   "glue/Makefile" ) CONFIG_FILES="$CONFIG_FILES glue/Makefile" ;;
++-   "BeagleClient/Makefile" ) CONFIG_FILES="$CONFIG_FILES BeagleClient/Makefile" ;;
++-   "beagled/Makefile" ) CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
++-   "Filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
++-   "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
++-   "search/Makefile" ) CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
++-   "ImLogViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
++-   "libbeagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
++-   "libbeagle/libbeagle-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
++-   "libbeagle/beagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
++-   "libbeagle/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/examples/Makefile" ;;
++-   "libbeagle/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/docs/Makefile" ;;
++-   "libbeagle/docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/docs/reference/Makefile" ;;
++-   "epiphany-extension/Makefile" ) CONFIG_FILES="$CONFIG_FILES epiphany-extension/Makefile" ;;
++-   "mozilla-extension/Makefile" ) CONFIG_FILES="$CONFIG_FILES mozilla-extension/Makefile" ;;
++-   "bludgeon/Makefile" ) CONFIG_FILES="$CONFIG_FILES bludgeon/Makefile" ;;
++-   "wrappers/Makefile" ) CONFIG_FILES="$CONFIG_FILES wrappers/Makefile" ;;
++-   "wrappers/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES wrappers/python/Makefile" ;;
++-   "beagle-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-0.0.pc" ;;
++-   "beagle-daemon.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-daemon.pc" ;;
++-   "beagle-ui-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-ui-0.0.pc" ;;
++-   "beagle.spec" ) CONFIG_FILES="$CONFIG_FILES beagle.spec" ;;
++-   "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
++-   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
++-   "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
++-   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
++-   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
++    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++     { (exit 1); exit 1; }; };;
++    esac
++  done
++  
++  # If the user did not use the arguments to specify the items to instantiate,
++  # then the envvar interface is used.  Set only those that are not.
++  # We use the long form for the default assignment because of an extremely
++--- 29225,29308 ----
++  _ACEOF
++  cat >>$CONFIG_STATUS <<_ACEOF
++  if \$ac_cs_recheck; then
+++   echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
+++   CONFIG_SHELL=$SHELL
+++   export CONFIG_SHELL
+++   exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
++  fi
++  
++  _ACEOF
+++ cat >>$CONFIG_STATUS <<\_ACEOF
+++ exec 5>>config.log
+++ {
+++   echo
+++   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+++ ## Running $as_me. ##
+++ _ASBOX
+++   echo "$ac_log"
+++ } >&5
++  
+++ _ACEOF
++  cat >>$CONFIG_STATUS <<_ACEOF
++  #
+++ # 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}'
++  
++  
++  _ACEOF
++  
++  cat >>$CONFIG_STATUS <<\_ACEOF
+++ 
+++ # Handling of arguments.
++  for ac_config_target in $ac_config_targets
++  do
+++   case $ac_config_target in
+++     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+++     "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" ;;
+++     "Util/Makefile") CONFIG_FILES="$CONFIG_FILES Util/Makefile" ;;
+++     "Util/Util.dll.config") CONFIG_FILES="$CONFIG_FILES Util/Util.dll.config" ;;
+++     "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
+++     "glue/Makefile") CONFIG_FILES="$CONFIG_FILES glue/Makefile" ;;
+++     "BeagleClient/Makefile") CONFIG_FILES="$CONFIG_FILES BeagleClient/Makefile" ;;
+++     "beagled/Makefile") CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
+++     "Filters/Makefile") CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
+++     "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+++     "search/Makefile") CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
+++     "ImLogViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
+++     "libbeagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
+++     "libbeagle/libbeagle-0.0.pc") CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
+++     "libbeagle/beagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
+++     "libbeagle/examples/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/examples/Makefile" ;;
+++     "libbeagle/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/docs/Makefile" ;;
+++     "libbeagle/docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/docs/reference/Makefile" ;;
+++     "epiphany-extension/Makefile") CONFIG_FILES="$CONFIG_FILES epiphany-extension/Makefile" ;;
+++     "mozilla-extension/Makefile") CONFIG_FILES="$CONFIG_FILES mozilla-extension/Makefile" ;;
+++     "bludgeon/Makefile") CONFIG_FILES="$CONFIG_FILES bludgeon/Makefile" ;;
+++     "wrappers/Makefile") CONFIG_FILES="$CONFIG_FILES wrappers/Makefile" ;;
+++     "wrappers/python/Makefile") CONFIG_FILES="$CONFIG_FILES wrappers/python/Makefile" ;;
+++     "beagle-0.0.pc") CONFIG_FILES="$CONFIG_FILES beagle-0.0.pc" ;;
+++     "beagle-daemon.pc") CONFIG_FILES="$CONFIG_FILES beagle-daemon.pc" ;;
+++     "beagle-ui-0.0.pc") CONFIG_FILES="$CONFIG_FILES beagle-ui-0.0.pc" ;;
+++     "beagle.spec") CONFIG_FILES="$CONFIG_FILES beagle.spec" ;;
+++     "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
+++     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+++ 
++    *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
++  echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
++     { (exit 1); exit 1; }; };;
++    esac
++  done
++  
+++ 
++  # If the user did not use the arguments to specify the items to instantiate,
++  # then the envvar interface is used.  Set only those that are not.
++  # We use the long form for the default assignment because of an extremely
++***************
++*** 27483,28007 ****
++  fi
++  
++  # Have a temporary directory for convenience.  Make it in the build tree
++- # simply because there is no reason to put it here, and in addition,
++  # creating and moving files from /tmp can sometimes cause problems.
++- # Create a temporary directory, and hook for its removal unless debugging.
++  $debug ||
++  {
++-   trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
++    trap '{ (exit 1); exit 1; }' 1 2 13 15
++  }
++- 
++  # Create a (secure) tmp directory for tmp files.
++  
++  {
++-   tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
++    test -n "$tmp" && test -d "$tmp"
++  }  ||
++  {
++-   tmp=./confstat$$-$RANDOM
++-   (umask 077 && mkdir $tmp)
++  } ||
++  {
++     echo "$me: cannot create a temporary directory in ." >&2
++     { (exit 1); exit 1; }
++  }
++  
++- _ACEOF
++- 
++- cat >>$CONFIG_STATUS <<_ACEOF
++- 
++  #
++- # CONFIG_FILES section.
++  #
++  
++  # No need to generate the scripts if there are no CONFIG_FILES.
++  # This happens for instance when ./config.status config.h
++- if test -n "\$CONFIG_FILES"; then
++-   # Protect against being on the right side of a sed subst in config.status.
++-   sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
++-    s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
++- s, at SHELL@,$SHELL,;t t
++- s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
++- s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
++- s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
++- s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
++- s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
++- s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
++- s, at exec_prefix@,$exec_prefix,;t t
++- s, at prefix@,$prefix,;t t
++- s, at program_transform_name@,$program_transform_name,;t t
++- s, at bindir@,$bindir,;t t
++- s, at sbindir@,$sbindir,;t t
++- s, at libexecdir@,$libexecdir,;t t
++- s, at datadir@,$datadir,;t t
++- s, at sysconfdir@,$sysconfdir,;t t
++- s, at sharedstatedir@,$sharedstatedir,;t t
++- s, at localstatedir@,$localstatedir,;t t
++- s, at libdir@,$libdir,;t t
++- s, at includedir@,$includedir,;t t
++- s, at oldincludedir@,$oldincludedir,;t t
++- s, at infodir@,$infodir,;t t
++- s, at mandir@,$mandir,;t t
++- s, at build_alias@,$build_alias,;t t
++- s, at host_alias@,$host_alias,;t t
++- s, at target_alias@,$target_alias,;t t
++- s, at DEFS@,$DEFS,;t t
++- s, at ECHO_C@,$ECHO_C,;t t
++- s, at ECHO_N@,$ECHO_N,;t t
++- s, at ECHO_T@,$ECHO_T,;t t
++- s, at LIBS@,$LIBS,;t t
++- s, at build@,$build,;t t
++- s, at build_cpu@,$build_cpu,;t t
++- s, at build_vendor@,$build_vendor,;t t
++- s, at build_os@,$build_os,;t t
++- s, at host@,$host,;t t
++- s, at host_cpu@,$host_cpu,;t t
++- s, at host_vendor@,$host_vendor,;t t
++- s, at host_os@,$host_os,;t t
++- s, at target@,$target,;t t
++- s, at target_cpu@,$target_cpu,;t t
++- s, at target_vendor@,$target_vendor,;t t
++- s, at target_os@,$target_os,;t t
++- s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
++- s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
++- s, at INSTALL_DATA@,$INSTALL_DATA,;t t
++- s, at CYGPATH_W@,$CYGPATH_W,;t t
++- s, at PACKAGE@,$PACKAGE,;t t
++- s, at VERSION@,$VERSION,;t t
++- s, at ACLOCAL@,$ACLOCAL,;t t
++- s, at AUTOCONF@,$AUTOCONF,;t t
++- s, at AUTOMAKE@,$AUTOMAKE,;t t
++- s, at AUTOHEADER@,$AUTOHEADER,;t t
++- s, at MAKEINFO@,$MAKEINFO,;t t
++- s, at install_sh@,$install_sh,;t t
++- s, at STRIP@,$STRIP,;t t
++- s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
++- s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
++- s, at mkdir_p@,$mkdir_p,;t t
++- s, at AWK@,$AWK,;t t
++- s, at SET_MAKE@,$SET_MAKE,;t t
++- s, at am__leading_dot@,$am__leading_dot,;t t
++- s, at AMTAR@,$AMTAR,;t t
++- s, at am__tar@,$am__tar,;t t
++- s, at am__untar@,$am__untar,;t t
++- s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
++- s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
++- s, at MAINT@,$MAINT,;t t
++- s, at CC@,$CC,;t t
++- s, at CFLAGS@,$CFLAGS,;t t
++- s, at LDFLAGS@,$LDFLAGS,;t t
++- s, at CPPFLAGS@,$CPPFLAGS,;t t
++- s, at ac_ct_CC@,$ac_ct_CC,;t t
++- s, at EXEEXT@,$EXEEXT,;t t
++- s, at OBJEXT@,$OBJEXT,;t t
++- s, at DEPDIR@,$DEPDIR,;t t
++- s, at am__include@,$am__include,;t t
++- s, at am__quote@,$am__quote,;t t
++- s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
++- s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
++- s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
++- s, at CCDEPMODE@,$CCDEPMODE,;t t
++- s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
++- s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
++- s, at EGREP@,$EGREP,;t t
++- s, at LN_S@,$LN_S,;t t
++- s, at ECHO@,$ECHO,;t t
++- s, at AR@,$AR,;t t
++- s, at ac_ct_AR@,$ac_ct_AR,;t t
++- s, at RANLIB@,$RANLIB,;t t
++- s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
++- s, at CPP@,$CPP,;t t
++- s, at CXX@,$CXX,;t t
++- s, at CXXFLAGS@,$CXXFLAGS,;t t
++- s, at ac_ct_CXX@,$ac_ct_CXX,;t t
++- s, at CXXDEPMODE@,$CXXDEPMODE,;t t
++- s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
++- s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
++- s, at CXXCPP@,$CXXCPP,;t t
++- s, at F77@,$F77,;t t
++- s, at FFLAGS@,$FFLAGS,;t t
++- s, at ac_ct_F77@,$ac_ct_F77,;t t
++- s, at LIBTOOL@,$LIBTOOL,;t t
++- s, at PKG_CONFIG@,$PKG_CONFIG,;t t
++- s, at BASH@,$BASH,;t t
++- s, at ZIP@,$ZIP,;t t
++- s, at MONO@,$MONO,;t t
++- s, at MCS@,$MCS,;t t
++- s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
++- s, at MONO_CFLAGS@,$MONO_CFLAGS,;t t
++- s, at MONO_LIBS@,$MONO_LIBS,;t t
++- s, at SHARPZIPLIB_LIBS@,$SHARPZIPLIB_LIBS,;t t
++- s, at OS_LINUX_TRUE@,$OS_LINUX_TRUE,;t t
++- s, at OS_LINUX_FALSE@,$OS_LINUX_FALSE,;t t
++- s, at OS_FREEBSD_TRUE@,$OS_FREEBSD_TRUE,;t t
++- s, at OS_FREEBSD_FALSE@,$OS_FREEBSD_FALSE,;t t
++- s, at DESKTOP_LAUNCH@,$DESKTOP_LAUNCH,;t t
++- s, at ENABLE_DESKTOP_LAUNCH_TRUE@,$ENABLE_DESKTOP_LAUNCH_TRUE,;t t
++- s, at ENABLE_DESKTOP_LAUNCH_FALSE@,$ENABLE_DESKTOP_LAUNCH_FALSE,;t t
++- s, at WSDL@,$WSDL,;t t
++- s, at ENABLE_GOOGLEDRIVER_TRUE@,$ENABLE_GOOGLEDRIVER_TRUE,;t t
++- s, at ENABLE_GOOGLEDRIVER_FALSE@,$ENABLE_GOOGLEDRIVER_FALSE,;t t
++- s, at INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
++- s, at INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
++- s, at INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t
++- s, at INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t
++- s, at INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t
++- s, at INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t
++- s, at INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t
++- s, at INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t
++- s, at INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
++- s, at INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
++- s, at INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
++- s, at INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
++- s, at INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
++- s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
++- s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
++- s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
++- s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
++- s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
++- s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
++- s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
++- s, at INTLTOOL_PERL@,$INTLTOOL_PERL,;t t
++- s, at INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
++- s, at INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
++- s, at INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
++- s, at INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
++- s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
++- s, at USE_NLS@,$USE_NLS,;t t
++- s, at MSGFMT@,$MSGFMT,;t t
++- s, at GMSGFMT@,$GMSGFMT,;t t
++- s, at XGETTEXT@,$XGETTEXT,;t t
++- s, at CATALOGS@,$CATALOGS,;t t
++- s, at CATOBJEXT@,$CATOBJEXT,;t t
++- s, at DATADIRNAME@,$DATADIRNAME,;t t
++- s, at GMOFILES@,$GMOFILES,;t t
++- s, at INSTOBJEXT@,$INSTOBJEXT,;t t
++- s, at INTLLIBS@,$INTLLIBS,;t t
++- s, at PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
++- s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
++- s, at POFILES@,$POFILES,;t t
++- s, at POSUB@,$POSUB,;t t
++- s, at SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
++- s, at SQLITE_LIBS@,$SQLITE_LIBS,;t t
++- s, at SQLITE3_CFLAGS@,$SQLITE3_CFLAGS,;t t
++- s, at SQLITE3_LIBS@,$SQLITE3_LIBS,;t t
++- s, at SQLITE_MAJ_VER@,$SQLITE_MAJ_VER,;t t
++- s, at X_CFLAGS@,$X_CFLAGS,;t t
++- s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
++- s, at X_LIBS@,$X_LIBS,;t t
++- s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
++- s, at HAS_LIBXSS_TRUE@,$HAS_LIBXSS_TRUE,;t t
++- s, at HAS_LIBXSS_FALSE@,$HAS_LIBXSS_FALSE,;t t
++- s, at ENABLE_GUI_TRUE@,$ENABLE_GUI_TRUE,;t t
++- s, at ENABLE_GUI_FALSE@,$ENABLE_GUI_FALSE,;t t
++- s, at GNOME_VFS_CFLAGS@,$GNOME_VFS_CFLAGS,;t t
++- s, at GNOME_VFS_LIBS@,$GNOME_VFS_LIBS,;t t
++- s, at BEAGLE_UI_CFLAGS@,$BEAGLE_UI_CFLAGS,;t t
++- s, at BEAGLE_UI_LIBS@,$BEAGLE_UI_LIBS,;t t
++- s, at UIGLUE_CFLAGS@,$UIGLUE_CFLAGS,;t t
++- s, at UIGLUE_LIBS@,$UIGLUE_LIBS,;t t
++- s, at LIBTRAYICON_CFLAGS@,$LIBTRAYICON_CFLAGS,;t t
++- s, at LIBTRAYICON_LIBS@,$LIBTRAYICON_LIBS,;t t
++- s, at OPEN_WITH_CFLAGS@,$OPEN_WITH_CFLAGS,;t t
++- s, at OPEN_WITH_LIBS@,$OPEN_WITH_LIBS,;t t
++- s, at ENABLE_OPEN_WITH_TRUE@,$ENABLE_OPEN_WITH_TRUE,;t t
++- s, at ENABLE_OPEN_WITH_FALSE@,$ENABLE_OPEN_WITH_FALSE,;t t
++- s, at EVO_LIBDIR@,$EVO_LIBDIR,;t t
++- s, at EVO_CFLAGS@,$EVO_CFLAGS,;t t
++- s, at EVO_LIBS@,$EVO_LIBS,;t t
++- s, at ENABLE_EVOLUTION_TRUE@,$ENABLE_EVOLUTION_TRUE,;t t
++- s, at ENABLE_EVOLUTION_FALSE@,$ENABLE_EVOLUTION_FALSE,;t t
++- s, at USE_LOCAL_SQLITE_TRUE@,$USE_LOCAL_SQLITE_TRUE,;t t
++- s, at USE_LOCAL_SQLITE_FALSE@,$USE_LOCAL_SQLITE_FALSE,;t t
++- s, at ENABLE_INOTIFY_TRUE@,$ENABLE_INOTIFY_TRUE,;t t
++- s, at ENABLE_INOTIFY_FALSE@,$ENABLE_INOTIFY_FALSE,;t t
++- s, at GSF_SHARP_CFLAGS@,$GSF_SHARP_CFLAGS,;t t
++- s, at GSF_SHARP_LIBS@,$GSF_SHARP_LIBS,;t t
++- s, at ENABLE_GSF_SHARP_TRUE@,$ENABLE_GSF_SHARP_TRUE,;t t
++- s, at ENABLE_GSF_SHARP_FALSE@,$ENABLE_GSF_SHARP_FALSE,;t t
++- s, at LIBEXIF_CFLAGS@,$LIBEXIF_CFLAGS,;t t
++- s, at LIBEXIF_LIBS@,$LIBEXIF_LIBS,;t t
++- s, at LIBEXIF_API_CHECK_CFLAGS@,$LIBEXIF_API_CHECK_CFLAGS,;t t
++- s, at LIBEXIF_API_CHECK_LIBS@,$LIBEXIF_API_CHECK_LIBS,;t t
++- s, at LIBEXIF_VERSION_CHECK_CFLAGS@,$LIBEXIF_VERSION_CHECK_CFLAGS,;t t
++- s, at LIBEXIF_VERSION_CHECK_LIBS@,$LIBEXIF_VERSION_CHECK_LIBS,;t t
++- s, at EXIF_SOVERSION@,$EXIF_SOVERSION,;t t
++- s, at BEAGLED_CFLAGS@,$BEAGLED_CFLAGS,;t t
++- s, at BEAGLED_LIBS@,$BEAGLED_LIBS,;t t
++- s, at HTML_DIR@,$HTML_DIR,;t t
++- s, at ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
++- s, at ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t
++- s, at GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t
++- s, at GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t
++- s, at LIBBEAGLE_VERSION_INFO@,$LIBBEAGLE_VERSION_INFO,;t t
++- s, at LIBBEAGLE_CFLAGS@,$LIBBEAGLE_CFLAGS,;t t
++- s, at LIBBEAGLE_LIBS@,$LIBBEAGLE_LIBS,;t t
++- s, at ENABLE_LIBBEAGLE_TRUE@,$ENABLE_LIBBEAGLE_TRUE,;t t
++- s, at ENABLE_LIBBEAGLE_FALSE@,$ENABLE_LIBBEAGLE_FALSE,;t t
++- s, at ENABLE_BLUDGEON_TRUE@,$ENABLE_BLUDGEON_TRUE,;t t
++- s, at ENABLE_BLUDGEON_FALSE@,$ENABLE_BLUDGEON_FALSE,;t t
++- s, at EPIPHANY_REQUIRED@,$EPIPHANY_REQUIRED,;t t
++- s, at LIBXML_REQUIRED@,$LIBXML_REQUIRED,;t t
++- s, at LIBGLIB_REQUIRED@,$LIBGLIB_REQUIRED,;t t
++- s, at LIBGTK_REQUIRED@,$LIBGTK_REQUIRED,;t t
++- s, at EPIPHANY_DEPENDENCY_CFLAGS@,$EPIPHANY_DEPENDENCY_CFLAGS,;t t
++- s, at EPIPHANY_DEPENDENCY_LIBS@,$EPIPHANY_DEPENDENCY_LIBS,;t t
++- s, at EPIPHANY_EXTENSIONS_DIR@,$EPIPHANY_EXTENSIONS_DIR,;t t
++- s, at EPIPHANY_PREFIX@,$EPIPHANY_PREFIX,;t t
++- s, at ENABLE_EPIPHANY_EXTENSION_TRUE@,$ENABLE_EPIPHANY_EXTENSION_TRUE,;t t
++- s, at ENABLE_EPIPHANY_EXTENSION_FALSE@,$ENABLE_EPIPHANY_EXTENSION_FALSE,;t t
++- s, at INSTALL_EPIPHANY_EXTENSION_TRUE@,$INSTALL_EPIPHANY_EXTENSION_TRUE,;t t
++- s, at INSTALL_EPIPHANY_EXTENSION_FALSE@,$INSTALL_EPIPHANY_EXTENSION_FALSE,;t t
++- s, at GALAGO_CFLAGS@,$GALAGO_CFLAGS,;t t
++- s, at GALAGO_LIBS@,$GALAGO_LIBS,;t t
++- s, at ENABLE_GALAGO_TRUE@,$ENABLE_GALAGO_TRUE,;t t
++- s, at ENABLE_GALAGO_FALSE@,$ENABLE_GALAGO_FALSE,;t t
++- s, at GTK_BINARY_VERSION@,$GTK_BINARY_VERSION,;t t
++- s, at SYSTEMINFO_GLUE_CFLAGS@,$SYSTEMINFO_GLUE_CFLAGS,;t t
++- s, at SYSTEMINFO_GLUE_LIBS@,$SYSTEMINFO_GLUE_LIBS,;t t
++- s, at SYSTEMINFO_GLUE_X_LIBS@,$SYSTEMINFO_GLUE_X_LIBS,;t t
++- s, at WV1_CFLAGS@,$WV1_CFLAGS,;t t
++- s, at WV1_LIBS@,$WV1_LIBS,;t t
++- s, at ENABLE_WV1_TRUE@,$ENABLE_WV1_TRUE,;t t
++- s, at ENABLE_WV1_FALSE@,$ENABLE_WV1_FALSE,;t t
++- s, at KDE_CONFIG@,$KDE_CONFIG,;t t
++- s, at KDE_PREFIX@,$KDE_PREFIX,;t t
++- s, at ENABLE_WEBSERVICES_TRUE@,$ENABLE_WEBSERVICES_TRUE,;t t
++- s, at ENABLE_WEBSERVICES_FALSE@,$ENABLE_WEBSERVICES_FALSE,;t t
++- s, at GAC_PREFIX@,$GAC_PREFIX,;t t
++- s, at GNOME_PREFIX@,$GNOME_PREFIX,;t t
++- s, at HAS_LIBCHM_TRUE@,$HAS_LIBCHM_TRUE,;t t
++- s, at HAS_LIBCHM_FALSE@,$HAS_LIBCHM_FALSE,;t t
++- s, at BEAGLE_DEFINES@,$BEAGLE_DEFINES,;t t
++- s, at PYTHON@,$PYTHON,;t t
++- s, at PYTHON_VERSION@,$PYTHON_VERSION,;t t
++- s, at PYTHON_PREFIX@,$PYTHON_PREFIX,;t t
++- s, at PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t
++- s, at PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t
++- s, at pythondir@,$pythondir,;t t
++- s, at pkgpythondir@,$pkgpythondir,;t t
++- s, at pyexecdir@,$pyexecdir,;t t
++- s, at pkgpyexecdir@,$pkgpyexecdir,;t t
++- s, at PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t
++- s, at PYBEAGLE_CFLAGS@,$PYBEAGLE_CFLAGS,;t t
++- s, at PYBEAGLE_LIBS@,$PYBEAGLE_LIBS,;t t
++- s, at PYGTK_CODEGEN@,$PYGTK_CODEGEN,;t t
++- s, at ENABLE_PYTHON_TRUE@,$ENABLE_PYTHON_TRUE,;t t
++- s, at ENABLE_PYTHON_FALSE@,$ENABLE_PYTHON_FALSE,;t t
++- s, at PYGTK_DEFSDIR@,$PYGTK_DEFSDIR,;t t
++- s, at LIBOBJS@,$LIBOBJS,;t t
++- s, at LTLIBOBJS@,$LTLIBOBJS,;t t
++- CEOF
++  
++  _ACEOF
++  
++-   cat >>$CONFIG_STATUS <<\_ACEOF
++-   # Split the substitutions into bite-sized pieces for seds with
++-   # small command number limits, like on Digital OSF/1 and HP-UX.
++-   ac_max_sed_lines=48
++-   ac_sed_frag=1 # Number of current file.
++-   ac_beg=1 # First line for current file.
++-   ac_end=$ac_max_sed_lines # Line after last line for current file.
++-   ac_more_lines=:
++-   ac_sed_cmds=
++-   while $ac_more_lines; do
++-     if test $ac_beg -gt 1; then
++-       sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++-     else
++-       sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
++-     fi
++-     if test ! -s $tmp/subs.frag; then
++-       ac_more_lines=false
++-     else
++-       # The purpose of the label and of the branching condition is to
++-       # speed up the sed processing (if there are no `@' at all, there
++-       # is no need to browse any of the substitutions).
++-       # These are the two extra sed commands mentioned above.
++-       (echo ':t
++-   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
++-       if test -z "$ac_sed_cmds"; then
++- 	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
++-       else
++- 	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
++-       fi
++-       ac_sed_frag=`expr $ac_sed_frag + 1`
++-       ac_beg=$ac_end
++-       ac_end=`expr $ac_end + $ac_max_sed_lines`
++-     fi
++-   done
++-   if test -z "$ac_sed_cmds"; then
++-     ac_sed_cmds=cat
++    fi
++- fi # test -n "$CONFIG_FILES"
++  
++  _ACEOF
++  cat >>$CONFIG_STATUS <<\_ACEOF
++- for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
++-   # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
++-   case $ac_file in
++-   - | *:- | *:-:* ) # input from stdin
++- 	cat >$tmp/stdin
++- 	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++- 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++-   *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
++- 	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
++-   * )   ac_file_in=$ac_file.in ;;
++    esac
++  
++-   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
++-   ac_dir=`(dirname "$ac_file") 2>/dev/null ||
++  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$ac_file" : 'X\(//\)[^/]' \| \
++  	 X"$ac_file" : 'X\(//\)$' \| \
++- 	 X"$ac_file" : 'X\(/\)' \| \
++- 	 .     : '\(.\)' 2>/dev/null ||
++  echo X"$ac_file" |
++-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++-   	  /^X\(\/\/\)$/{ s//\1/; q; }
++-   	  /^X\(\/\).*/{ s//\1/; q; }
++-   	  s/.*/./; q'`
++-   { if $as_mkdir_p; then
++-     mkdir -p "$ac_dir"
++-   else
++-     as_dir="$ac_dir"
++      as_dirs=
++-     while test ! -d "$as_dir"; do
++-       as_dirs="$as_dir $as_dirs"
++-       as_dir=`(dirname "$as_dir") 2>/dev/null ||
++  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$as_dir" : 'X\(//\)[^/]' \| \
++  	 X"$as_dir" : 'X\(//\)$' \| \
++- 	 X"$as_dir" : 'X\(/\)' \| \
++- 	 .     : '\(.\)' 2>/dev/null ||
++  echo X"$as_dir" |
++-     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
++-   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
++-   	  /^X\(\/\/\)$/{ s//\1/; q; }
++-   	  /^X\(\/\).*/{ s//\1/; q; }
++-   	  s/.*/./; q'`
++      done
++-     test ! -n "$as_dirs" || mkdir $as_dirs
++-   fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
++- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
++     { (exit 1); exit 1; }; }; }
++- 
++    ac_builddir=.
++  
++- if test "$ac_dir" != .; then
++    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
++-   # A "../" for each directory in $ac_dir_suffix.
++-   ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
++- else
++-   ac_dir_suffix= ac_top_builddir=
++- fi
++  
++  case $srcdir in
++-   .)  # No --srcdir option.  We are building in place.
++      ac_srcdir=.
++-     if test -z "$ac_top_builddir"; then
++-        ac_top_srcdir=.
++-     else
++-        ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
++-     fi ;;
++-   [\\/]* | ?:[\\/]* )  # Absolute path.
++      ac_srcdir=$srcdir$ac_dir_suffix;
++-     ac_top_srcdir=$srcdir ;;
++-   *) # Relative path.
++-     ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
++-     ac_top_srcdir=$ac_top_builddir$srcdir ;;
++  esac
++  
++- # Do not use `cd foo && pwd` to compute absolute paths, because
++- # the directories may not exist.
++- case `pwd` in
++- .) ac_abs_builddir="$ac_dir";;
++- *)
++-   case "$ac_dir" in
++-   .) ac_abs_builddir=`pwd`;;
++-   [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
++-   *) ac_abs_builddir=`pwd`/"$ac_dir";;
++-   esac;;
++- esac
++- case $ac_abs_builddir in
++- .) ac_abs_top_builddir=${ac_top_builddir}.;;
++- *)
++-   case ${ac_top_builddir}. in
++-   .) ac_abs_top_builddir=$ac_abs_builddir;;
++-   [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
++-   *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
++-   esac;;
++- esac
++- case $ac_abs_builddir in
++- .) ac_abs_srcdir=$ac_srcdir;;
++- *)
++-   case $ac_srcdir in
++-   .) ac_abs_srcdir=$ac_abs_builddir;;
++-   [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
++-   *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
++-   esac;;
++- esac
++- case $ac_abs_builddir in
++- .) ac_abs_top_srcdir=$ac_top_srcdir;;
++- *)
++-   case $ac_top_srcdir in
++-   .) ac_abs_top_srcdir=$ac_abs_builddir;;
++-   [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
++-   *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
++-   esac;;
++- esac
++  
++  
++    case $INSTALL in
++    [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
++-   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
++    esac
++  
++-   if test x"$ac_file" != x-; then
++-     { echo "$as_me:$LINENO: creating $ac_file" >&5
++- echo "$as_me: creating $ac_file" >&6;}
++-     rm -f "$ac_file"
++-   fi
++-   # Let's still pretend it is `configure' which instantiates (i.e., don't
++-   # use $as_me), people would be surprised to read:
++-   #    /* config.h.  Generated by config.status.  */
++-   if test x"$ac_file" = x-; then
++-     configure_input=
++-   else
++-     configure_input="$ac_file.  "
++-   fi
++-   configure_input=$configure_input"Generated from `echo $ac_file_in |
++- 				     sed 's,.*/,,'` by configure."
++  
++-   # First look for the input files in the build tree, otherwise in the
++-   # src tree.
++-   ac_file_inputs=`IFS=:
++-     for f in $ac_file_in; do
++-       case $f in
++-       -) echo $tmp/stdin ;;
++-       [\\/$]*)
++- 	 # Absolute (can't be DOS-style, as IFS=:)
++- 	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++- echo "$as_me: error: cannot find input file: $f" >&2;}
++-    { (exit 1); exit 1; }; }
++- 	 echo "$f";;
++-       *) # Relative
++- 	 if test -f "$f"; then
++- 	   # Build tree
++- 	   echo "$f"
++- 	 elif test -f "$srcdir/$f"; then
++- 	   # Source tree
++- 	   echo "$srcdir/$f"
++- 	 else
++- 	   # /dev/null tree
++- 	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
++- echo "$as_me: error: cannot find input file: $f" >&2;}
++-    { (exit 1); exit 1; }; }
++- 	 fi;;
++-       esac
++-     done` || { (exit 1); exit 1; }
++  _ACEOF
++  cat >>$CONFIG_STATUS <<_ACEOF
++    sed "$ac_vpsub
++  $extrasub
++--- 29314,29988 ----
++  fi
++  
++  # Have a temporary directory for convenience.  Make it in the build tree
+++ # simply because there is no reason against having it here, and in addition,
++  # creating and moving files from /tmp can sometimes cause problems.
+++ # Hook for its removal unless debugging.
+++ # Note that there is a small window in which the directory will not be cleaned:
+++ # after its creation but before its name has been assigned to `$tmp'.
++  $debug ||
++  {
+++   tmp=
+++   trap 'exit_status=$?
+++   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+++ ' 0
++    trap '{ (exit 1); exit 1; }' 1 2 13 15
++  }
++  # Create a (secure) tmp directory for tmp files.
++  
++  {
+++   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
++    test -n "$tmp" && test -d "$tmp"
++  }  ||
++  {
+++   tmp=./conf$$-$RANDOM
+++   (umask 077 && mkdir "$tmp")
++  } ||
++  {
++     echo "$me: cannot create a temporary directory in ." >&2
++     { (exit 1); exit 1; }
++  }
++  
++  #
+++ # Set up the sed scripts for CONFIG_FILES section.
++  #
++  
++  # No need to generate the scripts if there are no CONFIG_FILES.
++  # This happens for instance when ./config.status config.h
+++ if test -n "$CONFIG_FILES"; then
++  
++  _ACEOF
++  
+++ 
+++ 
+++ ac_delim='%!_!# '
+++ for ac_last_try in false false false false false :; do
+++   cat >conf$$subs.sed <<_ACEOF
+++ SHELL!$SHELL$ac_delim
+++ PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
+++ PACKAGE_NAME!$PACKAGE_NAME$ac_delim
+++ PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
+++ PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
+++ PACKAGE_STRING!$PACKAGE_STRING$ac_delim
+++ PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
+++ exec_prefix!$exec_prefix$ac_delim
+++ prefix!$prefix$ac_delim
+++ program_transform_name!$program_transform_name$ac_delim
+++ bindir!$bindir$ac_delim
+++ sbindir!$sbindir$ac_delim
+++ libexecdir!$libexecdir$ac_delim
+++ datarootdir!$datarootdir$ac_delim
+++ datadir!$datadir$ac_delim
+++ sysconfdir!$sysconfdir$ac_delim
+++ sharedstatedir!$sharedstatedir$ac_delim
+++ localstatedir!$localstatedir$ac_delim
+++ includedir!$includedir$ac_delim
+++ oldincludedir!$oldincludedir$ac_delim
+++ docdir!$docdir$ac_delim
+++ infodir!$infodir$ac_delim
+++ htmldir!$htmldir$ac_delim
+++ dvidir!$dvidir$ac_delim
+++ pdfdir!$pdfdir$ac_delim
+++ psdir!$psdir$ac_delim
+++ libdir!$libdir$ac_delim
+++ localedir!$localedir$ac_delim
+++ mandir!$mandir$ac_delim
+++ DEFS!$DEFS$ac_delim
+++ ECHO_C!$ECHO_C$ac_delim
+++ ECHO_N!$ECHO_N$ac_delim
+++ ECHO_T!$ECHO_T$ac_delim
+++ LIBS!$LIBS$ac_delim
+++ build_alias!$build_alias$ac_delim
+++ host_alias!$host_alias$ac_delim
+++ target_alias!$target_alias$ac_delim
+++ build!$build$ac_delim
+++ build_cpu!$build_cpu$ac_delim
+++ build_vendor!$build_vendor$ac_delim
+++ build_os!$build_os$ac_delim
+++ host!$host$ac_delim
+++ host_cpu!$host_cpu$ac_delim
+++ host_vendor!$host_vendor$ac_delim
+++ host_os!$host_os$ac_delim
+++ target!$target$ac_delim
+++ target_cpu!$target_cpu$ac_delim
+++ target_vendor!$target_vendor$ac_delim
+++ target_os!$target_os$ac_delim
+++ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
+++ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
+++ INSTALL_DATA!$INSTALL_DATA$ac_delim
+++ CYGPATH_W!$CYGPATH_W$ac_delim
+++ PACKAGE!$PACKAGE$ac_delim
+++ VERSION!$VERSION$ac_delim
+++ ACLOCAL!$ACLOCAL$ac_delim
+++ AUTOCONF!$AUTOCONF$ac_delim
+++ AUTOMAKE!$AUTOMAKE$ac_delim
+++ AUTOHEADER!$AUTOHEADER$ac_delim
+++ MAKEINFO!$MAKEINFO$ac_delim
+++ install_sh!$install_sh$ac_delim
+++ STRIP!$STRIP$ac_delim
+++ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
+++ mkdir_p!$mkdir_p$ac_delim
+++ AWK!$AWK$ac_delim
+++ SET_MAKE!$SET_MAKE$ac_delim
+++ am__leading_dot!$am__leading_dot$ac_delim
+++ AMTAR!$AMTAR$ac_delim
+++ am__tar!$am__tar$ac_delim
+++ am__untar!$am__untar$ac_delim
+++ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
+++ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
+++ MAINT!$MAINT$ac_delim
+++ CC!$CC$ac_delim
+++ CFLAGS!$CFLAGS$ac_delim
+++ LDFLAGS!$LDFLAGS$ac_delim
+++ CPPFLAGS!$CPPFLAGS$ac_delim
+++ ac_ct_CC!$ac_ct_CC$ac_delim
+++ EXEEXT!$EXEEXT$ac_delim
+++ OBJEXT!$OBJEXT$ac_delim
+++ DEPDIR!$DEPDIR$ac_delim
+++ am__include!$am__include$ac_delim
+++ am__quote!$am__quote$ac_delim
+++ AMDEP_TRUE!$AMDEP_TRUE$ac_delim
+++ AMDEP_FALSE!$AMDEP_FALSE$ac_delim
+++ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
+++ CCDEPMODE!$CCDEPMODE$ac_delim
+++ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
+++ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+++ GREP!$GREP$ac_delim
+++ EGREP!$EGREP$ac_delim
+++ LN_S!$LN_S$ac_delim
+++ ECHO!$ECHO$ac_delim
+++ AR!$AR$ac_delim
+++ RANLIB!$RANLIB$ac_delim
+++ CPP!$CPP$ac_delim
+++ CXX!$CXX$ac_delim
+++ _ACEOF
+++ 
+++   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+++     break
+++   elif $ac_last_try; then
+++     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+++    { (exit 1); exit 1; }; }
+++   else
+++     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
++    fi
+++ done
+++ 
+++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+++ if test -n "$ac_eof"; then
+++   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+++   ac_eof=`expr $ac_eof + 1`
+++ fi
+++ 
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
+++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+++ _ACEOF
+++ sed '
+++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+++ s/^/s,@/; s/!/@,|#_!!_#|/
+++ :n
+++ t n
+++ s/'"$ac_delim"'$/,g/; t
+++ s/$/\\/; p
+++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+++ ' >>$CONFIG_STATUS <conf$$subs.sed
+++ rm -f conf$$subs.sed
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ CEOF$ac_eof
+++ _ACEOF
+++ 
+++ 
+++ ac_delim='%!_!# '
+++ for ac_last_try in false false false false false :; do
+++   cat >conf$$subs.sed <<_ACEOF
+++ CXXFLAGS!$CXXFLAGS$ac_delim
+++ ac_ct_CXX!$ac_ct_CXX$ac_delim
+++ CXXDEPMODE!$CXXDEPMODE$ac_delim
+++ am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
+++ am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
+++ CXXCPP!$CXXCPP$ac_delim
+++ F77!$F77$ac_delim
+++ FFLAGS!$FFLAGS$ac_delim
+++ ac_ct_F77!$ac_ct_F77$ac_delim
+++ LIBTOOL!$LIBTOOL$ac_delim
+++ PKG_CONFIG!$PKG_CONFIG$ac_delim
+++ BASH!$BASH$ac_delim
+++ ZIP!$ZIP$ac_delim
+++ MONO!$MONO$ac_delim
+++ MCS!$MCS$ac_delim
+++ MONO_CFLAGS!$MONO_CFLAGS$ac_delim
+++ MONO_LIBS!$MONO_LIBS$ac_delim
+++ SHARPZIPLIB_LIBS!$SHARPZIPLIB_LIBS$ac_delim
+++ OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim
+++ OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim
+++ OS_FREEBSD_TRUE!$OS_FREEBSD_TRUE$ac_delim
+++ OS_FREEBSD_FALSE!$OS_FREEBSD_FALSE$ac_delim
+++ DESKTOP_LAUNCH!$DESKTOP_LAUNCH$ac_delim
+++ ENABLE_DESKTOP_LAUNCH_TRUE!$ENABLE_DESKTOP_LAUNCH_TRUE$ac_delim
+++ ENABLE_DESKTOP_LAUNCH_FALSE!$ENABLE_DESKTOP_LAUNCH_FALSE$ac_delim
+++ WSDL!$WSDL$ac_delim
+++ ENABLE_GOOGLEDRIVER_TRUE!$ENABLE_GOOGLEDRIVER_TRUE$ac_delim
+++ ENABLE_GOOGLEDRIVER_FALSE!$ENABLE_GOOGLEDRIVER_FALSE$ac_delim
+++ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
+++ INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
+++ INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
+++ INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
+++ INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
+++ INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
+++ INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
+++ INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
+++ INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
+++ INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
+++ INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
+++ INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
+++ INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
+++ INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
+++ INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
+++ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
+++ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
+++ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
+++ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
+++ INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
+++ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
+++ INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
+++ INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
+++ INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
+++ INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
+++ INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
+++ ALL_LINGUAS!$ALL_LINGUAS$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
+++ DATADIRNAME!$DATADIRNAME$ac_delim
+++ GMOFILES!$GMOFILES$ac_delim
+++ INSTOBJEXT!$INSTOBJEXT$ac_delim
+++ INTLLIBS!$INTLLIBS$ac_delim
+++ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
+++ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
+++ POFILES!$POFILES$ac_delim
+++ POSUB!$POSUB$ac_delim
+++ MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
+++ SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
+++ SQLITE_LIBS!$SQLITE_LIBS$ac_delim
+++ SQLITE3_CFLAGS!$SQLITE3_CFLAGS$ac_delim
+++ SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
+++ SQLITE_MAJ_VER!$SQLITE_MAJ_VER$ac_delim
+++ XMKMF!$XMKMF$ac_delim
+++ X_CFLAGS!$X_CFLAGS$ac_delim
+++ X_PRE_LIBS!$X_PRE_LIBS$ac_delim
+++ X_LIBS!$X_LIBS$ac_delim
+++ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
+++ HAS_LIBXSS_TRUE!$HAS_LIBXSS_TRUE$ac_delim
+++ HAS_LIBXSS_FALSE!$HAS_LIBXSS_FALSE$ac_delim
+++ ENABLE_GUI_TRUE!$ENABLE_GUI_TRUE$ac_delim
+++ ENABLE_GUI_FALSE!$ENABLE_GUI_FALSE$ac_delim
+++ GNOME_VFS_CFLAGS!$GNOME_VFS_CFLAGS$ac_delim
+++ GNOME_VFS_LIBS!$GNOME_VFS_LIBS$ac_delim
+++ BEAGLE_UI_CFLAGS!$BEAGLE_UI_CFLAGS$ac_delim
+++ BEAGLE_UI_LIBS!$BEAGLE_UI_LIBS$ac_delim
+++ UIGLUE_CFLAGS!$UIGLUE_CFLAGS$ac_delim
+++ UIGLUE_LIBS!$UIGLUE_LIBS$ac_delim
+++ LIBTRAYICON_CFLAGS!$LIBTRAYICON_CFLAGS$ac_delim
+++ LIBTRAYICON_LIBS!$LIBTRAYICON_LIBS$ac_delim
+++ OPEN_WITH_CFLAGS!$OPEN_WITH_CFLAGS$ac_delim
+++ OPEN_WITH_LIBS!$OPEN_WITH_LIBS$ac_delim
+++ ENABLE_OPEN_WITH_TRUE!$ENABLE_OPEN_WITH_TRUE$ac_delim
+++ ENABLE_OPEN_WITH_FALSE!$ENABLE_OPEN_WITH_FALSE$ac_delim
+++ _ACEOF
+++ 
+++   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+++     break
+++   elif $ac_last_try; then
+++     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+++    { (exit 1); exit 1; }; }
+++   else
+++     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+++   fi
+++ done
+++ 
+++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+++ if test -n "$ac_eof"; then
+++   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+++   ac_eof=`expr $ac_eof + 1`
+++ fi
+++ 
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
+++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+++ _ACEOF
+++ sed '
+++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+++ s/^/s,@/; s/!/@,|#_!!_#|/
+++ :n
+++ t n
+++ s/'"$ac_delim"'$/,g/; t
+++ s/$/\\/; p
+++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+++ ' >>$CONFIG_STATUS <conf$$subs.sed
+++ rm -f conf$$subs.sed
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ CEOF$ac_eof
+++ _ACEOF
+++ 
+++ 
+++ ac_delim='%!_!# '
+++ for ac_last_try in false false false false false :; do
+++   cat >conf$$subs.sed <<_ACEOF
+++ EVO_LIBDIR!$EVO_LIBDIR$ac_delim
+++ EVO_CFLAGS!$EVO_CFLAGS$ac_delim
+++ EVO_LIBS!$EVO_LIBS$ac_delim
+++ ENABLE_EVOLUTION_TRUE!$ENABLE_EVOLUTION_TRUE$ac_delim
+++ ENABLE_EVOLUTION_FALSE!$ENABLE_EVOLUTION_FALSE$ac_delim
+++ USE_LOCAL_SQLITE_TRUE!$USE_LOCAL_SQLITE_TRUE$ac_delim
+++ USE_LOCAL_SQLITE_FALSE!$USE_LOCAL_SQLITE_FALSE$ac_delim
+++ ENABLE_INOTIFY_TRUE!$ENABLE_INOTIFY_TRUE$ac_delim
+++ ENABLE_INOTIFY_FALSE!$ENABLE_INOTIFY_FALSE$ac_delim
+++ GSF_SHARP_CFLAGS!$GSF_SHARP_CFLAGS$ac_delim
+++ GSF_SHARP_LIBS!$GSF_SHARP_LIBS$ac_delim
+++ ENABLE_GSF_SHARP_TRUE!$ENABLE_GSF_SHARP_TRUE$ac_delim
+++ ENABLE_GSF_SHARP_FALSE!$ENABLE_GSF_SHARP_FALSE$ac_delim
+++ LIBEXIF_CFLAGS!$LIBEXIF_CFLAGS$ac_delim
+++ LIBEXIF_LIBS!$LIBEXIF_LIBS$ac_delim
+++ LIBEXIF_API_CHECK_CFLAGS!$LIBEXIF_API_CHECK_CFLAGS$ac_delim
+++ LIBEXIF_API_CHECK_LIBS!$LIBEXIF_API_CHECK_LIBS$ac_delim
+++ LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
+++ LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
+++ EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
+++ BEAGLED_CFLAGS!$BEAGLED_CFLAGS$ac_delim
+++ BEAGLED_LIBS!$BEAGLED_LIBS$ac_delim
+++ HTML_DIR!$HTML_DIR$ac_delim
+++ ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
+++ ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
+++ GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
+++ GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
+++ LIBBEAGLE_VERSION_INFO!$LIBBEAGLE_VERSION_INFO$ac_delim
+++ LIBBEAGLE_CFLAGS!$LIBBEAGLE_CFLAGS$ac_delim
+++ LIBBEAGLE_LIBS!$LIBBEAGLE_LIBS$ac_delim
+++ ENABLE_LIBBEAGLE_TRUE!$ENABLE_LIBBEAGLE_TRUE$ac_delim
+++ ENABLE_LIBBEAGLE_FALSE!$ENABLE_LIBBEAGLE_FALSE$ac_delim
+++ ENABLE_BLUDGEON_TRUE!$ENABLE_BLUDGEON_TRUE$ac_delim
+++ ENABLE_BLUDGEON_FALSE!$ENABLE_BLUDGEON_FALSE$ac_delim
+++ EPIPHANY_REQUIRED!$EPIPHANY_REQUIRED$ac_delim
+++ LIBXML_REQUIRED!$LIBXML_REQUIRED$ac_delim
+++ LIBGLIB_REQUIRED!$LIBGLIB_REQUIRED$ac_delim
+++ LIBGTK_REQUIRED!$LIBGTK_REQUIRED$ac_delim
+++ EPIPHANY_DEPENDENCY_CFLAGS!$EPIPHANY_DEPENDENCY_CFLAGS$ac_delim
+++ EPIPHANY_DEPENDENCY_LIBS!$EPIPHANY_DEPENDENCY_LIBS$ac_delim
+++ EPIPHANY_EXTENSIONS_DIR!$EPIPHANY_EXTENSIONS_DIR$ac_delim
+++ EPIPHANY_PREFIX!$EPIPHANY_PREFIX$ac_delim
+++ ENABLE_EPIPHANY_EXTENSION_TRUE!$ENABLE_EPIPHANY_EXTENSION_TRUE$ac_delim
+++ ENABLE_EPIPHANY_EXTENSION_FALSE!$ENABLE_EPIPHANY_EXTENSION_FALSE$ac_delim
+++ INSTALL_EPIPHANY_EXTENSION_TRUE!$INSTALL_EPIPHANY_EXTENSION_TRUE$ac_delim
+++ INSTALL_EPIPHANY_EXTENSION_FALSE!$INSTALL_EPIPHANY_EXTENSION_FALSE$ac_delim
+++ GALAGO_CFLAGS!$GALAGO_CFLAGS$ac_delim
+++ GALAGO_LIBS!$GALAGO_LIBS$ac_delim
+++ ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
+++ ENABLE_GALAGO_FALSE!$ENABLE_GALAGO_FALSE$ac_delim
+++ GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim
+++ SYSTEMINFO_GLUE_CFLAGS!$SYSTEMINFO_GLUE_CFLAGS$ac_delim
+++ SYSTEMINFO_GLUE_LIBS!$SYSTEMINFO_GLUE_LIBS$ac_delim
+++ SYSTEMINFO_GLUE_X_LIBS!$SYSTEMINFO_GLUE_X_LIBS$ac_delim
+++ WV1_CFLAGS!$WV1_CFLAGS$ac_delim
+++ WV1_LIBS!$WV1_LIBS$ac_delim
+++ ENABLE_WV1_TRUE!$ENABLE_WV1_TRUE$ac_delim
+++ ENABLE_WV1_FALSE!$ENABLE_WV1_FALSE$ac_delim
+++ KDE_CONFIG!$KDE_CONFIG$ac_delim
+++ KDE_PREFIX!$KDE_PREFIX$ac_delim
+++ ENABLE_WEBSERVICES_TRUE!$ENABLE_WEBSERVICES_TRUE$ac_delim
+++ ENABLE_WEBSERVICES_FALSE!$ENABLE_WEBSERVICES_FALSE$ac_delim
+++ GAC_PREFIX!$GAC_PREFIX$ac_delim
+++ GNOME_PREFIX!$GNOME_PREFIX$ac_delim
+++ HAS_LIBCHM_TRUE!$HAS_LIBCHM_TRUE$ac_delim
+++ HAS_LIBCHM_FALSE!$HAS_LIBCHM_FALSE$ac_delim
+++ BEAGLE_DEFINES!$BEAGLE_DEFINES$ac_delim
+++ PYTHON!$PYTHON$ac_delim
+++ PYTHON_VERSION!$PYTHON_VERSION$ac_delim
+++ PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
+++ PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
+++ PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
+++ pythondir!$pythondir$ac_delim
+++ pkgpythondir!$pkgpythondir$ac_delim
+++ pyexecdir!$pyexecdir$ac_delim
+++ pkgpyexecdir!$pkgpyexecdir$ac_delim
+++ PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
+++ PYBEAGLE_CFLAGS!$PYBEAGLE_CFLAGS$ac_delim
+++ PYBEAGLE_LIBS!$PYBEAGLE_LIBS$ac_delim
+++ PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim
+++ ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
+++ ENABLE_PYTHON_FALSE!$ENABLE_PYTHON_FALSE$ac_delim
+++ PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
+++ LIBOBJS!$LIBOBJS$ac_delim
+++ LTLIBOBJS!$LTLIBOBJS$ac_delim
+++ _ACEOF
+++ 
+++   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+++     break
+++   elif $ac_last_try; then
+++     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+++    { (exit 1); exit 1; }; }
+++   else
+++     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+++   fi
+++ done
++  
+++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
+++ if test -n "$ac_eof"; then
+++   ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
+++   ac_eof=`expr $ac_eof + 1`
+++ fi
+++ 
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
++  _ACEOF
+++ sed '
+++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+++ s/^/s,@/; s/!/@,|#_!!_#|/
+++ :n
+++ t n
+++ s/'"$ac_delim"'$/,g/; t
+++ s/$/\\/; p
+++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
+++ ' >>$CONFIG_STATUS <conf$$subs.sed
+++ rm -f conf$$subs.sed
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++ :end
+++ s/|#_!!_#|//g
+++ CEOF$ac_eof
+++ _ACEOF
+++ 
+++ 
+++ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+++ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
+++ # trailing colons and then remove the whole line if VPATH becomes empty
+++ # (actually we leave an empty line to preserve line numbers).
+++ if test "x$srcdir" = x.; then
+++   ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+++ s/:*\$(srcdir):*/:/
+++ s/:*\${srcdir}:*/:/
+++ s/:*@srcdir@:*/:/
+++ s/^\([^=]*=[	 ]*\):*/\1/
+++ s/:*$//
+++ s/^[^=]*=[	 ]*$//
+++ }'
+++ fi
+++ 
++  cat >>$CONFIG_STATUS <<\_ACEOF
+++ fi # test -n "$CONFIG_FILES"
+++ 
+++ 
+++ for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
+++ do
+++   case $ac_tag in
+++   :[FHLC]) ac_mode=$ac_tag; continue;;
+++   esac
+++   case $ac_mode$ac_tag in
+++   :[FHL]*:*);;
+++   :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
+++ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+++    { (exit 1); exit 1; }; };;
+++   :[FH]-) ac_tag=-:-;;
+++   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
++    esac
+++   ac_save_IFS=$IFS
+++   IFS=:
+++   set x $ac_tag
+++   IFS=$ac_save_IFS
+++   shift
+++   ac_file=$1
+++   shift
++  
+++   case $ac_mode in
+++   :L) ac_source=$1;;
+++   :[FH])
+++     ac_file_inputs=
+++     for ac_f
+++     do
+++       case $ac_f in
+++       -) ac_f="$tmp/stdin";;
+++       *) # Look for the file first in the build tree, then in the source tree
+++ 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+++ 	 # because $ac_f cannot contain `:'.
+++ 	 test -f "$ac_f" ||
+++ 	   case $ac_f in
+++ 	   [\\/$]*) false;;
+++ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+++ 	   esac ||
+++ 	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+++ echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+++    { (exit 1); exit 1; }; };;
+++       esac
+++       ac_file_inputs="$ac_file_inputs $ac_f"
+++     done
+++ 
+++     # Let's still pretend it is `configure' which instantiates (i.e., don't
+++     # use $as_me), people would be surprised to read:
+++     #    /* config.h.  Generated by config.status.  */
+++     configure_input="Generated from "`IFS=:
+++ 	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+++     if test x"$ac_file" != x-; then
+++       configure_input="$ac_file.  $configure_input"
+++       { echo "$as_me:$LINENO: creating $ac_file" >&5
+++ echo "$as_me: creating $ac_file" >&6;}
+++     fi
+++ 
+++     case $ac_tag in
+++     *:-:* | *:-) cat >"$tmp/stdin";;
+++     esac
+++     ;;
+++   esac
+++ 
+++   ac_dir=`$as_dirname -- "$ac_file" ||
++  $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$ac_file" : 'X\(//\)[^/]' \| \
++  	 X"$ac_file" : 'X\(//\)$' \| \
+++ 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
++  echo X"$ac_file" |
+++     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)[^/].*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\).*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  s/.*/./; q'`
+++   { as_dir="$ac_dir"
+++   case $as_dir in #(
+++   -*) as_dir=./$as_dir;;
+++   esac
+++   test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
++      as_dirs=
+++     while :; do
+++       case $as_dir in #(
+++       *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+++       *) as_qdir=$as_dir;;
+++       esac
+++       as_dirs="'$as_qdir' $as_dirs"
+++       as_dir=`$as_dirname -- "$as_dir" ||
++  $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
++  	 X"$as_dir" : 'X\(//\)[^/]' \| \
++  	 X"$as_dir" : 'X\(//\)$' \| \
+++ 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
++  echo X"$as_dir" |
+++     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)[^/].*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\/\)$/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  /^X\(\/\).*/{
+++ 	    s//\1/
+++ 	    q
+++ 	  }
+++ 	  s/.*/./; q'`
+++       test -d "$as_dir" && break
++      done
+++     test -z "$as_dirs" || eval "mkdir $as_dirs"
+++   } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+++ echo "$as_me: error: cannot create directory $as_dir" >&2;}
++     { (exit 1); exit 1; }; }; }
++    ac_builddir=.
++  
+++ case "$ac_dir" in
+++ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+++ *)
++    ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+++   # A ".." for each directory in $ac_dir_suffix.
+++   ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+++   case $ac_top_builddir_sub in
+++   "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+++   *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+++   esac ;;
+++ esac
+++ ac_abs_top_builddir=$ac_pwd
+++ ac_abs_builddir=$ac_pwd$ac_dir_suffix
+++ # for backward compatibility:
+++ ac_top_builddir=$ac_top_build_prefix
++  
++  case $srcdir in
+++   .)  # We are building in place.
++      ac_srcdir=.
+++     ac_top_srcdir=$ac_top_builddir_sub
+++     ac_abs_top_srcdir=$ac_pwd ;;
+++   [\\/]* | ?:[\\/]* )  # Absolute name.
++      ac_srcdir=$srcdir$ac_dir_suffix;
+++     ac_top_srcdir=$srcdir
+++     ac_abs_top_srcdir=$srcdir ;;
+++   *) # Relative name.
+++     ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+++     ac_top_srcdir=$ac_top_build_prefix$srcdir
+++     ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
++  esac
+++ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
++  
++  
+++   case $ac_mode in
+++   :F)
+++   #
+++   # CONFIG_FILE
+++   #
++  
++    case $INSTALL in
++    [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+++   *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
++    esac
+++ _ACEOF
++  
+++ cat >>$CONFIG_STATUS <<\_ACEOF
+++ # If the template does not know about datarootdir, expand it.
+++ # FIXME: This hack should be removed a few years after 2.60.
+++ ac_datarootdir_hack=; ac_datarootdir_seen=
++  
+++ case `sed -n '/datarootdir/ {
+++   p
+++   q
+++ }
+++ /@datadir@/p
+++ /@docdir@/p
+++ /@infodir@/p
+++ /@localedir@/p
+++ /@mandir@/p
+++ ' $ac_file_inputs` in
+++ *datarootdir*) ac_datarootdir_seen=yes;;
+++ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+++   { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+++ echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+++ _ACEOF
+++ cat >>$CONFIG_STATUS <<_ACEOF
+++   ac_datarootdir_hack='
+++   s&@datadir@&$datadir&g
+++   s&@docdir@&$docdir&g
+++   s&@infodir@&$infodir&g
+++   s&@localedir@&$localedir&g
+++   s&@mandir@&$mandir&g
+++     s&\\\${datarootdir}&$datarootdir&g' ;;
+++ esac
++  _ACEOF
+++ 
+++ # Neutralize VPATH when `$srcdir' = `.'.
+++ # Shell code in configure.ac might set extrasub.
+++ # FIXME: do we really want to maintain this feature?
++  cat >>$CONFIG_STATUS <<_ACEOF
++    sed "$ac_vpsub
++  $extrasub
+diff -urNad beagle-0.2.8~/ltmain.sh beagle-0.2.8/ltmain.sh
+--- beagle-0.2.8~/ltmain.sh	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.8/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh

Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules	2006-08-23 23:35:24 UTC (rev 2682)
+++ beagle/trunk/debian/rules	2006-08-26 10:45:02 UTC (rev 2683)
@@ -73,6 +73,10 @@
 
 	find debian/beagle debian/python-beagle -name '*.a' -delete
 	find debian/beagle debian/python-beagle debian/beagle-dev -name '*.la' -delete
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+		find debian/ -type f -name "*.mdb" -delete
+endif
+
 #	Don't remove .so links until we discover how to map to .so.0 files.
 #	find . -name '*.so' -exec rm -f {} \;
 	cp mozilla-extension/beagle.xpi $(CURDIR)/debian/beagle/usr/share/doc/beagle/mozilla-extension




More information about the Pkg-mono-svn-commits mailing list