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

Jose Carlos Garcia Sogo jsogo at costa.debian.org
Sun Oct 22 11:27:57 UTC 2006


Author: jsogo
Date: 2006-10-22 11:27:55 +0000 (Sun, 22 Oct 2006)
New Revision: 2819

Modified:
   beagle/trunk/debian/changelog
   beagle/trunk/debian/control
   beagle/trunk/debian/patches/beagle-settings.dpatch
   beagle/trunk/debian/patches/relibtoolize.dpatch
Log:
beagle (0.2.11-1)
 + New upstream version
 + Sync overrides and control files
 + ADdd XS-X-Vcs-Svn field
 + Update patches


Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog	2006-10-19 07:05:51 UTC (rev 2818)
+++ beagle/trunk/debian/changelog	2006-10-22 11:27:55 UTC (rev 2819)
@@ -1,3 +1,12 @@
+beagle (0.2.11-1) unstable; urgency=low
+
+  * New upstream release.
+  * Synced control file and ftp-master overrides.
+  * Added XS-X-Vcs-Svn field to control file.
+  * debian/patches: beagle-settings, relibtoolize: updated.
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org>  Sun, 22 Oct 2006 12:56:16 +0200
+
 beagle (0.2.10-2) unstable; urgency=low
 
   * Make system indexes in /var/cache/beagle world readable whatever

Modified: beagle/trunk/debian/control
===================================================================
--- beagle/trunk/debian/control	2006-10-19 07:05:51 UTC (rev 2818)
+++ beagle/trunk/debian/control	2006-10-22 11:27:55 UTC (rev 2819)
@@ -5,6 +5,7 @@
 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, 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), libgalago1.0-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
+XS-X-Vcs-Svn: svn://svn.debian.org/svn/pkg-mono/beagle/trunk
 
 Package: beagle
 Architecture: any
@@ -30,7 +31,7 @@
 
 Package: libbeagle0
 Architecture: any
-Section: libs
+Section: gnome
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Replaces: beagle (<< 0.2.0-1)
 Description: library for accessing beagle using C
@@ -55,7 +56,7 @@
 
 Package: beagle-dev
 Architecture: any
-Section: devel
+Section: gnome
 Depends: beagle (>= ${source:Version}), beagle (<< ${source:Version}.1~)
 Description: library for accessing beagle (C# development files)
  This library allow programmers accessing Beagle daemon and performing searches,

Modified: beagle/trunk/debian/patches/beagle-settings.dpatch
===================================================================
--- beagle/trunk/debian/patches/beagle-settings.dpatch	2006-10-19 07:05:51 UTC (rev 2818)
+++ beagle/trunk/debian/patches/beagle-settings.dpatch	2006-10-22 11:27:55 UTC (rev 2819)
@@ -5,13 +5,16 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad beagle-0.2.1~/tools/beagle-settings.desktop.in beagle-0.2.1/tools/beagle-settings.desktop.in
---- beagle-0.2.1~/tools/beagle-settings.desktop.in	2005-11-04 21:22:25.000000000 +0100
-+++ beagle-0.2.1/tools/beagle-settings.desktop.in	2006-02-05 12:33:30.000000000 +0100
-@@ -7,4 +7,5 @@
+diff -urNad beagle-0.2.11~/tools/beagle-settings.desktop.in beagle-0.2.11/tools/beagle-settings.desktop.in
+--- beagle-0.2.11~/tools/beagle-settings.desktop.in	2006-10-18 18:57:32.000000000 +0200
++++ beagle-0.2.11/tools/beagle-settings.desktop.in	2006-10-22 12:40:59.000000000 +0200
+@@ -7,7 +7,8 @@
  Exec=beagle-settings
  Icon=gnome-searchtool
  Type=Application
 -Categories=Application;Settings;AdvancedSettings;Utility;Filesystem;X-Ximian-Settings;
 +StartupNotify=true
 +Categories=Application;Settings;AdvancedSettings;Filesystem;X-Ximian-Settings;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=beagle
+ X-GNOME-Bugzilla-Component=General

Modified: beagle/trunk/debian/patches/relibtoolize.dpatch
===================================================================
--- beagle/trunk/debian/patches/relibtoolize.dpatch	2006-10-19 07:05:51 UTC (rev 2818)
+++ beagle/trunk/debian/patches/relibtoolize.dpatch	2006-10-22 11:27:55 UTC (rev 2819)
@@ -5,9 +5,9 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad beagle-0.2.10~/aclocal.m4 beagle-0.2.10/aclocal.m4
---- beagle-0.2.10~/aclocal.m4	2006-09-19 00:40:18.000000000 +0200
-+++ beagle-0.2.10/aclocal.m4	2006-09-24 13:03:16.000000000 +0200
+diff -urNad beagle-0.2.11~/aclocal.m4 beagle-0.2.11/aclocal.m4
+--- beagle-0.2.11~/aclocal.m4	2006-10-18 18:57:02.000000000 +0200
++++ beagle-0.2.11/aclocal.m4	2006-10-22 12:52:36.000000000 +0200
 @@ -11,6 +11,405 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
@@ -1018,9 +1018,9 @@
 -])dnl
 -
  m4_include([acinclude.m4])
-diff -urNad beagle-0.2.10~/config.guess beagle-0.2.10/config.guess
---- beagle-0.2.10~/config.guess	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.10/config.guess	2006-08-10 17:17:12.000000000 +0200
+diff -urNad beagle-0.2.11~/config.guess beagle-0.2.11/config.guess
+--- beagle-0.2.11~/config.guess	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.11/config.guess	2006-10-12 14:52:19.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
@@ -1302,9 +1302,9 @@
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad beagle-0.2.10~/config.sub beagle-0.2.10/config.sub
---- beagle-0.2.10~/config.sub	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.10/config.sub	2006-08-10 17:17:12.000000000 +0200
+diff -urNad beagle-0.2.11~/config.sub beagle-0.2.11/config.sub
+--- beagle-0.2.11~/config.sub	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.11/config.sub	2006-10-12 14:52:19.000000000 +0200
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
@@ -1314,7 +1314,7 @@
 +#   Inc.
  
 -timestamp='2005-07-08'
-+timestamp='2006-07-02'
++timestamp='2006-09-20'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
@@ -1371,7 +1371,7 @@
  	| mips | mipsbe | mipseb | mipsel | mipsle \
  	| mips16 \
  	| mips64 | mips64el \
-@@ -257,18 +268,19 @@
+@@ -257,28 +268,27 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -1385,6 +1385,7 @@
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
 -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| score \
 +	| 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 \
@@ -1396,7 +1397,8 @@
  	| tahoe | thumb | tic4x | tic80 | tron \
  	| v850 | v850e \
  	| we32k \
-@@ -276,9 +288,6 @@
+-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
++	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
  	| z8k)
  		basic_machine=$basic_machine-unknown
  		;;
@@ -1406,7 +1408,7 @@
  	m6811 | m68hc11 | m6812 | m68hc12)
  		# Motorola 68HC11/12.
  		basic_machine=$basic_machine-unknown
-@@ -286,6 +295,9 @@
+@@ -286,6 +296,9 @@
  		;;
  	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
  		;;
@@ -1416,7 +1418,7 @@
  
  	# We use `pc' rather than `unknown'
  	# because (1) that's what they normally are, and
-@@ -305,7 +317,7 @@
+@@ -305,7 +318,7 @@
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
@@ -1425,7 +1427,7 @@
  	| bfin-* | bs2000-* \
  	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
  	| clipper-* | craynv-* | cydra-* \
-@@ -316,7 +328,7 @@
+@@ -316,7 +329,7 @@
  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
  	| i*86-* | i860-* | i960-* | ia64-* \
  	| ip2k-* | iq2000-* \
@@ -1434,7 +1436,7 @@
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
  	| m88110-* | m88k-* | maxq-* | mcore-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-@@ -336,19 +348,20 @@
+@@ -336,31 +349,30 @@
  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
  	| mipstx39-* | mipstx39el-* \
  	| mmix-* \
@@ -1459,7 +1461,11 @@
  	| tahoe-* | thumb-* \
  	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
  	| tron-* \
-@@ -359,8 +372,6 @@
+ 	| v850-* | v850e-* | vax-* \
+ 	| we32k-* \
+-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
++	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ 	| xstormy16-* | xtensa-* \
  	| ymp-* \
  	| z8k-*)
  		;;
@@ -1468,7 +1474,7 @@
  	# 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 @@
+@@ -696,6 +708,9 @@
  		basic_machine=i386-pc
  		os=-msdos
  		;;
@@ -1478,7 +1484,7 @@
  	mvs)
  		basic_machine=i370-ibm
  		os=-mvs
-@@ -803,6 +817,12 @@
+@@ -803,6 +818,12 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -1491,7 +1497,7 @@
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -859,6 +879,10 @@
+@@ -859,6 +880,10 @@
  		basic_machine=i586-unknown
  		os=-pw32
  		;;
@@ -1502,7 +1508,18 @@
  	rom68k)
  		basic_machine=m68k-rom68k
  		os=-coff
-@@ -1101,7 +1125,7 @@
+@@ -885,6 +910,10 @@
+ 	sb1el)
+ 		basic_machine=mipsisa64sb1el-unknown
+ 		;;
++	sde)
++		basic_machine=mipsisa32-sde
++		os=-elf
++		;;
+ 	sei)
+ 		basic_machine=mips-sei
+ 		os=-seiux
+@@ -1101,7 +1130,7 @@
  	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
  		basic_machine=sh-unknown
  		;;
@@ -1511,7 +1528,7 @@
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1174,21 +1198,23 @@
+@@ -1174,21 +1203,23 @@
  	      | -aos* \
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
@@ -1538,7 +1555,7 @@
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1215,6 +1241,9 @@
+@@ -1215,6 +1246,9 @@
  	-linux-dietlibc)
  		os=-linux-dietlibc
  		;;
@@ -1548,17 +1565,20 @@
  	-sunos5*)
  		os=`echo $os | sed -e 's|sunos5|solaris2|'`
  		;;
-@@ -1337,6 +1366,9 @@
+@@ -1337,6 +1371,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
++        score-*)
++		os=-elf
++		;;
 +        spu-*)
 +		os=-elf
 +		;;
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1346,9 +1378,9 @@
+@@ -1346,9 +1386,9 @@
  	arm*-semi)
  		os=-aout
  		;;
@@ -1571,9 +1591,9 @@
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-diff -urNad beagle-0.2.10~/configure beagle-0.2.10/configure
---- beagle-0.2.10~/configure	2006-09-19 00:40:30.000000000 +0200
-+++ beagle-0.2.10/configure	2006-09-24 13:03:22.000000000 +0200
+diff -urNad beagle-0.2.11~/configure beagle-0.2.11/configure
+--- beagle-0.2.11~/configure	2006-10-18 18:57:15.000000000 +0200
++++ beagle-0.2.11/configure	2006-10-22 12:53:36.000000000 +0200
 @@ -1,8 +1,9 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
@@ -2249,7 +2269,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -429,42 +719,374 @@
+@@ -429,42 +719,372 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -2299,7 +2319,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_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 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 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_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 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 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
@@ -2554,8 +2574,6 @@
 +ENABLE_WV1_FALSE
 +KDE_CONFIG
 +KDE_PREFIX
-+ENABLE_WEBSERVICES_TRUE
-+ENABLE_WEBSERVICES_FALSE
 +GAC_PREFIX
 +GNOME_PREFIX
 +HAS_LIBCHM_TRUE
@@ -2638,7 +2656,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -491,34 +1113,48 @@
+@@ -491,34 +1111,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.
@@ -2694,7 +2712,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -540,12 +1176,18 @@
+@@ -540,12 +1174,18 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -2716,7 +2734,7 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -553,7 +1195,17 @@
+@@ -553,7 +1193,17 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -2735,7 +2753,7 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -562,11 +1214,7 @@
+@@ -562,11 +1212,7 @@
        { echo "$as_me: error: invalid feature name: $ac_feature" >&2
     { (exit 1); exit 1; }; }
      ac_feature=`echo $ac_feature | sed 's/-/_/g'`
@@ -2748,7 +2766,7 @@
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -593,6 +1241,12 @@
+@@ -593,6 +1239,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -2761,7 +2779,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -617,13 +1271,16 @@
+@@ -617,13 +1269,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -2782,7 +2800,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -688,6 +1345,16 @@
+@@ -688,6 +1343,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -2799,7 +2817,7 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -744,11 +1411,7 @@
+@@ -744,11 +1409,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package| sed 's/-/_/g'`
@@ -2812,7 +2830,7 @@
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -757,7 +1420,7 @@
+@@ -757,7 +1418,7 @@
        { echo "$as_me: error: invalid package name: $ac_package" >&2
     { (exit 1); exit 1; }; }
      ac_package=`echo $ac_package | sed 's/-/_/g'`
@@ -2821,7 +2839,7 @@
  
    --x)
      # Obsolete; use --with-x.
-@@ -788,8 +1451,7 @@
+@@ -788,8 +1449,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -2831,7 +2849,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -809,27 +1471,19 @@
+@@ -809,27 +1469,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -2869,7 +2887,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -856,250 +1510,76 @@
+@@ -856,250 +1508,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -3174,7 +3192,7 @@
  
  #
  # Report the --help message.
-@@ -1128,9 +1608,6 @@
+@@ -1128,9 +1606,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -3184,7 +3202,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -1148,15 +1625,22 @@
+@@ -1148,15 +1623,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -3210,7 +3228,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1186,10 +1670,8 @@
+@@ -1186,10 +1668,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
@@ -3223,7 +3241,7 @@
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
    --disable-dependency-tracking  speeds up one-time build
-@@ -1220,8 +1702,7 @@
+@@ -1222,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]
@@ -3233,7 +3251,7 @@
    --with-x                use the X Window System
    --with-html-dir=PATH    path to installed docs
  
-@@ -1230,8 +1711,8 @@
+@@ -1232,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>
@@ -3244,7 +3262,7 @@
    CPP         C preprocessor
    CXX         C++ compiler command
    CXXFLAGS    C++ compiler flags
-@@ -1248,6 +1729,7 @@
+@@ -1250,6 +1729,7 @@
                C compiler flags for SQLITE3, overriding pkg-config
    SQLITE3_LIBS
                linker flags for SQLITE3, overriding pkg-config
@@ -3252,7 +3270,7 @@
    GNOME_VFS_CFLAGS
                C compiler flags for GNOME_VFS, overriding pkg-config
    GNOME_VFS_LIBS
-@@ -1312,118 +1794,86 @@
+@@ -1314,118 +1794,86 @@
  it to find libraries and programs with nonstandard names/locations.
  
  _ACEOF
@@ -3417,7 +3435,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1442,7 +1892,7 @@
+@@ -1444,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`
@@ -3426,7 +3444,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`
-@@ -1456,6 +1906,7 @@
+@@ -1458,6 +1906,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -3434,7 +3452,7 @@
  
  } >&5
  
-@@ -1477,7 +1928,6 @@
+@@ -1479,7 +1928,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -3442,7 +3460,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1488,7 +1938,7 @@
+@@ -1490,7 +1938,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -3451,7 +3469,7 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1510,9 +1960,7 @@
+@@ -1512,9 +1960,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -3462,7 +3480,7 @@
        ;;
      esac
    done
-@@ -1523,8 +1971,8 @@
+@@ -1525,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.
@@ -3473,7 +3491,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1537,20 +1985,34 @@
+@@ -1539,20 +1985,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -3518,7 +3536,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1561,22 +2023,28 @@
+@@ -1563,22 +2023,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -3554,7 +3572,7 @@
        done | sort
        echo
      fi
-@@ -1588,26 +2056,24 @@
+@@ -1590,26 +2056,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -3586,7 +3604,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1638,14 +2104,17 @@
+@@ -1640,14 +2104,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -3611,7 +3629,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;}
-@@ -1661,8 +2130,8 @@
+@@ -1663,8 +2130,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -3622,7 +3640,7 @@
      esac
    fi
  else
-@@ -1674,12 +2143,11 @@
+@@ -1676,12 +2143,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -3638,7 +3656,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
-@@ -1704,8 +2172,7 @@
+@@ -1706,8 +2172,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -3648,7 +3666,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1722,12 +2189,6 @@
+@@ -1724,12 +2189,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -3661,7 +3679,7 @@
  
  
  
-@@ -1744,107 +2205,162 @@
+@@ -1746,107 +2205,162 @@
  
  
  
@@ -3876,7 +3894,7 @@
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1867,8 +2383,8 @@
+@@ -1869,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.
@@ -3887,7 +3905,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1890,7 +2406,7 @@
+@@ -1892,7 +2406,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -3896,7 +3914,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.
-@@ -1909,21 +2425,22 @@
+@@ -1911,21 +2425,22 @@
      ;;
  esac
  done
@@ -3924,7 +3942,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1933,8 +2450,8 @@
+@@ -1935,8 +2450,8 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -3935,7 +3953,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1976,20 +2493,20 @@
+@@ -1978,20 +2493,20 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -3961,7 +3979,7 @@
  
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
-@@ -2041,8 +2558,8 @@
+@@ -2043,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
@@ -3972,7 +3990,7 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2055,54 +2572,57 @@
+@@ -2057,54 +2572,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4051,7 +4069,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -2173,8 +2693,8 @@
+@@ -2175,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
@@ -4062,7 +4080,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2187,32 +2707,34 @@
+@@ -2189,32 +2707,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4104,7 +4122,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2225,27 +2747,41 @@
+@@ -2227,27 +2747,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4153,7 +4171,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2287,17 +2823,17 @@
+@@ -2289,17 +2823,17 @@
  
  ########################################################################
  
@@ -4179,7 +4197,7 @@
  
  
  if test $USE_MAINTAINER_MODE = yes; then
-@@ -2311,7 +2847,7 @@
+@@ -2313,7 +2847,7 @@
    MAINT=$MAINTAINER_MODE_TRUE
  
  
@@ -4188,7 +4206,7 @@
  
  
  # Find a good install program.  We prefer a C program (faster),
-@@ -2327,8 +2863,8 @@
+@@ -2329,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.
@@ -4199,7 +4217,7 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -2350,7 +2886,7 @@
+@@ -2352,7 +2886,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4208,7 +4226,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.
-@@ -2369,21 +2905,22 @@
+@@ -2371,21 +2905,22 @@
      ;;
  esac
  done
@@ -4236,7 +4254,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -2393,10 +2930,9 @@
+@@ -2395,10 +2930,9 @@
  
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
@@ -4249,7 +4267,7 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -2415,12 +2951,12 @@
+@@ -2417,12 +2951,12 @@
      esac
  else
    enable_shared=yes
@@ -4266,7 +4284,7 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -2439,12 +2975,12 @@
+@@ -2441,12 +2975,12 @@
      esac
  else
    enable_static=yes
@@ -4283,7 +4301,7 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -2463,11 +2999,12 @@
+@@ -2465,11 +2999,12 @@
      esac
  else
    enable_fast_install=yes
@@ -4298,7 +4316,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2477,8 +3014,8 @@
+@@ -2479,8 +3014,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -4309,7 +4327,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2505,15 +3042,15 @@
+@@ -2507,15 +3042,15 @@
  fi
  
  
@@ -4330,7 +4348,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2538,8 +3075,8 @@
+@@ -2540,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
@@ -4341,7 +4359,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2552,32 +3089,34 @@
+@@ -2554,32 +3089,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4383,7 +4401,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2590,36 +3129,51 @@
+@@ -2592,36 +3129,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4445,7 +4463,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2632,74 +3186,34 @@
+@@ -2634,74 +3186,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4529,7 +4547,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2713,7 +3227,7 @@
+@@ -2715,7 +3227,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4538,7 +4556,7 @@
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2724,6 +3238,7 @@
+@@ -2726,6 +3238,7 @@
    fi
  done
  done
@@ -4546,7 +4564,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2741,22 +3256,23 @@
+@@ -2743,22 +3256,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -4577,7 +4595,7 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2769,36 +3285,38 @@
+@@ -2771,36 +3285,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4624,7 +4642,7 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2811,29 +3329,45 @@
+@@ -2813,29 +3329,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -4676,7 +4694,7 @@
  fi
  
  fi
-@@ -2846,21 +3380,35 @@
+@@ -2848,21 +3380,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -4720,7 +4738,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2885,47 +3433,77 @@
+@@ -2887,47 +3433,77 @@
  # 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.
@@ -4820,7 +4838,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2937,19 +3515,21 @@
+@@ -2939,19 +3515,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -4849,7 +4867,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2968,22 +3548,27 @@
+@@ -2970,22 +3548,27 @@
      fi
    fi
  fi
@@ -4888,7 +4906,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2994,9 +3579,8 @@
+@@ -2996,9 +3579,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -4899,7 +4917,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -3010,14 +3594,14 @@
+@@ -3012,14 +3594,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -4918,7 +4936,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3037,14 +3621,20 @@
+@@ -3039,14 +3621,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -4943,7 +4961,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -3062,12 +3652,12 @@
+@@ -3064,12 +3652,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -4960,7 +4978,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3090,24 +3680,36 @@
+@@ -3092,24 +3680,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5005,7 +5023,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3116,24 +3718,28 @@
+@@ -3118,24 +3718,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -5042,7 +5060,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3149,24 +3755,36 @@
+@@ -3151,24 +3755,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -5087,7 +5105,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -3175,12 +3793,131 @@
+@@ -3177,12 +3793,131 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -5223,7 +5241,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3196,12 +3933,12 @@
+@@ -3198,12 +3933,12 @@
      CFLAGS=
    fi
  fi
@@ -5240,7 +5258,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3235,12 +3972,17 @@
+@@ -3237,12 +3972,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
@@ -5260,7 +5278,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3255,205 +3997,74 @@
+@@ -3257,205 +3997,74 @@
    return 0;
  }
  _ACEOF
@@ -5485,7 +5503,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
+ 
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -done
@@ -5499,13 +5517,13 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3462,8 +4073,8 @@
+@@ -3464,8 +4073,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -5516,7 +5534,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3552,8 +4163,8 @@
+@@ -3554,8 +4163,8 @@
  fi
  
  fi
@@ -5527,7 +5545,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3569,8 +4180,8 @@
+@@ -3571,8 +4180,8 @@
  fi
  
  
@@ -5538,7 +5556,7 @@
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3623,37 +4234,184 @@
+@@ -3625,37 +4234,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -5740,7 +5758,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -3682,11 +4440,11 @@
+@@ -3684,11 +4440,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -5756,7 +5774,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3719,17 +4477,17 @@
+@@ -3721,17 +4477,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -5780,7 +5798,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3743,20 +4501,20 @@
+@@ -3745,20 +4501,20 @@
    ;;
  esac
  fi
@@ -5807,7 +5825,7 @@
  reload_flag=$lt_cv_ld_reload_flag
  case $reload_flag in
  "" | " "*) ;;
-@@ -3773,8 +4531,8 @@
+@@ -3775,8 +4531,8 @@
      ;;
  esac
  
@@ -5818,7 +5836,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3822,23 +4580,23 @@
+@@ -3824,23 +4580,23 @@
    test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
  fi
  fi
@@ -5852,7 +5870,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3888,7 +4646,7 @@
+@@ -3890,7 +4646,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -5861,7 +5879,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -3942,11 +4700,11 @@
+@@ -3944,11 +4700,11 @@
    ;;
  
  # This must be Linux ELF.
@@ -5875,7 +5893,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
-@@ -4013,8 +4771,8 @@
+@@ -4015,8 +4771,8 @@
  esac
  
  fi
@@ -5886,7 +5904,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
-@@ -4032,11 +4790,11 @@
+@@ -4034,11 +4790,11 @@
  compiler=$CC
  
  
@@ -5901,16 +5919,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -4063,7 +4821,7 @@
+@@ -4065,7 +4821,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 4066 "configure"' > conftest.$ac_ext
+-  echo '#line 4068 "configure"' > conftest.$ac_ext
 +  echo '#line 4824 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -4148,8 +4906,8 @@
+@@ -4150,8 +4906,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -5921,7 +5939,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4175,24 +4933,36 @@
+@@ -4177,24 +4933,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -5966,7 +5984,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4201,9 +4971,10 @@
+@@ -4203,9 +4971,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -5979,7 +5997,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -4212,8 +4983,8 @@
+@@ -4214,8 +4983,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -5990,7 +6008,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"
-@@ -4250,8 +5021,8 @@
+@@ -4252,8 +5021,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
@@ -6001,7 +6019,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -4285,8 +5056,13 @@
+@@ -4287,8 +5056,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6017,7 +6035,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4311,9 +5087,10 @@
+@@ -4313,9 +5087,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6029,7 +6047,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4323,8 +5100,13 @@
+@@ -4325,8 +5100,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6045,7 +6063,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4351,6 +5133,7 @@
+@@ -4353,6 +5133,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6053,7 +6071,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4368,8 +5151,8 @@
+@@ -4370,8 +5151,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -6064,7 +6082,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -4392,8 +5175,13 @@
+@@ -4394,8 +5175,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -6080,7 +6098,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4418,9 +5206,10 @@
+@@ -4420,9 +5206,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -6092,7 +6110,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -4430,8 +5219,13 @@
+@@ -4432,8 +5219,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -6108,7 +6126,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4458,6 +5252,7 @@
+@@ -4460,6 +5252,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -6116,7 +6134,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -4480,8 +5275,8 @@
+@@ -4482,8 +5275,8 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
@@ -6127,7 +6145,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4505,24 +5300,36 @@
+@@ -4507,24 +5300,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6172,7 +6190,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4531,9 +5338,10 @@
+@@ -4533,9 +5338,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6185,7 +6203,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4589,6 +5397,7 @@
+@@ -4591,6 +5397,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -6193,7 +6211,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4608,18 +5417,27 @@
+@@ -4610,18 +5417,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -6227,7 +6245,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4632,12 +5450,14 @@
+@@ -4634,12 +5450,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -6245,7 +6263,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -4660,9 +5480,9 @@
+@@ -4662,9 +5480,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6258,7 +6276,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4676,24 +5496,36 @@
+@@ -4678,24 +5496,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6303,7 +6321,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4702,12 +5534,14 @@
+@@ -4704,12 +5534,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6322,7 +6340,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -4722,18 +5556,19 @@
+@@ -4724,18 +5556,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6350,7 +6368,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4744,24 +5579,36 @@
+@@ -4746,24 +5579,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6395,7 +6413,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -4770,15 +5617,16 @@
+@@ -4772,15 +5617,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6418,7 +6436,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4787,8 +5635,13 @@
+@@ -4789,8 +5635,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -6434,7 +6452,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -4812,9 +5665,10 @@
+@@ -4814,9 +5665,10 @@
  
    ac_header_preproc=no
  fi
@@ -6447,7 +6465,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4838,25 +5692,19 @@
+@@ -4840,25 +5692,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;}
@@ -6480,7 +6498,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4868,18 +5716,22 @@
+@@ -4870,18 +5716,22 @@
  
  done
  
@@ -6508,7 +6526,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4892,36 +5744,38 @@
+@@ -4894,36 +5744,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6555,7 +6573,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4934,55 +5788,85 @@
+@@ -4936,55 +5788,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6659,7 +6677,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5005,24 +5889,36 @@
+@@ -5007,24 +5889,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6704,7 +6722,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5031,24 +5927,28 @@
+@@ -5033,24 +5927,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6741,7 +6759,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -5064,24 +5964,36 @@
+@@ -5066,24 +5964,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -6786,7 +6804,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5090,70 +6002,53 @@
+@@ -5092,70 +6002,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6881,7 +6899,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5162,62 +6057,92 @@
+@@ -5164,62 +6057,92 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -6997,7 +7015,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'
-@@ -5225,8 +6150,8 @@
+@@ -5227,8 +6150,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -7008,7 +7026,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5315,8 +6240,8 @@
+@@ -5317,8 +6240,8 @@
  fi
  
  fi
@@ -7019,7 +7037,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -5337,13 +6262,13 @@
+@@ -5339,13 +6262,13 @@
  if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
      ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
      (test "X$CXX" != "Xg++"))) ; then
@@ -7036,7 +7054,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5373,8 +6298,13 @@
+@@ -5375,8 +6298,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7052,7 +7070,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5399,9 +6329,10 @@
+@@ -5401,9 +6329,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7064,7 +7082,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5411,8 +6342,13 @@
+@@ -5413,8 +6342,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7080,7 +7098,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5439,6 +6375,7 @@
+@@ -5441,6 +6375,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7088,7 +7106,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5456,8 +6393,8 @@
+@@ -5458,8 +6393,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -7099,7 +7117,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -5480,8 +6417,13 @@
+@@ -5482,8 +6417,13 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -7115,7 +7133,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5506,9 +6448,10 @@
+@@ -5508,9 +6448,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -7127,7 +7145,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5518,8 +6461,13 @@
+@@ -5520,8 +6461,13 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -7143,7 +7161,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -5546,6 +6494,7 @@
+@@ -5548,6 +6494,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -7151,7 +7169,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -5561,7 +6510,7 @@
+@@ -5563,7 +6510,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -7160,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'
-@@ -5575,12 +6524,12 @@
+@@ -5577,12 +6524,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
@@ -7176,7 +7194,7 @@
  if test "${ac_cv_prog_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5593,36 +6542,38 @@
+@@ -5595,36 +6542,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7223,7 +7241,7 @@
  if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5635,48 +6586,78 @@
+@@ -5637,48 +6586,78 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7276,7 +7294,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:5665:" \
+-echo "$as_me:5667:" \
 -     "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`
@@ -7316,7 +7334,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -5686,8 +6667,8 @@
+@@ -5688,8 +6667,8 @@
  # input file.  (Note that this only needs to work for GNU compilers.)
  ac_save_ext=$ac_ext
  ac_ext=F
@@ -7327,7 +7345,7 @@
  if test "${ac_cv_f77_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5700,24 +6681,36 @@
+@@ -5702,24 +6681,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7372,7 +7390,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5726,20 +6719,21 @@
+@@ -5728,20 +6719,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7400,7 +7418,7 @@
  if test "${ac_cv_prog_f77_g+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5750,24 +6744,36 @@
+@@ -5752,24 +6744,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7445,7 +7463,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -5776,13 +6782,14 @@
+@@ -5778,13 +6782,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -7464,7 +7482,7 @@
  if test "$ac_test_FFLAGS" = set; then
    FFLAGS=$ac_save_FFLAGS
  elif test $ac_cv_prog_f77_g = yes; then
-@@ -5811,8 +6818,8 @@
+@@ -5813,8 +6818,8 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -7475,7 +7493,7 @@
  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5920,19 +6927,19 @@
+@@ -5922,19 +6927,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7501,7 +7519,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5967,7 +6974,7 @@
+@@ -5969,7 +6974,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'"
    ;;
@@ -7510,7 +7528,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'"
-@@ -6136,15 +7143,15 @@
+@@ -6138,15 +7143,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
@@ -7532,7 +7550,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6158,8 +7165,8 @@
+@@ -6160,8 +7165,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -7543,7 +7561,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -6210,8 +7217,8 @@
+@@ -6212,8 +7217,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
@@ -7554,7 +7572,7 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6224,32 +7231,34 @@
+@@ -6226,32 +7231,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7596,7 +7614,7 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6262,27 +7271,41 @@
+@@ -6264,27 +7271,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7645,7 +7663,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -6290,8 +7313,8 @@
+@@ -6292,8 +7313,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
@@ -7656,7 +7674,7 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6304,32 +7327,34 @@
+@@ -6306,32 +7327,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7698,7 +7716,7 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6342,27 +7367,41 @@
+@@ -6344,27 +7367,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7747,7 +7765,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -6370,8 +7409,8 @@
+@@ -6372,8 +7409,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
@@ -7758,7 +7776,7 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6384,32 +7423,34 @@
+@@ -6386,32 +7423,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7800,7 +7818,7 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6422,27 +7463,41 @@
+@@ -6424,27 +7463,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7849,7 +7867,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -6501,8 +7556,8 @@
+@@ -6503,8 +7556,8 @@
  case $deplibs_check_method in
  file_magic*)
    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -7860,7 +7878,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6554,17 +7609,17 @@
+@@ -6556,17 +7609,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7884,7 +7902,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6616,11 +7671,11 @@
+@@ -6618,11 +7671,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -7900,7 +7918,7 @@
  fi
  
    else
-@@ -6635,21 +7690,21 @@
+@@ -6637,21 +7690,21 @@
  enable_dlopen=no
  enable_win32_dll=no
  
@@ -7929,7 +7947,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -6707,8 +7762,8 @@
+@@ -6709,8 +7762,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -7940,21 +7958,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6725,11 +7780,11 @@
+@@ -6727,11 +7780,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:6728: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:6730: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:7783: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:6732: \$? = $ac_status" >&5
+-   echo "$as_me:6734: \$? = $ac_status" >&5
 +   echo "$as_me:7787: \$? = $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.
-@@ -6742,8 +7797,8 @@
+@@ -6744,8 +7797,8 @@
     $rm conftest*
  
  fi
@@ -7965,7 +7983,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"
-@@ -6757,8 +7812,8 @@
+@@ -6759,8 +7812,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -7976,7 +7994,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -6887,7 +7942,7 @@
+@@ -6889,7 +7942,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -7985,7 +8003,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl='-Wl,'
-@@ -6967,16 +8022,16 @@
+@@ -6969,16 +8022,16 @@
      esac
    fi
  
@@ -8006,21 +8024,21 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -6993,11 +8048,11 @@
+@@ -6995,11 +8048,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:6996: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:6998: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8051: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:7000: \$? = $ac_status" >&5
+-   echo "$as_me:7002: \$? = $ac_status" >&5
 +   echo "$as_me:8055: \$? = $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.
-@@ -7010,8 +8065,8 @@
+@@ -7012,8 +8065,8 @@
     $rm conftest*
  
  fi
@@ -8031,7 +8049,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -7038,8 +8093,8 @@
+@@ -7040,8 +8093,8 @@
  # Check to make sure the static flag actually works.
  #
  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
@@ -8042,7 +8060,7 @@
  if test "${lt_prog_compiler_static_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7066,8 +8121,8 @@
+@@ -7068,8 +8121,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -8053,7 +8071,7 @@
  
  if test x"$lt_prog_compiler_static_works" = xyes; then
      :
-@@ -7076,8 +8131,8 @@
+@@ -7078,8 +8131,8 @@
  fi
  
  
@@ -8064,21 +8082,21 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7097,11 +8152,11 @@
+@@ -7099,11 +8152,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:7100: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:7102: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:8155: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:7104: \$? = $ac_status" >&5
+-   echo "$as_me:7106: \$? = $ac_status" >&5
 +   echo "$as_me:8159: \$? = $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
-@@ -7123,23 +8178,23 @@
+@@ -7125,23 +8178,23 @@
     $rm conftest*
  
  fi
@@ -8108,7 +8126,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;}
-@@ -7149,8 +8204,8 @@
+@@ -7151,8 +8204,8 @@
    need_locks=no
  fi
  
@@ -8119,7 +8137,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -7326,7 +8381,7 @@
+@@ -7328,7 +8381,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'
        ;;
  
@@ -8128,7 +8146,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -7352,12 +8407,13 @@
+@@ -7354,12 +8407,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
@@ -8143,7 +8161,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -7565,24 +8621,36 @@
+@@ -7567,24 +8621,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8188,7 +8206,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7596,8 +8664,10 @@
+@@ -7598,8 +8664,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8200,7 +8218,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -7626,24 +8696,36 @@
+@@ -7628,24 +8696,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8245,7 +8263,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7657,8 +8739,10 @@
+@@ -7659,8 +8739,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8257,7 +8275,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -7789,7 +8873,7 @@
+@@ -7791,7 +8873,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8266,7 +8284,7 @@
        archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -7891,7 +8975,7 @@
+@@ -7893,7 +8975,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -8275,7 +8293,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -8107,8 +9191,8 @@
+@@ -8109,8 +9191,8 @@
      esac
    fi
  
@@ -8286,7 +8304,7 @@
  test "$ld_shlibs" = no && can_build_shared=no
  
  #
-@@ -8128,8 +9212,8 @@
+@@ -8130,8 +9212,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.
@@ -8297,7 +8315,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -8166,16 +9250,16 @@
+@@ -8168,16 +9250,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -8318,7 +8336,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -8381,18 +9465,6 @@
+@@ -8383,18 +9465,6 @@
    dynamic_linker=no
    ;;
  
@@ -8337,7 +8355,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -8548,7 +9620,7 @@
+@@ -8550,7 +9620,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -8346,7 +8364,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8577,7 +9649,7 @@
+@@ -8579,7 +9649,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -8355,7 +8373,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -8586,7 +9658,7 @@
+@@ -8588,7 +9658,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -8364,7 +8382,7 @@
    ;;
  
  netbsd*)
-@@ -8762,8 +9834,8 @@
+@@ -8764,8 +9834,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -8375,7 +8393,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -8771,8 +9843,8 @@
+@@ -8773,8 +9843,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -8386,7 +8404,7 @@
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
     test -n "$runpath_var" || \
-@@ -8796,8 +9868,8 @@
+@@ -8798,8 +9868,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -8397,7 +8415,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -8810,29 +9882,29 @@
+@@ -8812,29 +9882,29 @@
  
  striplib=
  old_striplib=
@@ -8437,7 +8455,7 @@
      ;;
    esac
  fi
-@@ -8864,8 +9936,8 @@
+@@ -8866,8 +9936,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -8448,7 +8466,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8878,40 +9950,52 @@
+@@ -8880,40 +9950,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8513,7 +8531,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8920,14 +10004,15 @@
+@@ -8922,14 +10004,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8533,7 +8551,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -8941,8 +10026,8 @@
+@@ -8943,8 +10026,8 @@
     ;;
  
    *)
@@ -8544,7 +8562,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8969,53 +10054,59 @@
+@@ -8971,53 +10054,59 @@
  
  #undef shl_load
  
@@ -8623,7 +8641,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9024,18 +10115,19 @@
+@@ -9026,18 +10115,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8649,7 +8667,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9048,40 +10140,52 @@
+@@ -9050,40 +10140,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8714,7 +8732,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9090,19 +10194,20 @@
+@@ -9092,19 +10194,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8741,7 +8759,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9129,53 +10234,59 @@
+@@ -9131,53 +10234,59 @@
  
  #undef dlopen
  
@@ -8820,7 +8838,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9184,18 +10295,19 @@
+@@ -9186,18 +10295,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8846,7 +8864,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9208,40 +10320,52 @@
+@@ -9210,40 +10320,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -8911,7 +8929,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9250,19 +10374,20 @@
+@@ -9252,19 +10374,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8938,7 +8956,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9275,40 +10400,52 @@
+@@ -9277,40 +10400,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -9003,7 +9021,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9317,19 +10454,20 @@
+@@ -9319,19 +10454,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9030,7 +9048,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9342,40 +10480,52 @@
+@@ -9344,40 +10480,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -9095,7 +9113,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -9384,14 +10534,15 @@
+@@ -9386,14 +10534,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9115,7 +9133,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -9431,8 +10582,8 @@
+@@ -9433,8 +10582,8 @@
      save_LIBS="$LIBS"
      LIBS="$lt_cv_dlopen_libs $LIBS"
  
@@ -9126,16 +9144,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9442,7 +10593,7 @@
+@@ -9444,7 +10593,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9445 "configure"
+-#line 9447 "configure"
 +#line 10596 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9526,13 +10677,13 @@
+@@ -9528,13 +10677,13 @@
  
  
  fi
@@ -9153,16 +9171,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9542,7 +10693,7 @@
+@@ -9544,7 +10693,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 9545 "configure"
+-#line 9547 "configure"
 +#line 10696 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -9626,8 +10777,8 @@
+@@ -9628,8 +10777,8 @@
  
  
  fi
@@ -9173,7 +9191,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -9649,13 +10800,13 @@
+@@ -9651,13 +10800,13 @@
  
  
  # Report which library types will actually be built
@@ -9193,7 +9211,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -9675,15 +10826,15 @@
+@@ -9677,15 +10826,15 @@
    fi
      ;;
  esac
@@ -9215,7 +9233,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -10175,11 +11326,11 @@
+@@ -10177,11 +11326,11 @@
  CC="$lt_save_CC"
  
  
@@ -9231,7 +9249,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -10233,7 +11384,7 @@
+@@ -10235,7 +11384,7 @@
  	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
  	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
  	    (test "X$CXX" != "Xg++"))) ; then
@@ -9240,7 +9258,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'
-@@ -10352,18 +11503,18 @@
+@@ -10354,18 +11503,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -9265,7 +9283,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -10392,11 +11543,11 @@
+@@ -10394,11 +11543,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -9281,7 +9299,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10429,17 +11580,17 @@
+@@ -10431,17 +11580,17 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -9305,7 +9323,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -10453,8 +11604,8 @@
+@@ -10455,8 +11604,8 @@
    ;;
  esac
  fi
@@ -9316,7 +9334,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -10504,8 +11655,8 @@
+@@ -10506,8 +11655,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -9327,7 +9345,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -10617,24 +11768,36 @@
+@@ -10619,24 +11768,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9372,7 +9390,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10648,8 +11811,10 @@
+@@ -10650,8 +11811,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9384,7 +9402,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10679,24 +11844,36 @@
+@@ -10681,24 +11844,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9429,7 +9447,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -10710,8 +11887,10 @@
+@@ -10712,8 +11887,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9441,7 +9459,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10859,7 +12038,7 @@
+@@ -10861,7 +12038,7 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
@@ -9450,7 +9468,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -11018,7 +12197,7 @@
+@@ -11020,7 +12197,7 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -9459,7 +9477,7 @@
      case $cc_basename in
        KCC*)
  	# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11120,7 +12299,7 @@
+@@ -11122,7 +12299,7 @@
  	;;
      esac
      ;;
@@ -9468,7 +9486,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=
-@@ -11442,8 +12621,8 @@
+@@ -11444,8 +12621,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -9479,7 +9497,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -11582,8 +12761,8 @@
+@@ -11584,8 +12761,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -9490,7 +9508,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -11687,7 +12866,7 @@
+@@ -11689,7 +12866,7 @@
  	    ;;
  	esac
  	;;
@@ -9499,7 +9517,7 @@
  	# FreeBSD uses GNU C++
  	;;
        hpux9* | hpux10* | hpux11*)
-@@ -11730,7 +12909,7 @@
+@@ -11732,7 +12909,7 @@
  	    ;;
  	esac
  	;;
@@ -9508,7 +9526,7 @@
  	case $cc_basename in
  	  KCC*)
  	    # KAI C++ Compiler
-@@ -11773,7 +12952,7 @@
+@@ -11775,7 +12952,7 @@
  	    ;;
  	esac
  	;;
@@ -9517,7 +9535,7 @@
  	;;
        osf3* | osf4* | osf5*)
  	case $cc_basename in
-@@ -11856,16 +13035,16 @@
+@@ -11858,16 +13035,16 @@
      esac
    fi
  
@@ -9538,21 +9556,21 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11882,11 +13061,11 @@
+@@ -11884,11 +13061,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:11885: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11887: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13064: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:11889: \$? = $ac_status" >&5
+-   echo "$as_me:11891: \$? = $ac_status" >&5
 +   echo "$as_me:13068: \$? = $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.
-@@ -11899,8 +13078,8 @@
+@@ -11901,8 +13078,8 @@
     $rm conftest*
  
  fi
@@ -9563,7 +9581,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -11927,8 +13106,8 @@
+@@ -11929,8 +13106,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\"
@@ -9574,7 +9592,7 @@
  if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11955,8 +13134,8 @@
+@@ -11957,8 +13134,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9585,7 +9603,7 @@
  
  if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
      :
-@@ -11965,8 +13144,8 @@
+@@ -11967,8 +13144,8 @@
  fi
  
  
@@ -9596,21 +9614,21 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11986,11 +13165,11 @@
+@@ -11988,11 +13165,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:11989: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:11991: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:13168: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:11993: \$? = $ac_status" >&5
+-   echo "$as_me:11995: \$? = $ac_status" >&5
 +   echo "$as_me:13172: \$? = $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
-@@ -12012,23 +13191,23 @@
+@@ -12014,23 +13191,23 @@
     $rm conftest*
  
  fi
@@ -9640,7 +9658,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;}
-@@ -12038,8 +13217,8 @@
+@@ -12040,8 +13217,8 @@
    need_locks=no
  fi
  
@@ -9651,7 +9669,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -12058,13 +13237,16 @@
+@@ -12060,13 +13237,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'
    ;;
@@ -9670,7 +9688,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  #
-@@ -12084,8 +13266,8 @@
+@@ -12086,8 +13266,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.
@@ -9681,7 +9699,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -12122,16 +13304,16 @@
+@@ -12124,16 +13304,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -9702,7 +9720,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -12337,18 +13519,6 @@
+@@ -12339,18 +13519,6 @@
    dynamic_linker=no
    ;;
  
@@ -9721,7 +9739,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -12504,7 +13674,7 @@
+@@ -12506,7 +13674,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -9730,7 +9748,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -12533,7 +13703,7 @@
+@@ -12535,7 +13703,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -9739,7 +9757,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -12542,7 +13712,7 @@
+@@ -12544,7 +13712,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -9748,7 +9766,7 @@
    ;;
  
  netbsd*)
-@@ -12718,8 +13888,8 @@
+@@ -12720,8 +13888,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -9759,7 +9777,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -12727,8 +13897,8 @@
+@@ -12729,8 +13897,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -9770,7 +9788,7 @@
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
     test -n "$runpath_var_CXX" || \
-@@ -12752,8 +13922,8 @@
+@@ -12754,8 +13922,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -9781,7 +9799,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -13278,13 +14448,13 @@
+@@ -13280,13 +14448,13 @@
  cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
  
  
@@ -9801,7 +9819,7 @@
  test "$can_build_shared" = "no" && enable_shared=no
  
  # On AIX, shared libraries and static libraries use the same namespace, and
-@@ -13303,15 +14473,15 @@
+@@ -13305,15 +14473,15 @@
    fi
    ;;
  esac
@@ -9823,7 +9841,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -13320,8 +14490,8 @@
+@@ -13322,8 +14490,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -9834,7 +9852,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -13450,7 +14620,7 @@
+@@ -13452,7 +14620,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -9843,7 +9861,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_F77='-Wl,'
-@@ -13530,16 +14700,16 @@
+@@ -13532,16 +14700,16 @@
      esac
    fi
  
@@ -9864,21 +9882,21 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13556,11 +14726,11 @@
+@@ -13558,11 +14726,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:13559: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13561: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13563: \$? = $ac_status" >&5
+-   echo "$as_me:13565: \$? = $ac_status" >&5
 +   echo "$as_me:14733: \$? = $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.
-@@ -13573,8 +14743,8 @@
+@@ -13575,8 +14743,8 @@
     $rm conftest*
  
  fi
@@ -9889,7 +9907,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -13601,8 +14771,8 @@
+@@ -13603,8 +14771,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\"
@@ -9900,7 +9918,7 @@
  if test "${lt_prog_compiler_static_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13629,8 +14799,8 @@
+@@ -13631,8 +14799,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -9911,7 +9929,7 @@
  
  if test x"$lt_prog_compiler_static_works_F77" = xyes; then
      :
-@@ -13639,8 +14809,8 @@
+@@ -13641,8 +14809,8 @@
  fi
  
  
@@ -9922,21 +9940,21 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -13660,11 +14830,11 @@
+@@ -13662,11 +14830,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:13663: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13665: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:14833: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13667: \$? = $ac_status" >&5
+-   echo "$as_me:13669: \$? = $ac_status" >&5
 +   echo "$as_me:14837: \$? = $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
-@@ -13686,23 +14856,23 @@
+@@ -13688,23 +14856,23 @@
     $rm conftest*
  
  fi
@@ -9966,7 +9984,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;}
-@@ -13712,8 +14882,8 @@
+@@ -13714,8 +14882,8 @@
    need_locks=no
  fi
  
@@ -9977,7 +9995,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -13889,7 +15059,7 @@
+@@ -13891,7 +15059,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'
        ;;
  
@@ -9986,7 +10004,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -13915,12 +15085,13 @@
+@@ -13917,12 +15085,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
@@ -10001,7 +10019,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -14118,24 +15289,36 @@
+@@ -14120,24 +15289,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10046,7 +10064,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14149,8 +15332,10 @@
+@@ -14151,8 +15332,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10058,7 +10076,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14169,24 +15354,36 @@
+@@ -14171,24 +15354,36 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10103,7 +10121,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -14200,8 +15397,10 @@
+@@ -14202,8 +15397,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10115,7 +10133,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -14332,7 +15531,7 @@
+@@ -14334,7 +15531,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10124,7 +10142,7 @@
        archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -14434,7 +15633,7 @@
+@@ -14436,7 +15633,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -10133,7 +10151,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
-@@ -14650,8 +15849,8 @@
+@@ -14652,8 +15849,8 @@
      esac
    fi
  
@@ -10144,7 +10162,7 @@
  test "$ld_shlibs_F77" = no && can_build_shared=no
  
  #
-@@ -14671,8 +15870,8 @@
+@@ -14673,8 +15870,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.
@@ -10155,7 +10173,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14709,16 +15908,16 @@
+@@ -14711,16 +15908,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -10176,7 +10194,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -14924,18 +16123,6 @@
+@@ -14926,18 +16123,6 @@
    dynamic_linker=no
    ;;
  
@@ -10195,7 +10213,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -15091,7 +16278,7 @@
+@@ -15093,7 +16278,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -10204,7 +10222,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -15120,7 +16307,7 @@
+@@ -15122,7 +16307,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10213,7 +10231,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -15129,7 +16316,7 @@
+@@ -15131,7 +16316,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -10222,7 +10240,7 @@
    ;;
  
  netbsd*)
-@@ -15305,8 +16492,8 @@
+@@ -15307,8 +16492,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -10233,7 +10251,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15314,8 +16501,8 @@
+@@ -15316,8 +16501,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -10244,7 +10262,7 @@
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
     test -n "$runpath_var_F77" || \
-@@ -15339,8 +16526,8 @@
+@@ -15341,8 +16526,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -10255,7 +10273,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -15777,7 +16964,6 @@
+@@ -15779,7 +16964,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -10263,7 +10281,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -15845,8 +17031,8 @@
+@@ -15847,8 +17031,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -10274,21 +10292,21 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -15863,11 +17049,11 @@
+@@ -15865,11 +17049,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:15866: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:15868: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17052: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:15870: \$? = $ac_status" >&5
+-   echo "$as_me:15872: \$? = $ac_status" >&5
 +   echo "$as_me:17056: \$? = $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.
-@@ -15880,8 +17066,8 @@
+@@ -15882,8 +17066,8 @@
     $rm conftest*
  
  fi
@@ -10299,7 +10317,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"
-@@ -15895,8 +17081,8 @@
+@@ -15897,8 +17081,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -10310,7 +10328,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16025,7 +17211,7 @@
+@@ -16027,7 +17211,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -10319,7 +10337,7 @@
        case $cc_basename in
        icc* | ecc*)
  	lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16105,16 +17291,16 @@
+@@ -16107,16 +17291,16 @@
      esac
    fi
  
@@ -10340,21 +10358,21 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16131,11 +17317,11 @@
+@@ -16133,11 +17317,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:16134: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16136: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17320: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16138: \$? = $ac_status" >&5
+-   echo "$as_me:16140: \$? = $ac_status" >&5
 +   echo "$as_me:17324: \$? = $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.
-@@ -16148,8 +17334,8 @@
+@@ -16150,8 +17334,8 @@
     $rm conftest*
  
  fi
@@ -10365,7 +10383,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -16176,8 +17362,8 @@
+@@ -16178,8 +17362,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\"
@@ -10376,7 +10394,7 @@
  if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16204,8 +17390,8 @@
+@@ -16206,8 +17390,8 @@
     LDFLAGS="$save_LDFLAGS"
  
  fi
@@ -10387,7 +10405,7 @@
  
  if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
      :
-@@ -16214,8 +17400,8 @@
+@@ -16216,8 +17400,8 @@
  fi
  
  
@@ -10398,21 +10416,21 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16235,11 +17421,11 @@
+@@ -16237,11 +17421,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:16238: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16240: $lt_compile\"" >&5)
 +   (eval echo "\"\$as_me:17424: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16242: \$? = $ac_status" >&5
+-   echo "$as_me:16244: \$? = $ac_status" >&5
 +   echo "$as_me:17428: \$? = $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
-@@ -16261,23 +17447,23 @@
+@@ -16263,23 +17447,23 @@
     $rm conftest*
  
  fi
@@ -10442,7 +10460,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;}
-@@ -16287,8 +17473,8 @@
+@@ -16289,8 +17473,8 @@
    need_locks=no
  fi
  
@@ -10453,7 +10471,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -16464,7 +17650,7 @@
+@@ -16466,7 +17650,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'
        ;;
  
@@ -10462,7 +10480,7 @@
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
  	tmp_addflag=
  	case $cc_basename,$host_cpu in
-@@ -16490,12 +17676,13 @@
+@@ -16492,12 +17676,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
@@ -10477,7 +10495,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
  	wlarc=
-@@ -16703,24 +17890,36 @@
+@@ -16705,24 +17890,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10522,7 +10540,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16734,8 +17933,10 @@
+@@ -16736,8 +17933,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10534,7 +10552,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16764,24 +17965,36 @@
+@@ -16766,24 +17965,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10579,7 +10597,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -16795,8 +18008,10 @@
+@@ -16797,8 +18008,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10591,7 +10609,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16927,7 +18142,7 @@
+@@ -16929,7 +18142,7 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10600,7 +10618,7 @@
        archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -17029,7 +18244,7 @@
+@@ -17031,7 +18244,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -10609,7 +10627,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
-@@ -17245,8 +18460,8 @@
+@@ -17247,8 +18460,8 @@
      esac
    fi
  
@@ -10620,7 +10638,7 @@
  test "$ld_shlibs_GCJ" = no && can_build_shared=no
  
  #
-@@ -17266,8 +18481,8 @@
+@@ -17268,8 +18481,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.
@@ -10631,7 +10649,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17304,16 +18519,16 @@
+@@ -17306,16 +18519,16 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -10652,7 +10670,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
-@@ -17519,18 +18734,6 @@
+@@ -17521,18 +18734,6 @@
    dynamic_linker=no
    ;;
  
@@ -10671,7 +10689,7 @@
  freebsd* | dragonfly*)
    # DragonFly does not have aout.  When/if they implement a new
    # versioning mechanism, adjust this.
-@@ -17686,7 +18889,7 @@
+@@ -17688,7 +18889,7 @@
    ;;
  
  # This must be Linux ELF.
@@ -10680,7 +10698,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17715,7 +18918,7 @@
+@@ -17717,7 +18918,7 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -10689,7 +10707,7 @@
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17724,7 +18927,7 @@
+@@ -17726,7 +18927,7 @@
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no
    hardcode_into_libs=yes
@@ -10698,7 +10716,7 @@
    ;;
  
  netbsd*)
-@@ -17900,8 +19103,8 @@
+@@ -17902,8 +19103,8 @@
    dynamic_linker=no
    ;;
  esac
@@ -10709,7 +10727,7 @@
  test "$dynamic_linker" = no && can_build_shared=no
  
  variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17909,8 +19112,8 @@
+@@ -17911,8 +19112,8 @@
    variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
  fi
  
@@ -10720,7 +10738,7 @@
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
     test -n "$runpath_var_GCJ" || \
-@@ -17934,8 +19137,8 @@
+@@ -17936,8 +19137,8 @@
    # directories.
    hardcode_action_GCJ=unsupported
  fi
@@ -10731,7 +10749,7 @@
  
  if test "$hardcode_action_GCJ" = relink; then
    # Fast installation is not supported
-@@ -18371,7 +19574,6 @@
+@@ -18373,7 +19574,6 @@
        RC)
  
  
@@ -10739,7 +10757,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -18902,18 +20104,22 @@
+@@ -18904,18 +20104,22 @@
  
  
  
@@ -10767,7 +10785,7 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18926,36 +20132,38 @@
+@@ -18928,36 +20132,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10814,7 +10832,7 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18968,55 +20176,85 @@
+@@ -18970,55 +20176,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10918,7 +10936,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19039,24 +20277,36 @@
+@@ -19041,24 +20277,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10963,7 +10981,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19065,24 +20315,28 @@
+@@ -19067,24 +20315,28 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11000,7 +11018,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19098,24 +20352,36 @@
+@@ -19100,24 +20352,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11045,7 +11063,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19124,70 +20390,53 @@
+@@ -19126,70 +20390,53 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11140,7 +11158,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19196,61 +20445,91 @@
+@@ -19198,61 +20445,91 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11254,7 +11272,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -19259,8 +20538,8 @@
+@@ -19261,8 +20538,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -11265,7 +11283,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19349,8 +20628,8 @@
+@@ -19351,8 +20628,8 @@
  fi
  
  fi
@@ -11276,7 +11294,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -19372,8 +20651,8 @@
+@@ -19374,8 +20651,8 @@
  
  # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
@@ -11287,7 +11305,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19388,28 +20667,29 @@
+@@ -19390,28 +20667,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11323,7 +11341,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;}
-@@ -19418,8 +20698,8 @@
+@@ -19420,8 +20698,8 @@
  
  # Extract the first word of "bash", so it can be a program name with args.
  set dummy bash; ac_word=$2
@@ -11334,7 +11352,7 @@
  if test "${ac_cv_path_BASH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19434,34 +20714,35 @@
+@@ -19436,34 +20714,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11378,7 +11396,7 @@
  if test "${ac_cv_path_ZIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19476,32 +20757,33 @@
+@@ -19478,32 +20757,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11420,7 +11438,7 @@
  if test "${ac_cv_path_MONO+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19516,31 +20798,32 @@
+@@ -19518,31 +20798,32 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11461,7 +11479,7 @@
  if test "${ac_cv_path_MCS+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19555,37 +20838,38 @@
+@@ -19557,37 +20838,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11510,7 +11528,7 @@
  fi
  
  # check that we have the require version of mono
-@@ -19595,8 +20879,8 @@
+@@ -19597,8 +20879,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
@@ -11521,7 +11539,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19611,34 +20895,35 @@
+@@ -19613,34 +20895,35 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11565,7 +11583,7 @@
  if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -19653,28 +20938,42 @@
+@@ -19655,28 +20938,42 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11615,7 +11633,7 @@
  else
    PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
  fi
-@@ -19682,22 +20981,22 @@
+@@ -19684,22 +20981,22 @@
  fi
  if test -n "$PKG_CONFIG"; then
  	_pkg_min_version=0.9.0
@@ -11646,7 +11664,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$MONO_CFLAGS"; then
-@@ -19801,8 +21100,8 @@
+@@ -19803,8 +21100,8 @@
  else
  	MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
  	MONO_LIBS=$pkg_cv_MONO_LIBS
@@ -11657,7 +11675,7 @@
  	:
  fi
  
-@@ -19817,15 +21116,15 @@
+@@ -19819,15 +21116,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
@@ -11677,7 +11695,7 @@
    fi
  done
  
-@@ -19872,18 +21171,19 @@
+@@ -19874,18 +21171,19 @@
  for ac_header in stdlib.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11705,7 +11723,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19894,24 +21194,36 @@
+@@ -19896,24 +21194,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -11750,7 +11768,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -19920,15 +21232,16 @@
+@@ -19922,15 +21232,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11773,7 +11791,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -19937,8 +21250,13 @@
+@@ -19939,8 +21250,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -11789,7 +11807,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -19962,9 +21280,10 @@
+@@ -19964,9 +21280,10 @@
  
    ac_header_preproc=no
  fi
@@ -11802,7 +11820,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -19988,25 +21307,19 @@
+@@ -19990,25 +21307,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;}
@@ -11835,7 +11853,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20022,9 +21335,9 @@
+@@ -20024,9 +21335,9 @@
  for ac_func in getpagesize
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -11848,7 +11866,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -20050,53 +21363,59 @@
+@@ -20052,53 +21363,59 @@
  
  #undef $ac_func
  
@@ -11927,7 +11945,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20105,13 +21424,15 @@
+@@ -20107,13 +21424,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11947,7 +11965,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -20120,8 +21441,8 @@
+@@ -20122,8 +21441,8 @@
  fi
  done
  
@@ -11958,7 +11976,7 @@
  if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20163,21 +21484,21 @@
+@@ -20165,21 +21484,21 @@
  #include <fcntl.h>
  #include <sys/mman.h>
  
@@ -11984,7 +12002,7 @@
  #   include <sys/param.h>
  #   ifdef EXEC_PAGESIZE
  #    define getpagesize() EXEC_PAGESIZE
-@@ -20216,15 +21537,15 @@
+@@ -20218,15 +21537,15 @@
    /* First, make a file with some known garbage in it. */
    data = (char *) malloc (pagesize);
    if (!data)
@@ -12003,7 +12021,7 @@
    close (fd);
  
    /* Next, try to mmap the file at a fixed address which already has
-@@ -20232,17 +21553,17 @@
+@@ -20234,17 +21553,17 @@
       we see the same garbage.  */
    fd = open ("conftest.mmap", O_RDWR);
    if (fd < 0)
@@ -12026,7 +12044,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
-@@ -20251,24 +21572,33 @@
+@@ -20253,24 +21572,33 @@
      *(data2 + i) = *(data2 + i) + 1;
    data3 = (char *) malloc (pagesize);
    if (!data3)
@@ -12068,7 +12086,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20281,11 +21611,13 @@
+@@ -20283,11 +21611,13 @@
  ( exit $ac_status )
  ac_cv_func_mmap_fixed_mapped=no
  fi
@@ -12085,7 +12103,7 @@
  if test $ac_cv_func_mmap_fixed_mapped = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20300,8 +21632,8 @@
+@@ -20302,8 +21632,8 @@
  
  # Extract the first word of "desktop-launch", so it can be a program name with args.
  set dummy desktop-launch; ac_word=$2
@@ -12096,7 +12114,7 @@
  if test "${ac_cv_path_DESKTOP_LAUNCH+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20316,30 +21648,31 @@
+@@ -20318,30 +21648,31 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12134,7 +12152,7 @@
  if test "x$DESKTOP_LAUNCH" != "xno"; then
    ENABLE_DESKTOP_LAUNCH_TRUE=
    ENABLE_DESKTOP_LAUNCH_FALSE='#'
-@@ -20351,20 +21684,20 @@
+@@ -20353,20 +21684,20 @@
  
  # Google QueryDriver
  # Disable GoogleDriver by default, enable if you want know what you are doing
@@ -12161,7 +12179,7 @@
  if test "${ac_cv_path_WSDL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20379,27 +21712,28 @@
+@@ -20381,27 +21712,28 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12196,7 +12214,7 @@
  fi
  
  
-@@ -20429,15 +21763,15 @@
+@@ -20431,15 +21763,15 @@
  esac
  
  if test -n "0.23"; then
@@ -12216,7 +12234,7 @@
      test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
  	{ { echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.23 or later." >&5
  echo "$as_me: error: Your intltool is too old.  You need intltool 0.23 or later." >&2;}
-@@ -20492,8 +21826,8 @@
+@@ -20494,8 +21826,8 @@
  
  # Extract the first word of "perl", so it can be a program name with args.
  set dummy perl; ac_word=$2
@@ -12227,7 +12245,7 @@
  if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20508,27 +21842,28 @@
+@@ -20510,27 +21842,28 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12262,7 +12280,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;}
-@@ -20540,11 +21875,11 @@
+@@ -20542,11 +21875,11 @@
     { (exit 1); exit 1; }; }
  fi
  if test "x" != "xno-xml"; then
@@ -12278,7 +12296,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;}
-@@ -20554,8 +21889,8 @@
+@@ -20556,8 +21889,8 @@
  
  # Extract the first word of "iconv", so it can be a program name with args.
  set dummy iconv; ac_word=$2
@@ -12289,7 +12307,7 @@
  if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20570,32 +21905,33 @@
+@@ -20572,32 +21905,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12331,7 +12349,7 @@
  if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20610,32 +21946,33 @@
+@@ -20612,32 +21946,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12373,7 +12391,7 @@
  if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20650,32 +21987,33 @@
+@@ -20652,32 +21987,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12415,7 +12433,7 @@
  if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20690,36 +22028,37 @@
+@@ -20692,36 +22028,37 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12460,7 +12478,7 @@
  
  
  
-@@ -20731,18 +22070,19 @@
+@@ -20733,18 +22070,19 @@
  for ac_header in locale.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12488,7 +12506,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20753,24 +22093,36 @@
+@@ -20755,24 +22093,36 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12533,7 +12551,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20779,15 +22131,16 @@
+@@ -20781,15 +22131,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12556,7 +12574,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20796,8 +22149,13 @@
+@@ -20798,8 +22149,13 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12572,7 +12590,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -20821,9 +22179,10 @@
+@@ -20823,9 +22179,10 @@
  
    ac_header_preproc=no
  fi
@@ -12585,7 +12603,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -20847,25 +22206,19 @@
+@@ -20849,25 +22206,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;}
@@ -12618,7 +12636,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20878,8 +22231,8 @@
+@@ -20880,8 +22231,8 @@
  done
  
      if test $ac_cv_header_locale_h = yes; then
@@ -12629,7 +12647,7 @@
  if test "${am_cv_val_LC_MESSAGES+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -20899,24 +22252,36 @@
+@@ -20901,24 +22252,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12674,7 +12692,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20925,13 +22290,14 @@
+@@ -20927,13 +22290,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12693,7 +12711,7 @@
      if test $am_cv_val_LC_MESSAGES = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20950,17 +22316,17 @@
+@@ -20952,17 +22316,17 @@
      INTLLIBS=
  
      if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -12717,7 +12735,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20971,24 +22337,36 @@
+@@ -20973,24 +22337,36 @@
  #include <libintl.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12762,7 +12780,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -20997,15 +22375,16 @@
+@@ -20999,15 +22375,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12785,7 +12803,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21014,8 +22393,13 @@
+@@ -21016,8 +22393,13 @@
  /* end confdefs.h.  */
  #include <libintl.h>
  _ACEOF
@@ -12801,7 +12819,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -21039,9 +22423,10 @@
+@@ -21041,9 +22423,10 @@
  
    ac_header_preproc=no
  fi
@@ -12814,7 +12832,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -21065,25 +22450,18 @@
+@@ -21067,25 +22450,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;}
@@ -12845,7 +12863,7 @@
  
  fi
  if test $ac_cv_header_libintl_h = yes; then
-@@ -21093,8 +22471,8 @@
+@@ -21095,8 +22471,8 @@
        #
        # First check in libc
        #
@@ -12856,7 +12874,7 @@
  if test "${gt_cv_func_ngettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21116,24 +22494,36 @@
+@@ -21118,24 +22494,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12901,7 +12919,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21142,18 +22532,19 @@
+@@ -21144,18 +22532,19 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12927,7 +12945,7 @@
  if test "${gt_cv_func_dgettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21175,24 +22566,36 @@
+@@ -21177,24 +22566,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12972,7 +12990,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21201,14 +22604,15 @@
+@@ -21203,14 +22604,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12992,7 +13010,7 @@
        fi
  
        if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-@@ -21216,9 +22620,9 @@
+@@ -21218,9 +22620,9 @@
  for ac_func in bind_textdomain_codeset
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13005,7 +13023,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21244,53 +22648,59 @@
+@@ -21246,53 +22648,59 @@
  
  #undef $ac_func
  
@@ -13084,7 +13102,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21299,13 +22709,15 @@
+@@ -21301,13 +22709,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13104,7 +13122,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21323,8 +22735,8 @@
+@@ -21325,8 +22735,8 @@
  	 || test "$gt_cv_func_ngettext_libc" != "yes" \
           || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
  
@@ -13115,7 +13133,7 @@
  if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21337,40 +22749,52 @@
+@@ -21339,40 +22749,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13180,7 +13198,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21379,17 +22803,18 @@
+@@ -21381,17 +22803,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13205,7 +13223,7 @@
  if test "${ac_cv_lib_intl_ngettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21402,40 +22827,52 @@
+@@ -21404,40 +22827,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13270,7 +13288,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21444,17 +22881,18 @@
+@@ -21446,17 +22881,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13295,7 +13313,7 @@
  if test "${ac_cv_lib_intl_dgettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21467,40 +22905,52 @@
+@@ -21469,40 +22905,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13360,7 +13378,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21509,14 +22959,15 @@
+@@ -21511,14 +22959,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13380,7 +13398,7 @@
  if test $ac_cv_lib_intl_dgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  fi
-@@ -21527,12 +22978,12 @@
+@@ -21529,12 +22978,12 @@
  
  
  	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13399,7 +13417,7 @@
  if test "${ac_cv_lib_intl_ngettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21545,40 +22996,52 @@
+@@ -21547,40 +22996,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13464,7 +13482,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21587,17 +23050,18 @@
+@@ -21589,17 +23050,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13489,7 +13507,7 @@
  if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21610,40 +23074,52 @@
+@@ -21612,40 +23074,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -13554,7 +13572,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21652,14 +23128,15 @@
+@@ -21654,14 +23128,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13574,7 +13592,7 @@
  if test $ac_cv_lib_intl_dcgettext = yes; then
    gt_cv_func_dgettext_libintl=yes
  			libintl_extra_libs=-liconv
-@@ -21686,9 +23163,9 @@
+@@ -21688,9 +23163,9 @@
  for ac_func in bind_textdomain_codeset
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13587,7 +13605,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21714,53 +23191,59 @@
+@@ -21716,53 +23191,59 @@
  
  #undef $ac_func
  
@@ -13666,7 +13684,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21769,13 +23252,15 @@
+@@ -21771,13 +23252,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13686,7 +13704,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21814,8 +23299,8 @@
+@@ -21816,8 +23299,8 @@
  
  	# Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -13697,7 +13715,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21841,11 +23326,11 @@
+@@ -21843,11 +23326,11 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test "$MSGFMT" != "no"; then
@@ -13713,7 +13731,7 @@
  fi
  	if test "$MSGFMT" != "no"; then
            glib_save_LIBS="$LIBS"
-@@ -21854,9 +23339,9 @@
+@@ -21856,9 +23339,9 @@
  for ac_func in dcgettext
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13726,7 +13744,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -21882,53 +23367,59 @@
+@@ -21884,53 +23367,59 @@
  
  #undef $ac_func
  
@@ -13805,7 +13823,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -21937,13 +23428,15 @@
+@@ -21939,13 +23428,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13825,7 +13843,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21954,8 +23447,8 @@
+@@ -21956,8 +23447,8 @@
  
  	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
  set dummy gmsgfmt; ac_word=$2
@@ -13836,7 +13854,7 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21970,32 +23463,33 @@
+@@ -21972,32 +23463,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -13878,7 +13896,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22021,11 +23515,11 @@
+@@ -22023,11 +23515,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test "$XGETTEXT" != ":"; then
@@ -13894,7 +13912,7 @@
  fi
  
  	  cat >conftest.$ac_ext <<_ACEOF
-@@ -22045,24 +23539,36 @@
+@@ -22047,24 +23539,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13939,7 +13957,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22072,10 +23578,10 @@
+@@ -22074,10 +23578,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13953,7 +13971,7 @@
  if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22102,53 +23608,59 @@
+@@ -22104,53 +23608,59 @@
  
  #undef bind_textdomain_codeset
  
@@ -14032,7 +14050,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22157,13 +23669,14 @@
+@@ -22159,13 +23669,14 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14051,7 +14069,7 @@
  if test $ac_cv_func_bind_textdomain_codeset = yes; then
    CATOBJEXT=.gmo
                 DATADIRNAME=share
-@@ -22179,7 +23692,8 @@
+@@ -22181,7 +23692,8 @@
  	    ;;
  	    esac
  fi
@@ -14061,7 +14079,7 @@
        conftest$ac_exeext conftest.$ac_ext
            LIBS="$glib_save_LIBS"
  	  INSTOBJEXT=.mo
-@@ -22204,8 +23718,8 @@
+@@ -22206,8 +23718,8 @@
                    if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
          : ;
        else
@@ -14072,7 +14090,7 @@
          XGETTEXT=":"
        fi
      fi
-@@ -22213,7 +23727,7 @@
+@@ -22215,7 +23727,7 @@
      # We need to process the po/ directory.
      POSUB=po
  
@@ -14081,7 +14099,7 @@
  
  
                  for lang in $ALL_LINGUAS; do
-@@ -22237,8 +23751,8 @@
+@@ -22239,8 +23751,8 @@
       if test "x$ALL_LINGUAS" = "x"; then
         LINGUAS=
       else
@@ -14092,7 +14110,7 @@
         NEW_LINGUAS=
         for presentlang in $ALL_LINGUAS; do
           useit=no
-@@ -22262,8 +23776,8 @@
+@@ -22264,8 +23776,8 @@
           fi
         done
         LINGUAS=$NEW_LINGUAS
@@ -14103,7 +14121,7 @@
       fi
  
            if test -n "$LINGUAS"; then
-@@ -22271,6 +23785,15 @@
+@@ -22273,6 +23785,15 @@
       fi
     fi
  
@@ -14119,8 +14137,22 @@
           test -d po || mkdir po
     if test "x$srcdir" != "x."; then
       if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -22297,8 +23820,8 @@
+@@ -22297,18 +23818,18 @@
+ # mono-data-sqlite packages, and the mono build process itself
+ # doesn't require it.  But we do, so check for it here.
  SQLITE_MAJ_VER="0"
+-# Check whether --enable-sqlite2 or --disable-sqlite2 was given.
++# Check whether --enable-sqlite2 was given.
+ if test "${enable_sqlite2+set}" = set; then
+-  enableval="$enable_sqlite2"
+-  enable_sqlite2=$enableval
++  enableval=$enable_sqlite2; enable_sqlite2=$enableval
+ else
+   enable_sqlite2=auto
+-fi;
++fi
++
+ if test "x$enable_sqlite2" = "xyes"; then
  
  pkg_failed=no
 -echo "$as_me:$LINENO: checking for SQLITE" >&5
@@ -14130,7 +14162,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$SQLITE_CFLAGS"; then
-@@ -22354,22 +23877,24 @@
+@@ -22364,14 +23885,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$SQLITE_PKG_ERRORS" >&5
  
@@ -14149,10 +14181,86 @@
 +echo "${ECHO_T}yes" >&6; }
  	SQLITE_MAJ_VER="2"
  fi
- # Note we really need 3.3.1, but the pkgconfig file from upstream only
- # reports 3.3 for all releases in the 3.3 line.
+ 	if test "x$SQLITE_MAJ_VER" = "x0"; then
+@@ -22381,18 +23904,18 @@
+ 	fi
+ fi
  
+-# Check whether --enable-sqlite3 or --disable-sqlite3 was given.
++# Check whether --enable-sqlite3 was given.
+ if test "${enable_sqlite3+set}" = set; then
+-  enableval="$enable_sqlite3"
+-  enable_sqlite3=$enableval
++  enableval=$enable_sqlite3; enable_sqlite3=$enableval
+ else
+   enable_sqlite3=auto
+-fi;
++fi
++
+ if test "x$enable_sqlite3" = "xyes"; then
+ 
  pkg_failed=no
+-echo "$as_me:$LINENO: checking for SQLITE" >&5
+-echo $ECHO_N "checking for SQLITE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for SQLITE" >&5
++echo $ECHO_N "checking for SQLITE... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$SQLITE_CFLAGS"; then
+@@ -22448,14 +23971,16 @@
+ 	# 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
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 	SQLITE_MAJ_VER="3"
+ fi
+ 	if test "x$SQLITE_MAJ_VER" = "x0"; then
+@@ -22467,8 +23992,8 @@
+ if test "x$SQLITE_MAJ_VER" = "x0"; then
+ 
+ pkg_failed=no
+-echo "$as_me:$LINENO: checking for SQLITE" >&5
+-echo $ECHO_N "checking for SQLITE... $ECHO_C" >&6
++{ echo "$as_me:$LINENO: checking for SQLITE" >&5
++echo $ECHO_N "checking for SQLITE... $ECHO_C" >&6; }
+ 
+ if test -n "$PKG_CONFIG"; then
+     if test -n "$SQLITE_CFLAGS"; then
+@@ -22524,22 +24049,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
+-        echo "$as_me:$LINENO: result: yes" >&5
+-echo "${ECHO_T}yes" >&6
++        { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
+ 	SQLITE_MAJ_VER="2"
+ fi
+ 	# Note we really need 3.3.1, but the pkgconfig file from upstream only
+ 	# reports 3.3 for all releases in the 3.3 line.
+ 
+ pkg_failed=no
 -echo "$as_me:$LINENO: checking for SQLITE3" >&5
 -echo $ECHO_N "checking for SQLITE3... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for SQLITE3" >&5
@@ -14160,7 +14268,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$SQLITE3_CFLAGS"; then
-@@ -22425,14 +23950,16 @@
+@@ -22595,14 +24122,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$SQLITE3_PKG_ERRORS" >&5
  
@@ -14180,7 +14288,7 @@
  	SQLITE_MAJ_VER="3"
  fi
  
-@@ -22447,52 +23974,57 @@
+@@ -22618,52 +24147,57 @@
  
  
  
@@ -14197,12 +14305,12 @@
  
 -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"
@@ -14260,7 +14368,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -22500,7 +24032,7 @@
+@@ -22671,7 +24205,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
@@ -14269,7 +14377,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -22509,7 +24041,7 @@
+@@ -22680,7 +24214,7 @@
      esac
    fi
    cd ..
@@ -14278,7 +14386,7 @@
  fi
  
  # Standard set of common directories for X headers.
-@@ -22550,7 +24082,7 @@
+@@ -22721,7 +24255,7 @@
  /usr/openwin/share/include'
  
  if test "$ac_x_includes" = no; then
@@ -14287,7 +14395,7 @@
    # First, try using that file with no special directory specified.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22558,10 +24090,15 @@
+@@ -22729,10 +24263,15 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -14306,7 +14414,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -22585,12 +24122,13 @@
+@@ -22756,12 +24295,13 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
    for ac_dir in $ac_x_header_dirs; do
@@ -14321,7 +14429,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = no
  
-@@ -22599,41 +24137,53 @@
+@@ -22770,41 +24310,53 @@
    # See if we find them without any special options.
    # Don't add to $LIBS permanently.
    ac_save_LIBS=$LIBS
@@ -14386,7 +14494,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22644,49 +24194,54 @@
+@@ -22815,49 +24367,54 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14460,7 +14568,7 @@
  fi
  
  if test "$no_x" = yes; then
-@@ -22707,12 +24262,12 @@
+@@ -22878,12 +24435,12 @@
      X_LIBS="$X_LIBS -L$x_libraries"
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
@@ -14479,7 +14587,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -22728,43 +24283,48 @@
+@@ -22899,43 +24456,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14547,7 +14655,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -22780,47 +24340,58 @@
+@@ -22951,47 +24513,58 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14628,7 +14736,7 @@
    fi
  
    # Check for system-dependent libraries X programs must link with.
-@@ -22841,40 +24412,52 @@
+@@ -23012,40 +24585,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14693,7 +14801,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22883,8 +24466,8 @@
+@@ -23054,8 +24639,8 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14704,7 +14812,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22897,40 +24480,52 @@
+@@ -23068,40 +24653,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14769,7 +14877,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -22939,21 +24534,22 @@
+@@ -23110,21 +24707,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14798,7 +14906,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22966,40 +24562,52 @@
+@@ -23137,40 +24735,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -14863,7 +14971,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23008,21 +24616,23 @@
+@@ -23179,21 +24789,23 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -14892,7 +15000,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_xsave_LIBS"
  
-@@ -23034,8 +24644,8 @@
+@@ -23205,8 +24817,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.
@@ -14903,7 +15011,7 @@
  if test "${ac_cv_func_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23062,53 +24672,59 @@
+@@ -23233,53 +24845,59 @@
  
  #undef gethostbyname
  
@@ -14982,7 +15090,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23117,17 +24733,18 @@
+@@ -23288,17 +24906,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15007,7 +15115,7 @@
  if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23140,40 +24757,52 @@
+@@ -23311,40 +24930,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15072,7 +15180,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23182,21 +24811,22 @@
+@@ -23353,21 +24984,22 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15101,7 +15209,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23209,40 +24839,52 @@
+@@ -23380,40 +25012,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15166,7 +15274,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23251,14 +24893,15 @@
+@@ -23422,14 +25066,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15186,7 +15294,7 @@
  if test $ac_cv_lib_bsd_gethostbyname = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
  fi
-@@ -23273,8 +24916,8 @@
+@@ -23444,8 +25089,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.
@@ -15197,7 +15305,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23301,53 +24944,59 @@
+@@ -23472,53 +25117,59 @@
  
  #undef connect
  
@@ -15276,7 +15384,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23356,17 +25005,18 @@
+@@ -23527,17 +25178,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15301,7 +15409,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23379,40 +25029,52 @@
+@@ -23550,40 +25202,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15366,7 +15474,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23421,14 +25083,15 @@
+@@ -23592,14 +25256,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15386,7 +15494,7 @@
  if test $ac_cv_lib_socket_connect = yes; then
    X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
  fi
-@@ -23436,8 +25099,8 @@
+@@ -23607,8 +25272,8 @@
      fi
  
      # Guillermo Gomez says -lposix is necessary on A/UX.
@@ -15397,7 +15505,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23464,53 +25127,59 @@
+@@ -23635,53 +25300,59 @@
  
  #undef remove
  
@@ -15476,7 +15584,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23519,17 +25188,18 @@
+@@ -23690,17 +25361,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15501,7 +15609,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23542,40 +25212,52 @@
+@@ -23713,40 +25385,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15566,7 +15674,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23584,14 +25266,15 @@
+@@ -23755,14 +25439,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15586,7 +15694,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23599,8 +25282,8 @@
+@@ -23770,8 +25455,8 @@
      fi
  
      # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -15597,7 +15705,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23627,53 +25310,59 @@
+@@ -23798,53 +25483,59 @@
  
  #undef shmat
  
@@ -15676,7 +15784,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23682,17 +25371,18 @@
+@@ -23853,17 +25544,18 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15701,7 +15809,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23705,40 +25395,52 @@
+@@ -23876,40 +25568,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15766,7 +15874,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23747,14 +25449,15 @@
+@@ -23918,14 +25622,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15786,7 +15894,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23771,8 +25474,8 @@
+@@ -23942,8 +25647,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
@@ -15797,7 +15905,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23785,40 +25488,52 @@
+@@ -23956,40 +25661,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -15862,7 +15970,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23827,14 +25542,15 @@
+@@ -23998,14 +25715,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15882,7 +15990,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
  fi
-@@ -23852,17 +25568,17 @@
+@@ -24023,17 +25741,17 @@
  CFLAGS="$CFLAGS $X_CFLAGS"
  LDFLAGS="$LDFLAGS $X_LIBS"
  if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
@@ -15906,7 +16014,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23873,24 +25589,36 @@
+@@ -24044,24 +25762,36 @@
  #include <X11/extensions/scrnsaver.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -15951,7 +16059,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -23899,15 +25627,16 @@
+@@ -24070,15 +25800,16 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15974,7 +16082,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23916,8 +25645,13 @@
+@@ -24087,8 +25818,13 @@
  /* end confdefs.h.  */
  #include <X11/extensions/scrnsaver.h>
  _ACEOF
@@ -15990,7 +16098,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23941,9 +25675,10 @@
+@@ -24112,9 +25848,10 @@
  
    ac_header_preproc=no
  fi
@@ -16003,7 +16111,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23967,25 +25702,18 @@
+@@ -24138,25 +25875,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;}
@@ -16034,7 +16142,7 @@
  
  fi
  if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
-@@ -23995,8 +25723,8 @@
+@@ -24166,8 +25896,8 @@
  fi
  
  
@@ -16045,7 +16153,7 @@
  if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24009,40 +25737,52 @@
+@@ -24180,40 +25910,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16110,7 +16218,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -24051,14 +25791,15 @@
+@@ -24222,14 +25964,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16130,7 +16238,7 @@
  if test $ac_cv_lib_Xss_XScreenSaverQueryExtension = yes; then
    enable_libxss=yes
  else
-@@ -24089,13 +25830,13 @@
+@@ -24260,13 +26003,13 @@
  LDFLAGS="$OLD_LDFLAGS"
  LIBS="$OLD_LIBS"
  
@@ -16148,7 +16256,7 @@
  
  
  if test "x$enable_tbird" = "xyes"; then
-@@ -24108,13 +25849,13 @@
+@@ -24279,13 +26022,13 @@
  
  
  
@@ -16166,7 +16274,7 @@
  
  
  
-@@ -24133,8 +25874,8 @@
+@@ -24304,8 +26047,8 @@
  	# we get the GNOME prefix from libgnome-2.0
  
  pkg_failed=no
@@ -16177,7 +16285,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GNOME_VFS_CFLAGS"; then
-@@ -24238,16 +25979,16 @@
+@@ -24409,16 +26152,16 @@
  else
  	GNOME_VFS_CFLAGS=$pkg_cv_GNOME_VFS_CFLAGS
  	GNOME_VFS_LIBS=$pkg_cv_GNOME_VFS_LIBS
@@ -16198,7 +16306,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$BEAGLE_UI_CFLAGS"; then
-@@ -24421,16 +26162,16 @@
+@@ -24592,16 +26335,16 @@
  else
  	BEAGLE_UI_CFLAGS=$pkg_cv_BEAGLE_UI_CFLAGS
  	BEAGLE_UI_LIBS=$pkg_cv_BEAGLE_UI_LIBS
@@ -16219,7 +16327,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$UIGLUE_CFLAGS"; then
-@@ -24534,8 +26275,8 @@
+@@ -24705,8 +26448,8 @@
  else
  	UIGLUE_CFLAGS=$pkg_cv_UIGLUE_CFLAGS
  	UIGLUE_LIBS=$pkg_cv_UIGLUE_LIBS
@@ -16230,7 +16338,7 @@
  	:
  fi
  
-@@ -24547,8 +26288,8 @@
+@@ -24718,8 +26461,8 @@
  
  
  pkg_failed=no
@@ -16241,7 +16349,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBTRAYICON_CFLAGS"; then
-@@ -24682,8 +26423,8 @@
+@@ -24853,8 +26596,8 @@
  else
  	LIBTRAYICON_CFLAGS=$pkg_cv_LIBTRAYICON_CFLAGS
  	LIBTRAYICON_LIBS=$pkg_cv_LIBTRAYICON_LIBS
@@ -16252,7 +16360,7 @@
  	:
  fi
  
-@@ -24694,8 +26435,8 @@
+@@ -24865,8 +26608,8 @@
  
  
  pkg_failed=no
@@ -16263,7 +16371,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$OPEN_WITH_CFLAGS"; then
-@@ -24767,14 +26508,16 @@
+@@ -24938,14 +26681,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$OPEN_WITH_PKG_ERRORS" >&5
  
@@ -16283,7 +16391,7 @@
  	OPEN_WITH=yes
  fi
  
-@@ -24789,13 +26532,13 @@
+@@ -24960,13 +26705,13 @@
  
  
  
@@ -16301,7 +16409,7 @@
  
  
  EVO_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix evolution-sharp`
-@@ -24805,8 +26548,8 @@
+@@ -24976,8 +26721,8 @@
  
  
  pkg_failed=no
@@ -16312,7 +16420,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$EVO_CFLAGS"; then
-@@ -24878,14 +26621,16 @@
+@@ -25049,14 +26794,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$EVO_PKG_ERRORS" >&5
  
@@ -16332,7 +16440,7 @@
  	have_evo_dependencies=yes
  fi
  
-@@ -24937,13 +26682,13 @@
+@@ -25108,13 +26855,13 @@
  
  
  
@@ -16350,7 +16458,7 @@
  
  if test "x$os_has_inotify" = "xno"; then
  
-@@ -24980,8 +26725,8 @@
+@@ -25151,8 +26898,8 @@
  
  
  pkg_failed=no
@@ -16361,7 +16469,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GSF_SHARP_CFLAGS"; then
-@@ -25037,14 +26782,16 @@
+@@ -25208,14 +26955,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$GSF_SHARP_PKG_ERRORS" >&5
  
@@ -16381,7 +16489,7 @@
  	enable_gsf_sharp=yes
  fi
  
-@@ -25066,8 +26813,8 @@
+@@ -25237,8 +26986,8 @@
  
  
  pkg_failed=no
@@ -16392,7 +16500,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_CFLAGS"; then
-@@ -25171,14 +26918,14 @@
+@@ -25342,14 +27091,14 @@
  else
  	LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
  	LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
@@ -16411,7 +16519,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_API_CHECK_CFLAGS"; then
-@@ -25234,14 +26981,16 @@
+@@ -25405,14 +27154,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBEXIF_API_CHECK_PKG_ERRORS" >&5
  
@@ -16431,7 +16539,7 @@
  	have_old_libexif=no
  fi
  
-@@ -25250,8 +26999,8 @@
+@@ -25421,8 +27172,8 @@
  else
  
  pkg_failed=no
@@ -16442,7 +16550,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBEXIF_VERSION_CHECK_CFLAGS"; then
-@@ -25307,14 +27056,16 @@
+@@ -25478,14 +27229,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBEXIF_VERSION_CHECK_PKG_ERRORS" >&5
  
@@ -16462,7 +16570,7 @@
  	EXIF_SOVERSION=12
  fi
  fi
-@@ -25322,8 +27073,8 @@
+@@ -25493,8 +27246,8 @@
  
  
  pkg_failed=no
@@ -16473,7 +16581,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$BEAGLED_CFLAGS"; then
-@@ -25467,8 +27218,8 @@
+@@ -25638,8 +27391,8 @@
  else
  	BEAGLED_CFLAGS=$pkg_cv_BEAGLED_CFLAGS
  	BEAGLED_LIBS=$pkg_cv_BEAGLED_LIBS
@@ -16484,7 +16592,7 @@
  	:
  fi
  	BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_LIBS"
-@@ -25481,31 +27232,31 @@
+@@ -25652,31 +27405,31 @@
  
  
  
@@ -16526,7 +16634,7 @@
  if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25520,28 +27271,29 @@
+@@ -25691,28 +27444,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16562,7 +16670,7 @@
      fi
      if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
        have_gtk_doc=yes
-@@ -25549,14 +27301,14 @@
+@@ -25720,14 +27474,14 @@
  
    gtk_doc_min_version=1.0
      if test "$have_gtk_doc" = yes; then
@@ -16583,7 +16691,7 @@
          have_gtk_doc=no
        fi
      fi
-@@ -25588,13 +27340,13 @@
+@@ -25759,13 +27513,13 @@
  
  
  
@@ -16601,7 +16709,7 @@
  
  LIBBEAGLE_CURRENT=0
  
-@@ -25607,8 +27359,8 @@
+@@ -25778,8 +27532,8 @@
  
  
  pkg_failed=no
@@ -16612,7 +16720,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$LIBBEAGLE_CFLAGS"; then
-@@ -25688,14 +27440,16 @@
+@@ -25859,14 +27613,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$LIBBEAGLE_PKG_ERRORS" >&5
  
@@ -16632,7 +16740,7 @@
  	have_libbeagle_deps=yes
  fi
  
-@@ -25730,13 +27484,13 @@
+@@ -25901,13 +27657,13 @@
  fi
  
  
@@ -16650,7 +16758,7 @@
  
  
  if test "x$enable_bludgeon" = "xyes"; then
-@@ -25750,13 +27504,13 @@
+@@ -25921,13 +27677,13 @@
  
  
  
@@ -16668,7 +16776,7 @@
  
  if $PKG_CONFIG --exists epiphany-2.16; then
          EPIPHANY_MAJOR=2.16
-@@ -25787,8 +27541,8 @@
+@@ -25958,8 +27714,8 @@
  
  
  pkg_failed=no
@@ -16679,7 +16787,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$EPIPHANY_DEPENDENCY_CFLAGS"; then
-@@ -25884,14 +27638,16 @@
+@@ -26055,14 +27811,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$EPIPHANY_DEPENDENCY_PKG_ERRORS" >&5
  
@@ -16699,7 +16807,7 @@
  	have_epiphany_dependencies=yes
  fi
  
-@@ -25921,13 +27677,13 @@
+@@ -26092,13 +27850,13 @@
  fi
  
  
@@ -16717,7 +16825,7 @@
  
  
  
-@@ -25944,8 +27700,8 @@
+@@ -26115,8 +27873,8 @@
  
  
  pkg_failed=no
@@ -16728,7 +16836,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$GALAGO_CFLAGS"; then
-@@ -26001,14 +27757,16 @@
+@@ -26172,14 +27930,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$GALAGO_PKG_ERRORS" >&5
  
@@ -16748,7 +16856,7 @@
  	enable_galago=yes
  fi
  
-@@ -26036,8 +27794,8 @@
+@@ -26207,8 +27967,8 @@
  
  
  pkg_failed=no
@@ -16759,7 +16867,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$WV1_CFLAGS"; then
-@@ -26093,14 +27851,16 @@
+@@ -26264,14 +28024,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$WV1_PKG_ERRORS" >&5
  
@@ -16779,7 +16887,7 @@
  	enable_wv1=yes
  fi
  
-@@ -26120,8 +27880,8 @@
+@@ -26291,8 +28053,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
@@ -16790,7 +16898,7 @@
  if test "${ac_cv_path_KDE_CONFIG+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26136,28 +27896,29 @@
+@@ -26307,28 +28069,29 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16826,7 +16934,7 @@
  if test ! "x$KDE_CONFIG" = "xno"; then
  	KDE_PREFIX=`$KDE_CONFIG --prefix`
  	kde_prefix_print="$KDE_PREFIX"
-@@ -26191,8 +27952,8 @@
+@@ -26347,8 +28110,8 @@
  
  
  # Check for libchm for CHM filter
@@ -16837,7 +16945,7 @@
  if test "${ac_cv_lib_chm_chm_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26205,40 +27966,52 @@
+@@ -26361,40 +28124,52 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16902,7 +17010,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26247,14 +28020,15 @@
+@@ -26403,14 +28178,15 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16922,7 +17030,7 @@
  if test $ac_cv_lib_chm_chm_open = yes; then
    has_libchm=yes
  else
-@@ -26276,13 +28050,13 @@
+@@ -26432,13 +28208,13 @@
  
  BEAGLE_DEFINES=""
  
@@ -16940,7 +17048,7 @@
  
  if test "x$enable_xml_dump" = "xyes"; then
  
-@@ -26297,13 +28071,13 @@
+@@ -26453,13 +28229,13 @@
  
  
  
@@ -16958,7 +17066,7 @@
  
  have_python=no
  if test "x$enable_libbeagle" = "xyes" -a "x$enable_python" != "xno"; then
-@@ -26316,14 +28090,69 @@
+@@ -26472,14 +28248,69 @@
  
  
  
@@ -17036,7 +17144,7 @@
  if test "${ac_cv_path_PYTHON+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26338,33 +28167,31 @@
+@@ -26494,33 +28325,31 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17078,7 +17186,7 @@
  
  
    if test "$PYTHON" = :; then
-@@ -26374,15 +28201,15 @@
+@@ -26530,15 +28359,15 @@
    else
  
  
@@ -17098,7 +17206,7 @@
    PYTHON_VERSION=$am_cv_python_version
  
  
-@@ -26393,30 +28220,30 @@
+@@ -26549,30 +28378,30 @@
  
  
  
@@ -17137,7 +17245,7 @@
    pythondir=$am_cv_python_pythondir
  
  
-@@ -26424,16 +28251,16 @@
+@@ -26580,16 +28409,16 @@
    pkgpythondir=\${pythondir}/$PACKAGE
  
  
@@ -17158,7 +17266,7 @@
    pyexecdir=$am_cv_python_pyexecdir
  
  
-@@ -26474,8 +28301,8 @@
+@@ -26630,8 +28459,8 @@
  echo "$as_me: WARNING: Python version $PYTHON_REQUIRED not found" >&2;}
  	else
  
@@ -17169,7 +17277,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}"
-@@ -26493,8 +28320,13 @@
+@@ -26649,8 +28478,13 @@
  /* end confdefs.h.  */
  #include <Python.h>
  _ACEOF
@@ -17185,7 +17293,7 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -26511,17 +28343,18 @@
+@@ -26667,17 +28501,18 @@
    ac_cpp_err=yes
  fi
  if test -z "$ac_cpp_err"; then
@@ -17208,7 +17316,7 @@
  rm -f conftest.err conftest.$ac_ext
  CPPFLAGS="$save_CPPFLAGS"
  
-@@ -26533,8 +28366,8 @@
+@@ -26689,8 +28524,8 @@
  	else
  
  pkg_failed=no
@@ -17219,7 +17327,7 @@
  
  if test -n "$PKG_CONFIG"; then
      if test -n "$PYBEAGLE_CFLAGS"; then
-@@ -26598,14 +28431,16 @@
+@@ -26754,14 +28589,16 @@
  	# Put the nasty error message in config.log where it belongs
  	echo "$PYBEAGLE_PKG_ERRORS" >&5
  
@@ -17239,7 +17347,7 @@
  	have_pygtk_deps=yes
  fi
  	fi
-@@ -26616,8 +28451,8 @@
+@@ -26772,8 +28609,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
@@ -17250,7 +17358,7 @@
  if test "${ac_cv_path_PYGTK_CODEGEN+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26632,39 +28467,40 @@
+@@ -26788,39 +28625,40 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17301,17 +17409,17 @@
  
  		have_python=yes
  	fi
-@@ -26697,7 +28533,8 @@
+@@ -26853,7 +28691,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 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"
+-                                                                                                                                                                                                                                                                                                            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 tools/beagle-settings.desktop.in search/Makefile search/beagle-search.desktop.in 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 tools/beagle-settings.desktop.in search/Makefile search/beagle-search.desktop.in 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
-@@ -26716,39 +28553,58 @@
+@@ -26872,39 +28711,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -17386,7 +17494,7 @@
    fi
  fi
  rm -f confcache
-@@ -26757,32 +28613,18 @@
+@@ -26913,32 +28771,18 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -17425,7 +17533,7 @@
  done
  LIBOBJS=$ac_libobjs
  
-@@ -26853,7 +28695,7 @@
+@@ -27009,7 +28853,7 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -17434,7 +17542,7 @@
  
  
  if test -z "${ENABLE_LIBXSS_TRUE}" && test -z "${ENABLE_LIBXSS_FALSE}"; then
-@@ -27020,11 +28862,35 @@
+@@ -27169,11 +29013,35 @@
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -17472,7 +17580,7 @@
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
    as_unset=unset
-@@ -27033,8 +28899,43 @@
+@@ -27182,8 +29050,43 @@
  fi
  
  
@@ -17517,7 +17625,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -27048,18 +28949,19 @@
+@@ -27197,18 +29100,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -17540,7 +17648,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -27067,159 +28969,120 @@
+@@ -27216,159 +29120,120 @@
  
  
  # Name of the executable.
@@ -17771,7 +17879,7 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -27228,7 +29091,19 @@
+@@ -27377,7 +29242,19 @@
    as_mkdir_p=false
  fi
  
@@ -17792,7 +17900,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'"
-@@ -27237,31 +29112,14 @@
+@@ -27386,31 +29263,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -17828,7 +17936,7 @@
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -27269,30 +29127,20 @@
+@@ -27418,30 +29278,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -17867,7 +17975,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -27300,7 +29148,7 @@
+@@ -27449,7 +29299,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -17876,7 +17984,7 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -27319,19 +29167,21 @@
+@@ -27468,19 +29318,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -17904,7 +18012,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -27342,39 +29192,24 @@
+@@ -27491,39 +29343,24 @@
  do
    case $1 in
    --*=*)
@@ -17950,7 +18058,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -27384,18 +29219,24 @@
+@@ -27533,18 +29370,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -17980,7 +18088,7 @@
  
    esac
    shift
-@@ -27411,17 +29252,28 @@
+@@ -27560,17 +29403,28 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -18013,7 +18121,7 @@
  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"
-@@ -27432,52 +29284,53 @@
+@@ -27581,54 +29435,55 @@
  
  _ACEOF
  
@@ -18035,7 +18143,9 @@
 -  "beagled/Makefile" ) CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
 -  "Filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
 -  "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
+-  "tools/beagle-settings.desktop.in" ) CONFIG_FILES="$CONFIG_FILES tools/beagle-settings.desktop.in" ;;
 -  "search/Makefile" ) CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
+-  "search/beagle-search.desktop.in" ) CONFIG_FILES="$CONFIG_FILES search/beagle-search.desktop.in" ;;
 -  "ImLogViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
 -  "ContactViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ContactViewer/Makefile" ;;
 -  "libbeagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
@@ -18073,7 +18183,9 @@
 +    "beagled/Makefile") CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
 +    "Filters/Makefile") CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
 +    "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
++    "tools/beagle-settings.desktop.in") CONFIG_FILES="$CONFIG_FILES tools/beagle-settings.desktop.in" ;;
 +    "search/Makefile") CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
++    "search/beagle-search.desktop.in") CONFIG_FILES="$CONFIG_FILES search/beagle-search.desktop.in" ;;
 +    "ImLogViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
 +    "ContactViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ContactViewer/Makefile" ;;
 +    "libbeagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
@@ -18104,7 +18216,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
-@@ -27489,776 +29342,806 @@
+@@ -27640,525 +29495,673 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -18406,8 +18518,6 @@
 -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
@@ -18814,8 +18924,6 @@
 +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
@@ -18840,8 +18948,8 @@
 +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
++
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -18857,11 +18965,11 @@
 +  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
++_ACEOF
 +sed '
 +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
 +s/^/s,@/; s/!/@,|#_!!_#|/
@@ -18876,7 +18984,7 @@
 +:end
 +s/|#_!!_#|//g
 +CEOF$ac_eof
-+_ACEOF
+ _ACEOF
 +
 +
 +# VPATH may cause trouble with some makes, so we remove $(srcdir),
@@ -19224,8 +19332,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
@@ -19234,15 +19342,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
- _ACEOF
+@@ -28166,248 +30169,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -19590,7 +19698,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -28269,135 +30152,39 @@
+@@ -28418,135 +30303,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -19752,7 +19860,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.
-@@ -28407,18 +30194,29 @@
+@@ -28556,18 +30345,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
@@ -19790,7 +19898,7 @@
    else
      continue
    fi
-@@ -28440,49 +30238,76 @@
+@@ -28589,49 +30389,76 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -19894,7 +20002,7 @@
  
  for file in intltool-extract intltool-merge intltool-update; do
    sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-@@ -28503,10 +30328,10 @@
+@@ -28652,10 +30479,10 @@
  done
  
   ;;
@@ -19907,7 +20015,7 @@
      rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
      >"po/stamp-it.tmp"
      sed '/^#/d
-@@ -28529,11 +30354,10 @@
+@@ -28678,11 +30505,10 @@
      rm -f "po/Makefile.tmp"
      mv "po/stamp-it.tmp" "po/stamp-it"
     ;;
@@ -19921,9 +20029,9 @@
  
  { (exit 0); exit 0; }
  _ACEOF
-diff -urNad beagle-0.2.10~/ltmain.sh beagle-0.2.10/ltmain.sh
---- beagle-0.2.10~/ltmain.sh	2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.10/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
+diff -urNad beagle-0.2.11~/ltmain.sh beagle-0.2.11/ltmain.sh
+--- beagle-0.2.11~/ltmain.sh	2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.11/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
 @@ -43,7 +43,7 @@
  
  PROGRAM=ltmain.sh




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