[Pkg-mono-svn-commits] rev 2689 - in beagle/trunk/debian: . patches
Jose Carlos Garcia Sogo
jsogo at costa.debian.org
Sat Sep 2 12:27:07 UTC 2006
Author: jsogo
Date: 2006-09-02 12:27:06 +0000 (Sat, 02 Sep 2006)
New Revision: 2689
Added:
beagle/trunk/debian/patches/crawl-system_in.dpatch
Removed:
beagle/trunk/debian/patches/beagled-manpage.dpatch
Modified:
beagle/trunk/debian/beagle-backend-evolution.dirs
beagle/trunk/debian/beagle.dirs
beagle/trunk/debian/changelog
beagle/trunk/debian/patches/00list
beagle/trunk/debian/patches/relibtoolize.dpatch
beagle/trunk/debian/patches/usebash.dpatch
beagle/trunk/debian/rules
Log:
* beagle (0.2.9-1)
- New upstream
+ don't crash if there is no default browser set
+ fix some DllImport calls to avoid the need of devel packages
- Move thunderbird backend to main package
- debian/patches:
+ update 'relibtoolize' and usebash patches, and create a new 'crawl-system_in' patch to check for beagle being installed before trying to run
Modified: beagle/trunk/debian/beagle-backend-evolution.dirs
===================================================================
--- beagle/trunk/debian/beagle-backend-evolution.dirs 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/beagle-backend-evolution.dirs 2006-09-02 12:27:06 UTC (rev 2689)
@@ -1 +1 @@
-usr/lib/beagle
+usr/lib/beagle/Backends
Modified: beagle/trunk/debian/beagle.dirs
===================================================================
--- beagle/trunk/debian/beagle.dirs 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/beagle.dirs 2006-09-02 12:27:06 UTC (rev 2689)
@@ -1,6 +1,6 @@
usr/bin
usr/sbin
-usr/lib/beagle
+usr/lib/beagle/Backends
etc/xdg/autostart
usr/share/autostart
usr/share/doc/beagle/mozilla-extension
Modified: beagle/trunk/debian/changelog
===================================================================
--- beagle/trunk/debian/changelog 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/changelog 2006-09-02 12:27:06 UTC (rev 2689)
@@ -1,3 +1,19 @@
+beagle (0.2.9-1) unstable; urgency=low
+
+ * New upstream release
+ + Don't crash if 'default browser' is not properly set (Closes: #357530)
+ + Fix some DllImport calls so development packages for those libraries
+ are not needed. (Closes: #385097)
+ * Move thunderbird backend to main package, as it does not bring any new
+ dependencies. (Closes: #385056)
+ * debian/patches:
+ + usebash: updated,
+ + relibtoolize: updated,
+ + crawl-system_in: new; checks that beagle exists before running
+ and use 'set -e' (Closes: #366486)
+
+ -- Jose Carlos Garcia Sogo <jsogo at debian.org> Sat, 2 Sep 2006 13:30:42 +0200
+
beagle (0.2.8-1) unstable; urgency=low
* New upstream version.
Modified: beagle/trunk/debian/patches/00list
===================================================================
--- beagle/trunk/debian/patches/00list 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/patches/00list 2006-09-02 12:27:06 UTC (rev 2689)
@@ -4,3 +4,4 @@
use-python2.4.dpatch
relibtoolize.dpatch
crawl-rules.dpatch
+crawl-system_in.dpatch
Deleted: beagle/trunk/debian/patches/beagled-manpage.dpatch
===================================================================
--- beagle/trunk/debian/patches/beagled-manpage.dpatch 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/patches/beagled-manpage.dpatch 2006-09-02 12:27:06 UTC (rev 2689)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## beagled-manpage.dpatch by Brandon Hale <brandon at ubuntu.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad beagle-0.2.5~/beagled/beagled.1 beagle-0.2.5/beagled/beagled.1
---- beagle-0.2.5~/beagled/beagled.1 2005-08-01 16:40:42.000000000 -0400
-+++ beagle-0.2.5/beagled/beagled.1 2006-04-30 09:27:57.000000000 -0400
-@@ -26,7 +26,7 @@
- are thus not required for standard use.
- .TP
- .B --foreground|--fg
--If specified, execute the Beagle daemon in the background.
-+If specified, execute the Beagle daemon in the foreground.
- .TP
- .B --background|--bg
- If specified, execute the Beagle daemon in the background (default).
Added: beagle/trunk/debian/patches/crawl-system_in.dpatch
===================================================================
--- beagle/trunk/debian/patches/crawl-system_in.dpatch (rev 0)
+++ beagle/trunk/debian/patches/crawl-system_in.dpatch 2006-09-02 12:27:06 UTC (rev 2689)
@@ -0,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## crawl-system_in.dpatch by Jose Carlos Garcia Sogo <jsogo at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: add 'set -e' line to script and check that beagle is available before
+## trying to execute the script further.
+
+ at DPATCH@
+diff -urNad beagle-0.2.9~/tools/beagle-crawl-system.in beagle-0.2.9/tools/beagle-crawl-system.in
+--- beagle-0.2.9~/tools/beagle-crawl-system.in 2006-06-19 19:54:27.000000000 +0200
++++ beagle-0.2.9/tools/beagle-crawl-system.in 2006-09-02 13:20:44.000000000 +0200
+@@ -1,4 +1,5 @@
+ #!/bin/bash
++set -e
+
+ #
+ # beagle-crawl-system
+@@ -26,6 +27,10 @@
+ # SOFTWARE.
+ #
+
++if [ ! -x @sbindir@/beagle-build-index ]; then
++ exit 0
++fi
++
+ umask 022
+
+ CRAWL_USER=beagleindex
Property changes on: beagle/trunk/debian/patches/crawl-system_in.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: beagle/trunk/debian/patches/relibtoolize.dpatch
===================================================================
--- beagle/trunk/debian/patches/relibtoolize.dpatch 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/patches/relibtoolize.dpatch 2006-09-02 12:27:06 UTC (rev 2689)
@@ -5,10 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad beagle-0.2.8~/aclocal.m4 beagle-0.2.8/aclocal.m4
---- beagle-0.2.8~/aclocal.m4 2006-08-17 18:17:05.000000000 +0200
-+++ beagle-0.2.8/aclocal.m4 2006-08-24 12:00:52.000000000 +0200
-@@ -11,27 +11,429 @@
+diff -urNad beagle-0.2.9~/aclocal.m4 beagle-0.2.9/aclocal.m4
+--- beagle-0.2.9~/aclocal.m4 2006-09-01 17:54:44.000000000 +0200
++++ beagle-0.2.9/aclocal.m4 2006-09-02 13:29:53.000000000 +0200
+@@ -11,6 +11,405 @@
# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
# PARTICULAR PURPOSE.
@@ -413,229 +413,9 @@
+
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 2 IT_PROG_INTLTOOL
-+# serial 35 IT_PROG_INTLTOOL
- AC_DEFUN([IT_PROG_INTLTOOL],
--[
-+[AC_PREREQ([2.50])dnl
-+
-+case "$am__api_version" in
-+ 1.[01234])
-+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
-+ ;;
-+ *)
-+ ;;
-+esac
+ # serial 35 IT_PROG_INTLTOOL
+@@ -195,7 +594,7 @@
- if test -n "$1"; then
- AC_MSG_CHECKING(for intltool >= $1)
-
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
-- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${ac_aux_dir}/intltool-update.in`
-- changequote({{,}})
-- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-- changequote([,])
--
-- if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-- else
-- AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.])
-- exit 1
-- fi
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-+ ]
-+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
- fi
-
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-@@ -51,6 +453,7 @@
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-
- AC_SUBST(INTLTOOL_DESKTOP_RULE)
- AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-@@ -69,16 +472,12 @@
- AC_SUBST(INTLTOOL_CAVES_RULE)
- AC_SUBST(INTLTOOL_SCHEMAS_RULE)
- AC_SUBST(INTLTOOL_THEME_RULE)
-+AC_SUBST(INTLTOOL_SERVICE_RULE)
-
- # Use the tools built into the package, not the ones that are installed.
--
--INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
--AC_SUBST(INTLTOOL_EXTRACT)
--AC_SUBST(INTLTOOL_MERGE)
--AC_SUBST(INTLTOOL_UPDATE)
-+AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-+AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-+AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
-
- AC_PATH_PROG(INTLTOOL_PERL, perl)
- if test -z "$INTLTOOL_PERL"; then
-@@ -101,81 +500,101 @@
- AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
- AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
-
--# Remove file type tags (using []) from po/POTFILES.
--
--ifdef([AC_DIVERSION_ICMDS],[
-- AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-- [mv -f po/POTFILES po/POTFILES.tmp
-- sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-- rm -f po/POTFILES.tmp
-- ]dnl
-- AC_DIVERT_POP()
--],[
-- ifdef([AC_CONFIG_COMMANDS_PRE],[
-- AC_CONFIG_COMMANDS_PRE([
-- [mv -f po/POTFILES po/POTFILES.tmp
-- sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-- rm -f po/POTFILES.tmp
-- ]dnl
-- ])
-- ])
--])
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-+AC_SUBST(ALL_LINGUAS)
-+
-+IT_PO_SUBDIR([po])
-
--# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-+dnl The following is very similar to
-+dnl
-+dnl AC_CONFIG_FILES([intltool-extract intltool-merge intltool-update])
-+dnl
-+dnl with the following slight differences:
-+dnl - the *.in files are in ac_aux_dir,
-+dnl - if the file haven't changed upon reconfigure, it's not touched,
-+dnl - the evaluation of the third parameter enables a hack which computes
-+dnl the actual value of $libdir,
-+dnl - the user sees "executing intltool commands", instead of
-+dnl "creating intltool-extract" and such.
-+dnl
-+dnl Nothing crucial here, and we could use AC_CONFIG_FILES, if there were
-+dnl a reason for it.
-
- AC_CONFIG_COMMANDS([intltool], [
-
--intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-- -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-- -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-- -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-- -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-- -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
--
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-- > intltool-extract.out
--if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-- rm -f intltool-extract.out
--else
-- mv -f intltool-extract.out intltool-extract
--fi
--chmod ugo+x intltool-extract
--chmod u+w intltool-extract
-+for file in intltool-extract intltool-merge intltool-update; do
-+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-+ < ${ac_aux_dir}/${file}.in > ${file}.out
-+ if cmp -s ${file} ${file}.out 2>/dev/null; then
-+ rm -f ${file}.out
-+ else
-+ mv -f ${file}.out ${file}
-+ fi
-+ chmod ugo+x ${file}
-+ chmod u+w ${file}
-+done
-
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-- > intltool-merge.out
--if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-- rm -f intltool-merge.out
--else
-- mv -f intltool-merge.out intltool-merge
--fi
--chmod ugo+x intltool-merge
--chmod u+w intltool-merge
-+],
-+[INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'])
-
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-- > intltool-update.out
--if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-- rm -f intltool-update.out
--else
-- mv -f intltool-update.out intltool-update
--fi
--chmod ugo+x intltool-update
--chmod u+w intltool-update
-+])
-
--], INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
--MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
--XGETTEXT='${INTLTOOL_XGETTEXT}')
-
-+# IT_PO_SUBDIR(DIRNAME)
-+# ---------------------
-+# All po subdirs have to be declared with this macro; the subdir "po" is
-+# declared by IT_PROG_INTLTOOL.
-+#
-+AC_DEFUN([IT_PO_SUBDIR],
-+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
-+dnl
-+dnl The following CONFIG_COMMANDS should be exetuted at the very end
-+dnl of config.status.
-+AC_CONFIG_COMMANDS_PRE([
-+ AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
-+ >"$1/stamp-it.tmp"
-+ [sed '/^#/d
-+ s/^[[].*] *//
-+ /^[ ]*$/d
-+ '"s|^| $ac_top_srcdir/|" \
-+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
-+ ]
-+ if test ! -f "$1/Makefile"; then
-+ AC_MSG_ERROR([$1/Makefile is not ready.])
-+ fi
-+ mv "$1/Makefile" "$1/Makefile.tmp"
-+ [sed '/^POTFILES =/,/[^\\]$/ {
-+ /^POTFILES =/!d
-+ r $1/POTFILES
-+ }
-+ ' "$1/Makefile.tmp" >"$1/Makefile"]
-+ rm -f "$1/Makefile.tmp"
-+ mv "$1/stamp-it.tmp" "$1/stamp-it"
-+ ])
-+])dnl
- ])
-
-+
- # deprecated macros
--AC_DEFUN([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL($@)])
-+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
-+# A hint is needed for aclocal from Automake <= 1.9.4:
-+# AC_DEFUN([AC_PROG_INTLTOOL], ...)
-
-
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 48 AC_PROG_LIBTOOL
@@ -643,7 +423,7 @@
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -1559,18 +1978,6 @@
+@@ -1579,18 +1978,6 @@
dynamic_linker=no
;;
@@ -662,7 +442,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -1726,7 +2133,7 @@
+@@ -1746,7 +2133,7 @@
;;
# This must be Linux ELF.
@@ -671,7 +451,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1755,7 +2162,7 @@
+@@ -1775,7 +2162,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -680,7 +460,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -1764,7 +2171,7 @@
+@@ -1784,7 +2171,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -689,7 +469,7 @@
;;
netbsd*)
-@@ -2472,7 +2879,7 @@
+@@ -2492,7 +2879,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -698,7 +478,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -2526,11 +2933,11 @@
+@@ -2546,11 +2933,11 @@
;;
# This must be Linux ELF.
@@ -712,7 +492,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
-@@ -3278,7 +3685,7 @@
+@@ -3298,7 +3685,7 @@
freebsd-elf*)
_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
;;
@@ -721,7 +501,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -3437,7 +3844,7 @@
+@@ -3457,7 +3844,7 @@
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
;;
@@ -730,7 +510,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -3539,7 +3946,7 @@
+@@ -3559,7 +3946,7 @@
;;
esac
;;
@@ -739,7 +519,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
wlarc=
-@@ -4804,7 +5211,7 @@
+@@ -4824,7 +5211,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'"
;;
@@ -748,7 +528,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'"
-@@ -5077,7 +5484,7 @@
+@@ -5097,7 +5484,7 @@
;;
esac
;;
@@ -757,7 +537,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -5120,7 +5527,7 @@
+@@ -5140,7 +5527,7 @@
;;
esac
;;
@@ -766,7 +546,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -5163,7 +5570,7 @@
+@@ -5183,7 +5570,7 @@
;;
esac
;;
@@ -775,7 +555,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -5374,7 +5781,7 @@
+@@ -5394,7 +5781,7 @@
_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
@@ -784,7 +564,7 @@
case $cc_basename in
icc* | ecc*)
_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-@@ -5515,6 +5922,9 @@
+@@ -5535,6 +5922,9 @@
cygwin* | mingw*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
;;
@@ -794,7 +574,7 @@
*)
_LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
;;
-@@ -5685,7 +6095,7 @@
+@@ -5705,7 +6095,7 @@
_LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
@@ -803,7 +583,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -5711,12 +6121,13 @@
+@@ -5731,12 +6121,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
@@ -818,7 +598,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -6046,7 +6457,7 @@
+@@ -6066,7 +6457,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -827,7 +607,7 @@
_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-@@ -6148,7 +6559,7 @@
+@@ -6168,7 +6559,7 @@
_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
;;
@@ -836,7 +616,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
else
-@@ -6688,7 +7099,8 @@
+@@ -6708,7 +7099,8 @@
_PKG_TEXT
])],
@@ -846,7 +626,7 @@
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
-@@ -7766,391 +8178,4 @@
+@@ -7786,391 +8178,4 @@
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
@@ -1238,9 +1018,9 @@
-])dnl
-
m4_include([acinclude.m4])
-diff -urNad beagle-0.2.8~/config.guess beagle-0.2.8/config.guess
---- beagle-0.2.8~/config.guess 2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.8/config.guess 2006-08-10 17:17:12.000000000 +0200
+diff -urNad beagle-0.2.9~/config.guess beagle-0.2.9/config.guess
+--- beagle-0.2.9~/config.guess 2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.9/config.guess 2006-08-10 17:17:12.000000000 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
@@ -1522,9 +1302,9 @@
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
-diff -urNad beagle-0.2.8~/config.sub beagle-0.2.8/config.sub
---- beagle-0.2.8~/config.sub 2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.8/config.sub 2006-08-10 17:17:12.000000000 +0200
+diff -urNad beagle-0.2.9~/config.sub beagle-0.2.9/config.sub
+--- beagle-0.2.9~/config.sub 2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.9/config.sub 2006-08-10 17:17:12.000000000 +0200
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
@@ -1791,14 +1571,14 @@
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
-diff -urNad beagle-0.2.8~/configure beagle-0.2.8/configure
---- beagle-0.2.8~/configure 2006-08-17 18:17:20.000000000 +0200
-+++ beagle-0.2.8/configure 2006-08-24 12:00:59.000000000 +0200
+diff -urNad beagle-0.2.9~/configure beagle-0.2.9/configure
+--- beagle-0.2.9~/configure 2006-09-01 17:54:56.000000000 +0200
++++ beagle-0.2.9/configure 2006-09-02 13:30:00.000000000 +0200
@@ -1,8 +1,9 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60.
++# Generated by GNU Autoconf 2.60a.
#
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2469,23 +2249,57 @@
# Identity of this package.
PACKAGE_NAME=
PACKAGE_TARNAME=
-@@ -454,17 +744,349 @@
+@@ -429,42 +719,374 @@
+ # Factoring default headers for most tests.
+ ac_includes_default="\
+ #include <stdio.h>
+-#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
+ # include <sys/types.h>
#endif
- #if HAVE_INTTYPES_H
+-#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
+ # include <sys/stat.h>
+ #endif
+-#if STDC_HEADERS
++#ifdef STDC_HEADERS
+ # include <stdlib.h>
+ # include <stddef.h>
+ #else
+-# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
+ # include <stdlib.h>
+ # endif
+ #endif
+-#if HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+ # include <memory.h>
+ # endif
+ # include <string.h>
+ #endif
+-#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
+ # include <strings.h>
+ #endif
+-#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-# include <stdint.h>
-# endif
-+#endif
-+#if HAVE_STDINT_H
-+# include <stdint.h>
#endif
- #if HAVE_UNISTD_H
+-#if HAVE_UNISTD_H
++#ifdef HAVE_STDINT_H
++# include <stdint.h>
++#endif
++#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASH ZIP MONO MCS ac_pt_PKG_CONFIG MONO_CFLAGS MONO_LIBS SHARPZIPLIB_LIBS OS_LINUX_TRUE OS_LINUX_FALSE OS_FREEBSD_TRUE OS_FREEBSD_FALSE DESKTOP_LAUNCH ENABLE_DESKTOP_LAUNCH_TRUE ENABLE_DESKTOP_LAUNCH_FALSE WSDL ENABLE_GOOGLEDRIVER_TRUE ENABLE_GOOGLEDRIVER_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB SQLITE_CFLAGS SQLITE_LIBS SQLITE3_CFLAGS SQLITE3_LIBS SQLITE_MAJ_VER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS 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 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
@@ -3575,7 +3389,7 @@
if $ac_init_version; then
cat <<\_ACEOF
+configure
-+generated by GNU Autoconf 2.60
++generated by GNU Autoconf 2.60a
-Copyright (C) 2003 Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -3594,7 +3408,7 @@
It was created by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
$ $0 $@
@@ -4906,7 +4720,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -2885,46 +3433,70 @@
+@@ -2885,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.
@@ -4960,7 +4774,7 @@
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
+# so that the user can short-circuit this test for compilers unknown to
+# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -4997,16 +4811,21 @@
+test "$ac_cv_exeext" = no && ac_cv_exeext=
+
else
++ ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -2937,19 +3509,23 @@
+
+@@ -2937,19 +3515,21 @@
fi
ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-# Check the compiler produces executables we can run. If not, either
+# Check that the compiler produces executables we can run. If not, either
@@ -5030,7 +4849,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -2968,22 +3544,27 @@
+@@ -2968,22 +3548,27 @@
fi
fi
fi
@@ -5069,7 +4888,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
-@@ -2994,9 +3575,8 @@
+@@ -2994,9 +3579,8 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
@@ -5080,7 +4899,7 @@
break;;
* ) break;;
esac
-@@ -3010,14 +3590,14 @@
+@@ -3010,14 +3594,14 @@
fi
rm -f conftest$ac_cv_exeext
@@ -5099,7 +4918,7 @@
if test "${ac_cv_objext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3037,14 +3617,20 @@
+@@ -3037,14 +3621,20 @@
}
_ACEOF
rm -f conftest.o conftest.obj
@@ -5124,7 +4943,7 @@
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
-@@ -3062,12 +3648,12 @@
+@@ -3062,12 +3652,12 @@
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
@@ -5141,7 +4960,7 @@
if test "${ac_cv_c_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3090,24 +3676,36 @@
+@@ -3090,24 +3680,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5186,7 +5005,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3116,24 +3714,28 @@
+@@ -3116,24 +3718,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5223,7 +5042,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -3149,24 +3751,36 @@
+@@ -3149,24 +3755,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -5268,7 +5087,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -3175,12 +3789,131 @@
+@@ -3175,12 +3793,131 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -5404,7 +5223,7 @@
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
-@@ -3196,12 +3929,12 @@
+@@ -3196,12 +3933,12 @@
CFLAGS=
fi
fi
@@ -5421,7 +5240,7 @@
ac_save_CC=$CC
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -3235,12 +3968,17 @@
+@@ -3235,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
@@ -5441,7 +5260,7 @@
int test (int i, double x);
struct s1 {int (*f) (int a);};
struct s2 {int (*f) (double a);};
-@@ -3255,205 +3993,74 @@
+@@ -3255,205 +3997,74 @@
return 0;
}
_ACEOF
@@ -5686,7 +5505,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3462,8 +4069,8 @@
+@@ -3462,8 +4073,8 @@
depcc="$CC" am_compiler_list=
@@ -5697,7 +5516,7 @@
if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3552,8 +4159,8 @@
+@@ -3552,8 +4163,8 @@
fi
fi
@@ -5708,7 +5527,7 @@
CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-@@ -3569,8 +4176,8 @@
+@@ -3569,8 +4180,8 @@
fi
@@ -5719,7 +5538,7 @@
if test "${lt_cv_path_SED+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3623,37 +4230,184 @@
+@@ -3623,37 +4234,184 @@
fi
SED=$lt_cv_path_SED
@@ -5793,24 +5612,24 @@
+IFS=$as_save_IFS
+
+
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
-
++fi
++
+GREP="$ac_cv_path_GREP"
+if test -z "$GREP"; then
+ { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ { (exit 1); exit 1; }; }
-+fi
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+else
+ ac_cv_path_GREP=$GREP
+fi
+
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-+
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -5921,7 +5740,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -3682,11 +4436,11 @@
+@@ -3682,11 +4440,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -5937,7 +5756,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -3719,17 +4473,17 @@
+@@ -3719,17 +4477,17 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -5961,7 +5780,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3743,20 +4497,20 @@
+@@ -3743,20 +4501,20 @@
;;
esac
fi
@@ -5988,7 +5807,7 @@
reload_flag=$lt_cv_ld_reload_flag
case $reload_flag in
"" | " "*) ;;
-@@ -3773,8 +4527,8 @@
+@@ -3773,8 +4531,8 @@
;;
esac
@@ -5999,7 +5818,7 @@
if test "${lt_cv_path_NM+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3822,23 +4576,23 @@
+@@ -3822,23 +4580,23 @@
test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
fi
fi
@@ -6033,7 +5852,7 @@
if test "${lt_cv_deplibs_check_method+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -3888,7 +4642,7 @@
+@@ -3888,7 +4646,7 @@
lt_cv_deplibs_check_method=pass_all
;;
@@ -6042,7 +5861,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
case $host_cpu in
i*86 )
-@@ -3942,11 +4696,11 @@
+@@ -3942,11 +4700,11 @@
;;
# This must be Linux ELF.
@@ -6056,7 +5875,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 +4767,8 @@
+@@ -4013,8 +4771,8 @@
esac
fi
@@ -6067,7 +5886,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 +4786,11 @@
+@@ -4032,11 +4790,11 @@
compiler=$CC
@@ -6082,16 +5901,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 +4817,7 @@
+@@ -4063,7 +4821,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4066 "configure"' > conftest.$ac_ext
-+ echo '#line 4820 "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 +4902,8 @@
+@@ -4148,8 +4906,8 @@
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
SAVE_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -belf"
@@ -6102,7 +5921,7 @@
if test "${lt_cv_cc_needs_belf+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4175,24 +4929,36 @@
+@@ -4175,24 +4933,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -6147,7 +5966,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4201,9 +4967,10 @@
+@@ -4201,9 +4971,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6156,11 +5975,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
-@@ -4212,8 +4979,8 @@
+@@ -4212,8 +4983,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
@@ -6171,7 +5990,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 +5017,8 @@
+@@ -4250,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
@@ -6182,7 +6001,7 @@
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
-@@ -4285,8 +5052,13 @@
+@@ -4285,8 +5056,13 @@
#endif
Syntax error
_ACEOF
@@ -6198,7 +6017,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4311,9 +5083,10 @@
+@@ -4311,9 +5087,10 @@
# Broken: fails on valid input.
continue
fi
@@ -6210,7 +6029,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4323,8 +5096,13 @@
+@@ -4323,8 +5100,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6226,7 +6045,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4351,6 +5129,7 @@
+@@ -4351,6 +5133,7 @@
ac_preproc_ok=:
break
fi
@@ -6234,7 +6053,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -4368,8 +5147,8 @@
+@@ -4368,8 +5151,8 @@
else
ac_cv_prog_CPP=$CPP
fi
@@ -6245,7 +6064,7 @@
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
-@@ -4392,8 +5171,13 @@
+@@ -4392,8 +5175,13 @@
#endif
Syntax error
_ACEOF
@@ -6261,7 +6080,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4418,9 +5202,10 @@
+@@ -4418,9 +5206,10 @@
# Broken: fails on valid input.
continue
fi
@@ -6273,7 +6092,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -4430,8 +5215,13 @@
+@@ -4430,8 +5219,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -6289,7 +6108,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4458,6 +5248,7 @@
+@@ -4458,6 +5252,7 @@
ac_preproc_ok=:
break
fi
@@ -6297,7 +6116,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -4480,8 +5271,8 @@
+@@ -4480,8 +5275,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -6308,7 +6127,7 @@
if test "${ac_cv_header_stdc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4505,24 +5296,36 @@
+@@ -4505,24 +5300,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -6353,7 +6172,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4531,9 +5334,10 @@
+@@ -4531,9 +5338,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6366,7 +6185,7 @@
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -4589,6 +5393,7 @@
+@@ -4589,6 +5397,7 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
@@ -6374,7 +6193,7 @@
#if ((' ' & 0x0FF) == 0x020)
# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -4608,18 +5413,27 @@
+@@ -4608,18 +5417,27 @@
for (i = 0; i < 256; i++)
if (XOR (islower (i), ISLOWER (i))
|| toupper (i) != TOUPPER (i))
@@ -6408,7 +6227,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4632,12 +5446,14 @@
+@@ -4632,12 +5450,14 @@
( exit $ac_status )
ac_cv_header_stdc=no
fi
@@ -6426,7 +6245,7 @@
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -4660,9 +5476,9 @@
+@@ -4660,9 +5480,9 @@
inttypes.h stdint.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6439,7 +6258,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -4676,24 +5492,36 @@
+@@ -4676,24 +5496,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -6484,7 +6303,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4702,12 +5530,14 @@
+@@ -4702,12 +5534,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6503,7 +6322,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 +5552,19 @@
+@@ -4722,18 +5556,19 @@
for ac_header in dlfcn.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -6531,7 +6350,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4744,24 +5575,36 @@
+@@ -4744,24 +5579,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -6576,7 +6395,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -4770,15 +5613,16 @@
+@@ -4770,15 +5617,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6599,7 +6418,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -4787,8 +5631,13 @@
+@@ -4787,8 +5635,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -6615,7 +6434,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -4812,9 +5661,10 @@
+@@ -4812,9 +5665,10 @@
ac_header_preproc=no
fi
@@ -6628,7 +6447,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -4838,25 +5688,19 @@
+@@ -4838,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;}
@@ -6661,7 +6480,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -4868,18 +5712,22 @@
+@@ -4868,18 +5716,22 @@
done
@@ -6689,7 +6508,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4892,36 +5740,38 @@
+@@ -4892,36 +5744,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6736,7 +6555,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -4934,55 +5784,85 @@
+@@ -4934,55 +5788,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -6840,7 +6659,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5005,24 +5885,36 @@
+@@ -5005,24 +5889,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -6885,7 +6704,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5031,24 +5923,28 @@
+@@ -5031,24 +5927,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6922,7 +6741,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -5064,24 +5960,36 @@
+@@ -5064,24 +5964,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -6967,7 +6786,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5090,70 +5998,53 @@
+@@ -5090,70 +6002,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7062,7 +6881,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5162,62 +6053,92 @@
+@@ -5162,62 +6057,92 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7178,7 +6997,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 +6146,8 @@
+@@ -5225,8 +6150,8 @@
depcc="$CXX" am_compiler_list=
@@ -7189,7 +7008,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5315,8 +6236,8 @@
+@@ -5315,8 +6240,8 @@
fi
fi
@@ -7200,7 +7019,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -5337,13 +6258,13 @@
+@@ -5337,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
@@ -7217,7 +7036,7 @@
if test -z "$CXXCPP"; then
if test "${ac_cv_prog_CXXCPP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -5373,8 +6294,13 @@
+@@ -5373,8 +6298,13 @@
#endif
Syntax error
_ACEOF
@@ -7233,7 +7052,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5399,9 +6325,10 @@
+@@ -5399,9 +6329,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7245,7 +7064,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5411,8 +6338,13 @@
+@@ -5411,8 +6342,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7261,7 +7080,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5439,6 +6371,7 @@
+@@ -5439,6 +6375,7 @@
ac_preproc_ok=:
break
fi
@@ -7269,7 +7088,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5456,8 +6389,8 @@
+@@ -5456,8 +6393,8 @@
else
ac_cv_prog_CXXCPP=$CXXCPP
fi
@@ -7280,7 +7099,7 @@
ac_preproc_ok=false
for ac_cxx_preproc_warn_flag in '' yes
do
-@@ -5480,8 +6413,13 @@
+@@ -5480,8 +6417,13 @@
#endif
Syntax error
_ACEOF
@@ -7296,7 +7115,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5506,9 +6444,10 @@
+@@ -5506,9 +6448,10 @@
# Broken: fails on valid input.
continue
fi
@@ -7308,7 +7127,7 @@
# can be detected and how.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -5518,8 +6457,13 @@
+@@ -5518,8 +6461,13 @@
/* end confdefs.h. */
#include <ac_nonexistent.h>
_ACEOF
@@ -7324,7 +7143,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -5546,6 +6490,7 @@
+@@ -5546,6 +6494,7 @@
ac_preproc_ok=:
break
fi
@@ -7332,7 +7151,7 @@
rm -f conftest.err conftest.$ac_ext
done
-@@ -5561,7 +6506,7 @@
+@@ -5561,7 +6510,7 @@
{ (exit 1); exit 1; }; }
fi
@@ -7341,7 +7160,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 +6520,12 @@
+@@ -5575,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
@@ -7357,7 +7176,7 @@
if test "${ac_cv_prog_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5593,36 +6538,38 @@
+@@ -5593,36 +6542,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7404,7 +7223,7 @@
if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5635,48 +6582,78 @@
+@@ -5635,48 +6586,78 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7497,7 +7316,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-@@ -5686,8 +6663,8 @@
+@@ -5686,8 +6667,8 @@
# input file. (Note that this only needs to work for GNU compilers.)
ac_save_ext=$ac_ext
ac_ext=F
@@ -7508,7 +7327,7 @@
if test "${ac_cv_f77_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5700,24 +6677,36 @@
+@@ -5700,24 +6681,36 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -7553,7 +7372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5726,20 +6715,21 @@
+@@ -5726,20 +6719,21 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7581,7 +7400,7 @@
if test "${ac_cv_prog_f77_g+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5750,24 +6740,36 @@
+@@ -5750,24 +6744,36 @@
end
_ACEOF
rm -f conftest.$ac_objext
@@ -7626,7 +7445,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -5776,13 +6778,14 @@
+@@ -5776,13 +6782,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -7645,7 +7464,7 @@
if test "$ac_test_FFLAGS" = set; then
FFLAGS=$ac_save_FFLAGS
elif test $ac_cv_prog_f77_g = yes; then
-@@ -5811,8 +6814,8 @@
+@@ -5811,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
@@ -7656,7 +7475,7 @@
if test "${lt_cv_sys_max_cmd_len+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5920,19 +6923,19 @@
+@@ -5920,19 +6927,19 @@
fi
if test -n $lt_cv_sys_max_cmd_len ; then
@@ -7682,7 +7501,7 @@
if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -5967,7 +6970,7 @@
+@@ -5967,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'"
;;
@@ -7691,7 +7510,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 +7139,15 @@
+@@ -6136,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
@@ -7713,7 +7532,7 @@
if test "${lt_cv_objdir+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6158,8 +7161,8 @@
+@@ -6158,8 +7165,8 @@
fi
rmdir .libs 2>/dev/null
fi
@@ -7724,7 +7543,7 @@
objdir=$lt_cv_objdir
-@@ -6210,8 +7213,8 @@
+@@ -6210,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
@@ -7735,7 +7554,7 @@
if test "${ac_cv_prog_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6224,32 +7227,34 @@
+@@ -6224,32 +7231,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7777,7 +7596,7 @@
if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6262,27 +7267,41 @@
+@@ -6262,27 +7271,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7826,7 +7645,7 @@
else
AR="$ac_cv_prog_AR"
fi
-@@ -6290,8 +7309,8 @@
+@@ -6290,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
@@ -7837,7 +7656,7 @@
if test "${ac_cv_prog_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6304,32 +7323,34 @@
+@@ -6304,32 +7327,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7879,7 +7698,7 @@
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6342,27 +7363,41 @@
+@@ -6342,27 +7367,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7928,7 +7747,7 @@
else
RANLIB="$ac_cv_prog_RANLIB"
fi
-@@ -6370,8 +7405,8 @@
+@@ -6370,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
@@ -7939,7 +7758,7 @@
if test "${ac_cv_prog_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6384,32 +7419,34 @@
+@@ -6384,32 +7423,34 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -7981,7 +7800,7 @@
if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6422,27 +7459,41 @@
+@@ -6422,27 +7463,41 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -8030,7 +7849,7 @@
else
STRIP="$ac_cv_prog_STRIP"
fi
-@@ -6501,8 +7552,8 @@
+@@ -6501,8 +7556,8 @@
case $deplibs_check_method in
file_magic*)
if test "$file_magic_cmd" = '$MAGIC_CMD'; then
@@ -8041,7 +7860,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6554,17 +7605,17 @@
+@@ -6554,17 +7609,17 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -8065,7 +7884,7 @@
if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6616,11 +7667,11 @@
+@@ -6616,11 +7671,11 @@
MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
if test -n "$MAGIC_CMD"; then
@@ -8081,7 +7900,7 @@
fi
else
-@@ -6635,21 +7686,21 @@
+@@ -6635,21 +7690,21 @@
enable_dlopen=no
enable_win32_dll=no
@@ -8110,7 +7929,7 @@
test -z "$pic_mode" && pic_mode=default
# Use C for the default configuration in the libtool script
-@@ -6707,8 +7758,8 @@
+@@ -6707,8 +7762,8 @@
lt_prog_compiler_no_builtin_flag=' -fno-builtin'
@@ -8121,21 +7940,21 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6725,11 +7776,11 @@
+@@ -6725,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:7779: $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:7783: \$? = $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 +7793,8 @@
+@@ -6742,8 +7797,8 @@
$rm conftest*
fi
@@ -8146,7 +7965,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 +7808,8 @@
+@@ -6757,8 +7812,8 @@
lt_prog_compiler_pic=
lt_prog_compiler_static=
@@ -8157,7 +7976,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl='-Wl,'
-@@ -6887,7 +7938,7 @@
+@@ -6887,7 +7942,7 @@
lt_prog_compiler_static='-Bstatic'
;;
@@ -8166,7 +7985,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl='-Wl,'
-@@ -6967,16 +8018,16 @@
+@@ -6967,16 +8022,16 @@
esac
fi
@@ -8187,21 +8006,21 @@
if test "${lt_prog_compiler_pic_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -6993,11 +8044,11 @@
+@@ -6993,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:8047: $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:8051: \$? = $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 +8061,8 @@
+@@ -7010,8 +8065,8 @@
$rm conftest*
fi
@@ -8212,7 +8031,7 @@
if test x"$lt_prog_compiler_pic_works" = xyes; then
case $lt_prog_compiler_pic in
-@@ -7038,8 +8089,8 @@
+@@ -7038,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\"
@@ -8223,7 +8042,7 @@
if test "${lt_prog_compiler_static_works+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7066,8 +8117,8 @@
+@@ -7066,8 +8121,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -8234,7 +8053,7 @@
if test x"$lt_prog_compiler_static_works" = xyes; then
:
-@@ -7076,8 +8127,8 @@
+@@ -7076,8 +8131,8 @@
fi
@@ -8245,21 +8064,21 @@
if test "${lt_cv_prog_compiler_c_o+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -7097,11 +8148,11 @@
+@@ -7097,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:8151: $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:8155: \$? = $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 +8174,23 @@
+@@ -7123,23 +8178,23 @@
$rm conftest*
fi
@@ -8289,7 +8108,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 +8200,8 @@
+@@ -7149,8 +8204,8 @@
need_locks=no
fi
@@ -8300,7 +8119,7 @@
runpath_var=
allow_undefined_flag=
-@@ -7326,7 +8377,7 @@
+@@ -7326,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'
;;
@@ -8309,7 +8128,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -7352,12 +8403,13 @@
+@@ -7352,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
@@ -8324,7 +8143,7 @@
if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
-@@ -7565,24 +8617,36 @@
+@@ -7565,24 +8621,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8369,7 +8188,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7596,8 +8660,10 @@
+@@ -7596,8 +8664,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8377,11 +8196,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -7626,24 +8692,36 @@
+@@ -7626,24 +8696,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -8426,7 +8245,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -7657,8 +8735,10 @@
+@@ -7657,8 +8739,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8434,11 +8253,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -7789,7 +8869,7 @@
+@@ -7789,7 +8873,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -8447,7 +8266,7 @@
archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
-@@ -7891,7 +8971,7 @@
+@@ -7891,7 +8975,7 @@
link_all_deplibs=yes
;;
@@ -8456,7 +8275,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 +9187,8 @@
+@@ -8107,8 +9191,8 @@
esac
fi
@@ -8467,7 +8286,7 @@
test "$ld_shlibs" = no && can_build_shared=no
#
-@@ -8128,8 +9208,8 @@
+@@ -8128,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.
@@ -8478,7 +8297,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -8166,16 +9246,16 @@
+@@ -8166,16 +9250,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -8499,7 +8318,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -8381,18 +9461,6 @@
+@@ -8381,18 +9465,6 @@
dynamic_linker=no
;;
@@ -8518,7 +8337,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -8548,7 +9616,7 @@
+@@ -8548,7 +9620,7 @@
;;
# This must be Linux ELF.
@@ -8527,7 +8346,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8577,7 +9645,7 @@
+@@ -8577,7 +9649,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -8536,7 +8355,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -8586,7 +9654,7 @@
+@@ -8586,7 +9658,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -8545,7 +8364,7 @@
;;
netbsd*)
-@@ -8762,8 +9830,8 @@
+@@ -8762,8 +9834,8 @@
dynamic_linker=no
;;
esac
@@ -8556,7 +8375,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -8771,8 +9839,8 @@
+@@ -8771,8 +9843,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -8567,7 +8386,7 @@
hardcode_action=
if test -n "$hardcode_libdir_flag_spec" || \
test -n "$runpath_var" || \
-@@ -8796,8 +9864,8 @@
+@@ -8796,8 +9868,8 @@
# directories.
hardcode_action=unsupported
fi
@@ -8578,7 +8397,7 @@
if test "$hardcode_action" = relink; then
# Fast installation is not supported
-@@ -8810,29 +9878,29 @@
+@@ -8810,29 +9882,29 @@
striplib=
old_striplib=
@@ -8618,7 +8437,7 @@
;;
esac
fi
-@@ -8864,8 +9932,8 @@
+@@ -8864,8 +9936,8 @@
darwin*)
# if libdl is installed we need to link against it
@@ -8629,7 +8448,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8878,40 +9946,52 @@
+@@ -8878,40 +9950,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -8694,7 +8513,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -8920,14 +10000,15 @@
+@@ -8920,14 +10004,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8703,7 +8522,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -8714,7 +8533,7 @@
if test $ac_cv_lib_dl_dlopen = yes; then
lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
else
-@@ -8941,8 +10022,8 @@
+@@ -8941,8 +10026,8 @@
;;
*)
@@ -8725,7 +8544,7 @@
if test "${ac_cv_func_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -8969,53 +10050,59 @@
+@@ -8969,53 +10054,59 @@
#undef shl_load
@@ -8804,7 +8623,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9024,18 +10111,19 @@
+@@ -9024,18 +10115,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8813,7 +8632,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -8830,7 +8649,7 @@
if test "${ac_cv_lib_dld_shl_load+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9048,40 +10136,52 @@
+@@ -9048,40 +10140,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -8895,7 +8714,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9090,19 +10190,20 @@
+@@ -9090,19 +10194,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -8904,7 +8723,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -8922,7 +8741,7 @@
if test "${ac_cv_func_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9129,53 +10230,59 @@
+@@ -9129,53 +10234,59 @@
#undef dlopen
@@ -9001,7 +8820,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9184,18 +10291,19 @@
+@@ -9184,18 +10295,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9010,7 +8829,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -9027,7 +8846,7 @@
if test "${ac_cv_lib_dl_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9208,40 +10316,52 @@
+@@ -9208,40 +10320,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9092,7 +8911,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9250,19 +10370,20 @@
+@@ -9250,19 +10374,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9101,7 +8920,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9119,7 +8938,7 @@
if test "${ac_cv_lib_svld_dlopen+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9275,40 +10396,52 @@
+@@ -9275,40 +10400,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9184,7 +9003,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9317,19 +10450,20 @@
+@@ -9317,19 +10454,20 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9193,7 +9012,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9211,7 +9030,7 @@
if test "${ac_cv_lib_dld_dld_link+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9342,40 +10476,52 @@
+@@ -9342,40 +10480,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -9276,7 +9095,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -9384,14 +10530,15 @@
+@@ -9384,14 +10534,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9285,7 +9104,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -9296,7 +9115,7 @@
if test $ac_cv_lib_dld_dld_link = yes; then
lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
fi
-@@ -9431,8 +10578,8 @@
+@@ -9431,8 +10582,8 @@
save_LIBS="$LIBS"
LIBS="$lt_cv_dlopen_libs $LIBS"
@@ -9307,16 +9126,16 @@
if test "${lt_cv_dlopen_self+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9442,7 +10589,7 @@
+@@ -9442,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 10592 "configure"
++#line 10596 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9526,13 +10673,13 @@
+@@ -9526,13 +10677,13 @@
fi
@@ -9334,16 +9153,16 @@
if test "${lt_cv_dlopen_self_static+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -9542,7 +10689,7 @@
+@@ -9542,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 10692 "configure"
++#line 10696 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
-@@ -9626,8 +10773,8 @@
+@@ -9626,8 +10777,8 @@
fi
@@ -9354,7 +9173,7 @@
fi
CPPFLAGS="$save_CPPFLAGS"
-@@ -9649,13 +10796,13 @@
+@@ -9649,13 +10800,13 @@
# Report which library types will actually be built
@@ -9374,7 +9193,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -9675,15 +10822,15 @@
+@@ -9675,15 +10826,15 @@
fi
;;
esac
@@ -9396,7 +9215,7 @@
# The else clause should only fire when bootstrapping the
# libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -10175,11 +11322,11 @@
+@@ -10175,11 +11326,11 @@
CC="$lt_save_CC"
@@ -9412,7 +9231,7 @@
if test -f "$ltmain" && test -n "$tagnames"; then
if test ! -f "${ofile}"; then
-@@ -10233,7 +11380,7 @@
+@@ -10233,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
@@ -9421,7 +9240,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 +11499,18 @@
+@@ -10352,18 +11503,18 @@
# Set up default GNU C++ configuration
@@ -9446,7 +9265,7 @@
case $host in
*-*-mingw*)
# gcc leaves a trailing carriage return which upsets mingw
-@@ -10392,11 +11539,11 @@
+@@ -10392,11 +11543,11 @@
;;
esac
elif test "$with_gnu_ld" = yes; then
@@ -9462,7 +9281,7 @@
fi
if test "${lt_cv_path_LD+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -10429,17 +11576,17 @@
+@@ -10429,17 +11580,17 @@
LD="$lt_cv_path_LD"
if test -n "$LD"; then
@@ -9486,7 +9305,7 @@
if test "${lt_cv_prog_gnu_ld+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -10453,8 +11600,8 @@
+@@ -10453,8 +11604,8 @@
;;
esac
fi
@@ -9497,7 +9316,7 @@
with_gnu_ld=$lt_cv_prog_gnu_ld
-@@ -10504,8 +11651,8 @@
+@@ -10504,8 +11655,8 @@
fi
# PORTME: fill in a description of your system's C++ link characteristics
@@ -9508,7 +9327,7 @@
ld_shlibs_CXX=yes
case $host_os in
aix3*)
-@@ -10617,24 +11764,36 @@
+@@ -10617,24 +11768,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9553,7 +9372,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10648,8 +11807,10 @@
+@@ -10648,8 +11811,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9561,11 +9380,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10679,24 +11840,36 @@
+@@ -10679,24 +11844,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9610,7 +9429,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -10710,8 +11883,10 @@
+@@ -10710,8 +11887,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -9618,11 +9437,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -10859,7 +12034,7 @@
+@@ -10859,7 +12038,7 @@
freebsd-elf*)
archive_cmds_need_lc_CXX=no
;;
@@ -9631,7 +9450,7 @@
# FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
# conventions
ld_shlibs_CXX=yes
-@@ -11018,7 +12193,7 @@
+@@ -11018,7 +12197,7 @@
hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
hardcode_libdir_separator_CXX=:
;;
@@ -9640,7 +9459,7 @@
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -11120,7 +12295,7 @@
+@@ -11120,7 +12299,7 @@
;;
esac
;;
@@ -9649,7 +9468,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 +12617,8 @@
+@@ -11442,8 +12621,8 @@
ld_shlibs_CXX=no
;;
esac
@@ -9660,7 +9479,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
GCC_CXX="$GXX"
-@@ -11582,8 +12757,8 @@
+@@ -11582,8 +12761,8 @@
lt_prog_compiler_pic_CXX=
lt_prog_compiler_static_CXX=
@@ -9671,7 +9490,7 @@
# C++ specific cases for pic, static, wl, etc.
if test "$GXX" = yes; then
-@@ -11687,7 +12862,7 @@
+@@ -11687,7 +12866,7 @@
;;
esac
;;
@@ -9680,7 +9499,7 @@
# FreeBSD uses GNU C++
;;
hpux9* | hpux10* | hpux11*)
-@@ -11730,7 +12905,7 @@
+@@ -11730,7 +12909,7 @@
;;
esac
;;
@@ -9689,7 +9508,7 @@
case $cc_basename in
KCC*)
# KAI C++ Compiler
-@@ -11773,7 +12948,7 @@
+@@ -11773,7 +12952,7 @@
;;
esac
;;
@@ -9698,7 +9517,7 @@
;;
osf3* | osf4* | osf5*)
case $cc_basename in
-@@ -11856,16 +13031,16 @@
+@@ -11856,16 +13035,16 @@
esac
fi
@@ -9719,21 +9538,21 @@
if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11882,11 +13057,11 @@
+@@ -11882,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:13060: $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:13064: \$? = $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 +13074,8 @@
+@@ -11899,8 +13078,8 @@
$rm conftest*
fi
@@ -9744,7 +9563,7 @@
if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
case $lt_prog_compiler_pic_CXX in
-@@ -11927,8 +13102,8 @@
+@@ -11927,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\"
@@ -9755,7 +9574,7 @@
if test "${lt_prog_compiler_static_works_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11955,8 +13130,8 @@
+@@ -11955,8 +13134,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -9766,7 +9585,7 @@
if test x"$lt_prog_compiler_static_works_CXX" = xyes; then
:
-@@ -11965,8 +13140,8 @@
+@@ -11965,8 +13144,8 @@
fi
@@ -9777,21 +9596,21 @@
if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -11986,11 +13161,11 @@
+@@ -11986,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:13164: $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:13168: \$? = $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 +13187,23 @@
+@@ -12012,23 +13191,23 @@
$rm conftest*
fi
@@ -9821,7 +9640,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 +13213,8 @@
+@@ -12038,8 +13217,8 @@
need_locks=no
fi
@@ -9832,7 +9651,7 @@
export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
case $host_os in
-@@ -12058,13 +13233,16 @@
+@@ -12058,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'
;;
@@ -9851,7 +9670,7 @@
test "$ld_shlibs_CXX" = no && can_build_shared=no
#
-@@ -12084,8 +13262,8 @@
+@@ -12084,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.
@@ -9862,7 +9681,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -12122,16 +13300,16 @@
+@@ -12122,16 +13304,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -9883,7 +9702,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -12337,18 +13515,6 @@
+@@ -12337,18 +13519,6 @@
dynamic_linker=no
;;
@@ -9902,7 +9721,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -12504,7 +13670,7 @@
+@@ -12504,7 +13674,7 @@
;;
# This must be Linux ELF.
@@ -9911,7 +9730,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12533,7 +13699,7 @@
+@@ -12533,7 +13703,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -9920,7 +9739,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -12542,7 +13708,7 @@
+@@ -12542,7 +13712,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -9929,7 +9748,7 @@
;;
netbsd*)
-@@ -12718,8 +13884,8 @@
+@@ -12718,8 +13888,8 @@
dynamic_linker=no
;;
esac
@@ -9940,7 +9759,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -12727,8 +13893,8 @@
+@@ -12727,8 +13897,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -9951,7 +9770,7 @@
hardcode_action_CXX=
if test -n "$hardcode_libdir_flag_spec_CXX" || \
test -n "$runpath_var_CXX" || \
-@@ -12752,8 +13918,8 @@
+@@ -12752,8 +13922,8 @@
# directories.
hardcode_action_CXX=unsupported
fi
@@ -9962,7 +9781,7 @@
if test "$hardcode_action_CXX" = relink; then
# Fast installation is not supported
-@@ -13278,13 +14444,13 @@
+@@ -13278,13 +14448,13 @@
cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
@@ -9982,7 +9801,7 @@
test "$can_build_shared" = "no" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
-@@ -13303,15 +14469,15 @@
+@@ -13303,15 +14473,15 @@
fi
;;
esac
@@ -10004,7 +9823,7 @@
GCC_F77="$G77"
LD_F77="$LD"
-@@ -13320,8 +14486,8 @@
+@@ -13320,8 +14490,8 @@
lt_prog_compiler_pic_F77=
lt_prog_compiler_static_F77=
@@ -10015,7 +9834,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13450,7 +14616,7 @@
+@@ -13450,7 +14620,7 @@
lt_prog_compiler_static_F77='-Bstatic'
;;
@@ -10024,7 +9843,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_F77='-Wl,'
-@@ -13530,16 +14696,16 @@
+@@ -13530,16 +14700,16 @@
esac
fi
@@ -10045,21 +9864,21 @@
if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13556,11 +14722,11 @@
+@@ -13556,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:14725: $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:14729: \$? = $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 +14739,8 @@
+@@ -13573,8 +14743,8 @@
$rm conftest*
fi
@@ -10070,7 +9889,7 @@
if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
case $lt_prog_compiler_pic_F77 in
-@@ -13601,8 +14767,8 @@
+@@ -13601,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\"
@@ -10081,7 +9900,7 @@
if test "${lt_prog_compiler_static_works_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13629,8 +14795,8 @@
+@@ -13629,8 +14799,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10092,7 +9911,7 @@
if test x"$lt_prog_compiler_static_works_F77" = xyes; then
:
-@@ -13639,8 +14805,8 @@
+@@ -13639,8 +14809,8 @@
fi
@@ -10103,21 +9922,21 @@
if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -13660,11 +14826,11 @@
+@@ -13660,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:14829: $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:14833: \$? = $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 +14852,23 @@
+@@ -13686,23 +14856,23 @@
$rm conftest*
fi
@@ -10147,7 +9966,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 +14878,8 @@
+@@ -13712,8 +14882,8 @@
need_locks=no
fi
@@ -10158,7 +9977,7 @@
runpath_var=
allow_undefined_flag_F77=
-@@ -13889,7 +15055,7 @@
+@@ -13889,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'
;;
@@ -10167,7 +9986,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -13915,12 +15081,13 @@
+@@ -13915,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
@@ -10182,7 +10001,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 +15285,36 @@
+@@ -14118,24 +15289,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10227,7 +10046,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14149,8 +15328,10 @@
+@@ -14149,8 +15332,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10235,11 +10054,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14169,24 +15350,36 @@
+@@ -14169,24 +15354,36 @@
end
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10284,7 +10103,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -14200,8 +15393,10 @@
+@@ -14200,8 +15397,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10292,11 +10111,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -14332,7 +15527,7 @@
+@@ -14332,7 +15531,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10305,7 +10124,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 +15629,7 @@
+@@ -14434,7 +15633,7 @@
link_all_deplibs_F77=yes
;;
@@ -10314,7 +10133,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 +15845,8 @@
+@@ -14650,8 +15849,8 @@
esac
fi
@@ -10325,7 +10144,7 @@
test "$ld_shlibs_F77" = no && can_build_shared=no
#
-@@ -14671,8 +15866,8 @@
+@@ -14671,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.
@@ -10336,7 +10155,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -14709,16 +15904,16 @@
+@@ -14709,16 +15908,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -10357,7 +10176,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -14924,18 +16119,6 @@
+@@ -14924,18 +16123,6 @@
dynamic_linker=no
;;
@@ -10376,7 +10195,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -15091,7 +16274,7 @@
+@@ -15091,7 +16278,7 @@
;;
# This must be Linux ELF.
@@ -10385,7 +10204,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15120,7 +16303,7 @@
+@@ -15120,7 +16307,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10394,7 +10213,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -15129,7 +16312,7 @@
+@@ -15129,7 +16316,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -10403,7 +10222,7 @@
;;
netbsd*)
-@@ -15305,8 +16488,8 @@
+@@ -15305,8 +16492,8 @@
dynamic_linker=no
;;
esac
@@ -10414,7 +10233,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -15314,8 +16497,8 @@
+@@ -15314,8 +16501,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -10425,7 +10244,7 @@
hardcode_action_F77=
if test -n "$hardcode_libdir_flag_spec_F77" || \
test -n "$runpath_var_F77" || \
-@@ -15339,8 +16522,8 @@
+@@ -15339,8 +16526,8 @@
# directories.
hardcode_action_F77=unsupported
fi
@@ -10436,7 +10255,7 @@
if test "$hardcode_action_F77" = relink; then
# Fast installation is not supported
-@@ -15777,7 +16960,6 @@
+@@ -15777,7 +16964,6 @@
if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
@@ -10444,7 +10263,7 @@
# Source file extension for Java test sources.
ac_ext=java
-@@ -15845,8 +17027,8 @@
+@@ -15845,8 +17031,8 @@
lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
@@ -10455,21 +10274,21 @@
if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -15863,11 +17045,11 @@
+@@ -15863,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:17048: $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:17052: \$? = $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 +17062,8 @@
+@@ -15880,8 +17066,8 @@
$rm conftest*
fi
@@ -10480,7 +10299,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 +17077,8 @@
+@@ -15895,8 +17081,8 @@
lt_prog_compiler_pic_GCJ=
lt_prog_compiler_static_GCJ=
@@ -10491,7 +10310,7 @@
if test "$GCC" = yes; then
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16025,7 +17207,7 @@
+@@ -16025,7 +17211,7 @@
lt_prog_compiler_static_GCJ='-Bstatic'
;;
@@ -10500,7 +10319,7 @@
case $cc_basename in
icc* | ecc*)
lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -16105,16 +17287,16 @@
+@@ -16105,16 +17291,16 @@
esac
fi
@@ -10521,21 +10340,21 @@
if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16131,11 +17313,11 @@
+@@ -16131,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:17316: $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:17320: \$? = $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 +17330,8 @@
+@@ -16148,8 +17334,8 @@
$rm conftest*
fi
@@ -10546,7 +10365,7 @@
if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
case $lt_prog_compiler_pic_GCJ in
-@@ -16176,8 +17358,8 @@
+@@ -16176,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\"
@@ -10557,7 +10376,7 @@
if test "${lt_prog_compiler_static_works_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16204,8 +17386,8 @@
+@@ -16204,8 +17390,8 @@
LDFLAGS="$save_LDFLAGS"
fi
@@ -10568,7 +10387,7 @@
if test x"$lt_prog_compiler_static_works_GCJ" = xyes; then
:
-@@ -16214,8 +17396,8 @@
+@@ -16214,8 +17400,8 @@
fi
@@ -10579,21 +10398,21 @@
if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -16235,11 +17417,11 @@
+@@ -16235,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:17420: $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:17424: \$? = $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 +17443,23 @@
+@@ -16261,23 +17447,23 @@
$rm conftest*
fi
@@ -10623,7 +10442,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 +17469,8 @@
+@@ -16287,8 +17473,8 @@
need_locks=no
fi
@@ -10634,7 +10453,7 @@
runpath_var=
allow_undefined_flag_GCJ=
-@@ -16464,7 +17646,7 @@
+@@ -16464,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'
;;
@@ -10643,7 +10462,7 @@
if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
tmp_addflag=
case $cc_basename,$host_cpu in
-@@ -16490,12 +17672,13 @@
+@@ -16490,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
@@ -10658,7 +10477,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 +17886,36 @@
+@@ -16703,24 +17890,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10703,7 +10522,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16734,8 +17929,10 @@
+@@ -16734,8 +17933,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10711,11 +10530,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16764,24 +17961,36 @@
+@@ -16764,24 +17965,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10760,7 +10579,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -16795,8 +18004,10 @@
+@@ -16795,8 +18008,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -10768,11 +10587,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-@@ -16927,7 +18138,7 @@
+@@ -16927,7 +18142,7 @@
;;
# FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -10781,7 +10600,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 +18240,7 @@
+@@ -17029,7 +18244,7 @@
link_all_deplibs_GCJ=yes
;;
@@ -10790,7 +10609,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 +18456,8 @@
+@@ -17245,8 +18460,8 @@
esac
fi
@@ -10801,7 +10620,7 @@
test "$ld_shlibs_GCJ" = no && can_build_shared=no
#
-@@ -17266,8 +18477,8 @@
+@@ -17266,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.
@@ -10812,7 +10631,7 @@
$rm conftest*
printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-@@ -17304,16 +18515,16 @@
+@@ -17304,16 +18519,16 @@
cat conftest.err 1>&5
fi
$rm conftest*
@@ -10833,7 +10652,7 @@
library_names_spec=
libname_spec='lib$name'
soname_spec=
-@@ -17519,18 +18730,6 @@
+@@ -17519,18 +18734,6 @@
dynamic_linker=no
;;
@@ -10852,7 +10671,7 @@
freebsd* | dragonfly*)
# DragonFly does not have aout. When/if they implement a new
# versioning mechanism, adjust this.
-@@ -17686,7 +18885,7 @@
+@@ -17686,7 +18889,7 @@
;;
# This must be Linux ELF.
@@ -10861,7 +10680,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17715,7 +18914,7 @@
+@@ -17715,7 +18918,7 @@
dynamic_linker='GNU/Linux ld.so'
;;
@@ -10870,7 +10689,7 @@
version_type=linux
need_lib_prefix=no
need_version=no
-@@ -17724,7 +18923,7 @@
+@@ -17724,7 +18927,7 @@
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -10879,7 +10698,7 @@
;;
netbsd*)
-@@ -17900,8 +19099,8 @@
+@@ -17900,8 +19103,8 @@
dynamic_linker=no
;;
esac
@@ -10890,7 +10709,7 @@
test "$dynamic_linker" = no && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-@@ -17909,8 +19108,8 @@
+@@ -17909,8 +19112,8 @@
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
@@ -10901,7 +10720,7 @@
hardcode_action_GCJ=
if test -n "$hardcode_libdir_flag_spec_GCJ" || \
test -n "$runpath_var_GCJ" || \
-@@ -17934,8 +19133,8 @@
+@@ -17934,8 +19137,8 @@
# directories.
hardcode_action_GCJ=unsupported
fi
@@ -10912,7 +10731,7 @@
if test "$hardcode_action_GCJ" = relink; then
# Fast installation is not supported
-@@ -18371,7 +19570,6 @@
+@@ -18371,7 +19574,6 @@
RC)
@@ -10920,7 +10739,7 @@
# Source file extension for RC test sources.
ac_ext=rc
-@@ -18902,18 +20100,22 @@
+@@ -18902,18 +20104,22 @@
@@ -10948,7 +10767,7 @@
if test "${ac_cv_prog_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18926,36 +20128,38 @@
+@@ -18926,36 +20132,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -10995,7 +10814,7 @@
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -18968,55 +20172,85 @@
+@@ -18968,55 +20176,85 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11099,7 +10918,7 @@
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19039,24 +20273,36 @@
+@@ -19039,24 +20277,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11144,7 +10963,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19065,24 +20311,28 @@
+@@ -19065,24 +20315,28 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11181,7 +11000,7 @@
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
-@@ -19098,24 +20348,36 @@
+@@ -19098,24 +20352,36 @@
}
_ACEOF
rm -f conftest.$ac_objext
@@ -11226,7 +11045,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19124,70 +20386,53 @@
+@@ -19124,70 +20390,53 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11321,7 +11140,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19196,61 +20441,91 @@
+@@ -19196,61 +20445,91 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11435,7 +11254,7 @@
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -19259,8 +20534,8 @@
+@@ -19259,8 +20538,8 @@
depcc="$CXX" am_compiler_list=
@@ -11446,7 +11265,7 @@
if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19349,8 +20624,8 @@
+@@ -19349,8 +20628,8 @@
fi
fi
@@ -11457,7 +11276,7 @@
CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-@@ -19372,8 +20647,8 @@
+@@ -19372,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
@@ -11468,7 +11287,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19388,28 +20663,29 @@
+@@ -19388,28 +20667,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11504,7 +11323,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 +20694,8 @@
+@@ -19418,8 +20698,8 @@
# Extract the first word of "bash", so it can be a program name with args.
set dummy bash; ac_word=$2
@@ -11515,7 +11334,7 @@
if test "${ac_cv_path_BASH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19434,34 +20710,35 @@
+@@ -19434,34 +20714,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11559,7 +11378,7 @@
if test "${ac_cv_path_ZIP+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19476,32 +20753,33 @@
+@@ -19476,32 +20757,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11601,7 +11420,7 @@
if test "${ac_cv_path_MONO+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19516,31 +20794,32 @@
+@@ -19516,31 +20798,32 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11642,7 +11461,7 @@
if test "${ac_cv_path_MCS+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19555,37 +20834,38 @@
+@@ -19555,37 +20838,38 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11691,7 +11510,7 @@
fi
# check that we have the require version of mono
-@@ -19595,8 +20875,8 @@
+@@ -19595,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
@@ -11702,7 +11521,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19611,34 +20891,35 @@
+@@ -19611,34 +20895,35 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11746,7 +11565,7 @@
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -19653,28 +20934,42 @@
+@@ -19653,28 +20938,42 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -11796,7 +11615,7 @@
else
PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
fi
-@@ -19682,22 +20977,22 @@
+@@ -19682,22 +20981,22 @@
fi
if test -n "$PKG_CONFIG"; then
_pkg_min_version=0.9.0
@@ -11827,7 +11646,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$MONO_CFLAGS"; then
-@@ -19801,8 +21096,8 @@
+@@ -19801,8 +21100,8 @@
else
MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
MONO_LIBS=$pkg_cv_MONO_LIBS
@@ -11838,7 +11657,7 @@
:
fi
-@@ -19817,15 +21112,15 @@
+@@ -19817,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
@@ -11858,7 +11677,7 @@
fi
done
-@@ -19872,18 +21167,19 @@
+@@ -19872,18 +21171,19 @@
for ac_header in stdlib.h unistd.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -11886,7 +11705,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19894,24 +21190,36 @@
+@@ -19894,24 +21194,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -11931,7 +11750,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -19920,15 +21228,16 @@
+@@ -19920,15 +21232,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -11954,7 +11773,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -19937,8 +21246,13 @@
+@@ -19937,8 +21250,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -11970,7 +11789,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -19962,9 +21276,10 @@
+@@ -19962,9 +21280,10 @@
ac_header_preproc=no
fi
@@ -11983,7 +11802,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -19988,25 +21303,19 @@
+@@ -19988,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;}
@@ -12016,7 +11835,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20022,9 +21331,9 @@
+@@ -20022,9 +21335,9 @@
for ac_func in getpagesize
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -12029,7 +11848,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -20050,53 +21359,59 @@
+@@ -20050,53 +21363,59 @@
#undef $ac_func
@@ -12108,7 +11927,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20105,13 +21420,15 @@
+@@ -20105,13 +21424,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12117,7 +11936,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -12128,7 +11947,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 +21437,8 @@
+@@ -20120,8 +21441,8 @@
fi
done
@@ -12139,7 +11958,33 @@
if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20216,15 +21533,15 @@
+@@ -20163,21 +21484,21 @@
+ #include <fcntl.h>
+ #include <sys/mman.h>
+
+-#if !STDC_HEADERS && !HAVE_STDLIB_H
++#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
+ char *malloc ();
+ #endif
+
+ /* This mess was copied from the GNU getpagesize.h. */
+-#if !HAVE_GETPAGESIZE
++#ifndef HAVE_GETPAGESIZE
+ /* Assume that all systems that can run configure have sys/param.h. */
+-# if !HAVE_SYS_PARAM_H
++# ifndef HAVE_SYS_PARAM_H
+ # define HAVE_SYS_PARAM_H 1
+ # endif
+
+ # ifdef _SC_PAGESIZE
+ # define getpagesize() sysconf(_SC_PAGESIZE)
+ # else /* no _SC_PAGESIZE */
+-# if HAVE_SYS_PARAM_H
++# ifdef HAVE_SYS_PARAM_H
+ # include <sys/param.h>
+ # ifdef EXEC_PAGESIZE
+ # define getpagesize() EXEC_PAGESIZE
+@@ -20216,15 +21537,15 @@
/* First, make a file with some known garbage in it. */
data = (char *) malloc (pagesize);
if (!data)
@@ -12158,7 +12003,7 @@
close (fd);
/* Next, try to mmap the file at a fixed address which already has
-@@ -20232,17 +21549,17 @@
+@@ -20232,17 +21553,17 @@
we see the same garbage. */
fd = open ("conftest.mmap", O_RDWR);
if (fd < 0)
@@ -12181,7 +12026,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 +21568,33 @@
+@@ -20251,24 +21572,33 @@
*(data2 + i) = *(data2 + i) + 1;
data3 = (char *) malloc (pagesize);
if (!data3)
@@ -12223,7 +12068,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20281,11 +21607,13 @@
+@@ -20281,11 +21611,13 @@
( exit $ac_status )
ac_cv_func_mmap_fixed_mapped=no
fi
@@ -12240,7 +12085,7 @@
if test $ac_cv_func_mmap_fixed_mapped = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20300,8 +21628,8 @@
+@@ -20300,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
@@ -12251,7 +12096,7 @@
if test "${ac_cv_path_DESKTOP_LAUNCH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20316,30 +21644,31 @@
+@@ -20316,30 +21648,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12289,7 +12134,7 @@
if test "x$DESKTOP_LAUNCH" != "xno"; then
ENABLE_DESKTOP_LAUNCH_TRUE=
ENABLE_DESKTOP_LAUNCH_FALSE='#'
-@@ -20351,20 +21680,20 @@
+@@ -20351,20 +21684,20 @@
# Google QueryDriver
# Disable GoogleDriver by default, enable if you want know what you are doing
@@ -12316,7 +12161,7 @@
if test "${ac_cv_path_WSDL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20379,27 +21708,28 @@
+@@ -20379,27 +21712,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12351,77 +12196,28 @@
fi
-@@ -20418,25 +21748,30 @@
- #
+@@ -20429,15 +21763,15 @@
+ esac
-
-+case "$am__api_version" in
-+ 1.01234)
-+ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
-+ { (exit 1); exit 1; }; }
-+ ;;
-+ *)
-+ ;;
-+esac
-
if test -n "0.23"; then
- echo "$as_me:$LINENO: checking for intltool >= 0.23" >&5
-echo $ECHO_N "checking for intltool >= 0.23... $ECHO_C" >&6
--
-- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ printf "%d", $1 * 100 + $2; }'`
-- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $2; }' < ${ac_aux_dir}/intltool-update.in`
--
-- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($2, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
+ { echo "$as_me:$LINENO: checking for intltool >= 0.23" >&5
+echo $ECHO_N "checking for intltool >= 0.23... $ECHO_C" >&6; }
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
-+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
-+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.23 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
-- if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
-- else
-- echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool 0.23 or later." >&5
--echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool 0.23 or later." >&6
-- exit 1
-- fi
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
-+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
-+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.23 or later." >&5
-+echo "$as_me: error: Your intltool is too old. You need intltool 0.23 or later." >&2;}
-+ { (exit 1); exit 1; }; }
- fi
+ 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 @@
- INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-@@ -20456,6 +21791,7 @@
- INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
- INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@'
-
-
-
-@@ -20475,20 +21811,19 @@
-
-
-
--# Use the tools built into the package, not the ones that are installed.
-
-+# Use the tools built into the package, not the ones that are installed.
- INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
--INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
--INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
--
-
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-
-+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-
-
# Extract the first word of "perl", so it can be a program name with args.
set dummy perl; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -12431,7 +12227,7 @@
if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20503,27 +21838,28 @@
+@@ -20508,27 +21842,28 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12466,7 +12262,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;}
-@@ -20535,11 +21871,11 @@
+@@ -20540,11 +21875,11 @@
{ (exit 1); exit 1; }; }
fi
if test "x" != "xno-xml"; then
@@ -12482,7 +12278,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;}
-@@ -20549,8 +21885,8 @@
+@@ -20554,8 +21889,8 @@
# Extract the first word of "iconv", so it can be a program name with args.
set dummy iconv; ac_word=$2
@@ -12493,7 +12289,7 @@
if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20565,32 +21901,33 @@
+@@ -20570,32 +21905,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12535,7 +12331,7 @@
if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20605,32 +21942,33 @@
+@@ -20610,32 +21946,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12577,7 +12373,7 @@
if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20645,32 +21983,33 @@
+@@ -20650,32 +21987,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12619,7 +12415,7 @@
if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20685,40 +22024,37 @@
+@@ -20690,36 +22028,37 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -12652,23 +12448,19 @@
fi
--# Remove file type tags (using []) from po/POTFILES.
--
++
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
-+# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
--# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
--
- ac_config_commands="$ac_config_commands intltool"
+ac_config_commands="$ac_config_commands intltool"
-@@ -20730,18 +22066,19 @@
+@@ -20731,18 +22070,19 @@
for ac_header in locale.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12696,7 +12488,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20752,24 +22089,36 @@
+@@ -20753,24 +22093,36 @@
#include <$ac_header>
_ACEOF
rm -f conftest.$ac_objext
@@ -12741,7 +12533,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20778,15 +22127,16 @@
+@@ -20779,15 +22131,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12764,7 +12556,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20795,8 +22145,13 @@
+@@ -20796,8 +22149,13 @@
/* end confdefs.h. */
#include <$ac_header>
_ACEOF
@@ -12780,7 +12572,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -20820,9 +22175,10 @@
+@@ -20821,9 +22179,10 @@
ac_header_preproc=no
fi
@@ -12793,7 +12585,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -20846,25 +22202,19 @@
+@@ -20847,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;}
@@ -12826,7 +12618,7 @@
fi
if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -20877,8 +22227,8 @@
+@@ -20878,8 +22231,8 @@
done
if test $ac_cv_header_locale_h = yes; then
@@ -12837,7 +12629,7 @@
if test "${am_cv_val_LC_MESSAGES+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -20898,24 +22248,36 @@
+@@ -20899,24 +22252,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12882,7 +12674,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20924,13 +22286,14 @@
+@@ -20925,13 +22290,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12891,7 +12683,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
@@ -12901,7 +12693,7 @@
if test $am_cv_val_LC_MESSAGES = yes; then
cat >>confdefs.h <<\_ACEOF
-@@ -20949,17 +22312,17 @@
+@@ -20950,17 +22316,17 @@
INTLLIBS=
if test "${ac_cv_header_libintl_h+set}" = set; then
@@ -12925,7 +12717,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -20970,24 +22333,36 @@
+@@ -20971,24 +22337,36 @@
#include <libintl.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -12970,7 +12762,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -20996,15 +22371,16 @@
+@@ -20997,15 +22375,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -12993,7 +12785,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -21013,8 +22389,13 @@
+@@ -21014,8 +22393,13 @@
/* end confdefs.h. */
#include <libintl.h>
_ACEOF
@@ -13009,7 +12801,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -21038,9 +22419,10 @@
+@@ -21039,9 +22423,10 @@
ac_header_preproc=no
fi
@@ -13022,7 +12814,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -21064,25 +22446,18 @@
+@@ -21065,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;}
@@ -13053,7 +12845,7 @@
fi
if test $ac_cv_header_libintl_h = yes; then
-@@ -21092,8 +22467,8 @@
+@@ -21093,8 +22471,8 @@
#
# First check in libc
#
@@ -13064,7 +12856,7 @@
if test "${gt_cv_func_ngettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21115,24 +22490,36 @@
+@@ -21116,24 +22494,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13109,7 +12901,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21141,18 +22528,19 @@
+@@ -21142,18 +22532,19 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13118,7 +12910,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -13135,7 +12927,7 @@
if test "${gt_cv_func_dgettext_libc+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21174,24 +22562,36 @@
+@@ -21175,24 +22566,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13180,7 +12972,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21200,14 +22600,15 @@
+@@ -21201,14 +22604,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13189,7 +12981,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -13200,7 +12992,7 @@
fi
if test "$gt_cv_func_ngettext_libc" = "yes" ; then
-@@ -21215,9 +22616,9 @@
+@@ -21216,9 +22620,9 @@
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13213,7 +13005,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21243,53 +22644,59 @@
+@@ -21244,53 +22648,59 @@
#undef $ac_func
@@ -13292,7 +13084,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21298,13 +22705,15 @@
+@@ -21299,13 +22709,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13301,7 +13093,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -13312,7 +13104,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21322,8 +22731,8 @@
+@@ -21323,8 +22735,8 @@
|| test "$gt_cv_func_ngettext_libc" != "yes" \
|| test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
@@ -13323,7 +13115,7 @@
if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21336,40 +22745,52 @@
+@@ -21337,40 +22749,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13388,7 +13180,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21378,17 +22799,18 @@
+@@ -21379,17 +22803,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13397,7 +13189,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13413,7 +13205,7 @@
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21401,40 +22823,52 @@
+@@ -21402,40 +22827,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13478,7 +13270,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21443,17 +22877,18 @@
+@@ -21444,17 +22881,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13487,7 +13279,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13503,7 +13295,7 @@
if test "${ac_cv_lib_intl_dgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21466,40 +22901,52 @@
+@@ -21467,40 +22905,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13568,7 +13360,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21508,14 +22955,15 @@
+@@ -21509,14 +22959,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13577,7 +13369,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13588,7 +13380,7 @@
if test $ac_cv_lib_intl_dgettext = yes; then
gt_cv_func_dgettext_libintl=yes
fi
-@@ -21526,12 +22974,12 @@
+@@ -21527,12 +22978,12 @@
if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
@@ -13607,7 +13399,7 @@
if test "${ac_cv_lib_intl_ngettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21544,40 +22992,52 @@
+@@ -21545,40 +22996,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13672,7 +13464,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21586,17 +23046,18 @@
+@@ -21587,17 +23050,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13681,7 +13473,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13697,7 +13489,7 @@
if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21609,40 +23070,52 @@
+@@ -21610,40 +23074,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -13762,7 +13554,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21651,14 +23124,15 @@
+@@ -21652,14 +23128,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13771,7 +13563,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -13782,7 +13574,7 @@
if test $ac_cv_lib_intl_dcgettext = yes; then
gt_cv_func_dgettext_libintl=yes
libintl_extra_libs=-liconv
-@@ -21685,9 +23159,9 @@
+@@ -21686,9 +23163,9 @@
for ac_func in bind_textdomain_codeset
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13795,7 +13587,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21713,53 +23187,59 @@
+@@ -21714,53 +23191,59 @@
#undef $ac_func
@@ -13874,7 +13666,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21768,13 +23248,15 @@
+@@ -21769,13 +23252,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -13883,7 +13675,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -13894,7 +13686,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21813,8 +23295,8 @@
+@@ -21814,8 +23299,8 @@
# Extract the first word of "msgfmt", so it can be a program name with args.
set dummy msgfmt; ac_word=$2
@@ -13905,7 +13697,7 @@
if test "${ac_cv_path_MSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21840,11 +23322,11 @@
+@@ -21841,11 +23326,11 @@
fi
MSGFMT="$ac_cv_path_MSGFMT"
if test "$MSGFMT" != "no"; then
@@ -13921,7 +13713,7 @@
fi
if test "$MSGFMT" != "no"; then
glib_save_LIBS="$LIBS"
-@@ -21853,9 +23335,9 @@
+@@ -21854,9 +23339,9 @@
for ac_func in dcgettext
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -13934,7 +13726,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
-@@ -21881,53 +23363,59 @@
+@@ -21882,53 +23367,59 @@
#undef $ac_func
@@ -14013,7 +13805,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -21936,13 +23424,15 @@
+@@ -21937,13 +23428,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14022,7 +13814,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
@@ -14033,7 +13825,7 @@
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -21953,8 +23443,8 @@
+@@ -21954,8 +23447,8 @@
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
@@ -14044,7 +13836,7 @@
if test "${ac_cv_path_GMSGFMT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -21969,32 +23459,33 @@
+@@ -21970,32 +23463,33 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -14086,7 +13878,7 @@
if test "${ac_cv_path_XGETTEXT+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22020,11 +23511,11 @@
+@@ -22021,11 +23515,11 @@
fi
XGETTEXT="$ac_cv_path_XGETTEXT"
if test "$XGETTEXT" != ":"; then
@@ -14102,7 +13894,7 @@
fi
cat >conftest.$ac_ext <<_ACEOF
-@@ -22044,24 +23535,36 @@
+@@ -22045,24 +23539,36 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14147,7 +13939,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22071,10 +23574,10 @@
+@@ -22072,10 +23578,10 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14161,7 +13953,7 @@
if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22101,53 +23604,59 @@
+@@ -22102,53 +23608,59 @@
#undef bind_textdomain_codeset
@@ -14240,7 +14032,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22156,13 +23665,14 @@
+@@ -22157,13 +23669,14 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14249,7 +14041,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
@@ -14259,17 +14051,17 @@
if test $ac_cv_func_bind_textdomain_codeset = yes; then
CATOBJEXT=.gmo
DATADIRNAME=share
-@@ -22178,7 +23688,8 @@
+@@ -22179,7 +23692,8 @@
;;
esac
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
-@@ -22203,8 +23714,8 @@
+@@ -22204,8 +23718,8 @@
if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
: ;
else
@@ -14280,7 +14072,7 @@
XGETTEXT=":"
fi
fi
-@@ -22212,7 +23723,7 @@
+@@ -22213,7 +23727,7 @@
# We need to process the po/ directory.
POSUB=po
@@ -14289,7 +14081,7 @@
for lang in $ALL_LINGUAS; do
-@@ -22236,8 +23747,8 @@
+@@ -22237,8 +23751,8 @@
if test "x$ALL_LINGUAS" = "x"; then
LINGUAS=
else
@@ -14300,7 +14092,7 @@
NEW_LINGUAS=
for presentlang in $ALL_LINGUAS; do
useit=no
-@@ -22261,8 +23772,8 @@
+@@ -22262,8 +23776,8 @@
fi
done
LINGUAS=$NEW_LINGUAS
@@ -14311,7 +14103,7 @@
fi
if test -n "$LINGUAS"; then
-@@ -22270,6 +23781,15 @@
+@@ -22271,6 +23785,15 @@
fi
fi
@@ -14327,7 +14119,7 @@
test -d po || mkdir po
if test "x$srcdir" != "x."; then
if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-@@ -22296,8 +23816,8 @@
+@@ -22297,8 +23820,8 @@
SQLITE_MAJ_VER="0"
pkg_failed=no
@@ -14338,7 +14130,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$SQLITE_CFLAGS"; then
-@@ -22353,22 +23873,24 @@
+@@ -22354,22 +23877,24 @@
# Put the nasty error message in config.log where it belongs
echo "$SQLITE_PKG_ERRORS" >&5
@@ -14368,7 +14160,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$SQLITE3_CFLAGS"; then
-@@ -22424,14 +23946,16 @@
+@@ -22425,14 +23950,16 @@
# Put the nasty error message in config.log where it belongs
echo "$SQLITE3_PKG_ERRORS" >&5
@@ -14388,7 +14180,7 @@
SQLITE_MAJ_VER="3"
fi
-@@ -22446,52 +23970,57 @@
+@@ -22447,52 +23974,57 @@
@@ -14468,7 +14260,7 @@
ac_im_usrlibdir=$ac_im_libdir; break
fi
done
-@@ -22499,7 +24028,7 @@
+@@ -22500,7 +24032,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
@@ -14477,7 +14269,7 @@
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
esac
case $ac_im_usrlibdir in
-@@ -22508,7 +24037,7 @@
+@@ -22509,7 +24041,7 @@
esac
fi
cd ..
@@ -14486,7 +14278,7 @@
fi
# Standard set of common directories for X headers.
-@@ -22549,7 +24078,7 @@
+@@ -22550,7 +24082,7 @@
/usr/openwin/share/include'
if test "$ac_x_includes" = no; then
@@ -14495,7 +14287,7 @@
# First, try using that file with no special directory specified.
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22557,10 +24086,15 @@
+@@ -22558,10 +24090,15 @@
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14514,7 +14306,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -22584,12 +24118,13 @@
+@@ -22585,12 +24122,13 @@
sed 's/^/| /' conftest.$ac_ext >&5
for ac_dir in $ac_x_header_dirs; do
@@ -14529,7 +14321,15 @@
rm -f conftest.err conftest.$ac_ext
fi # $ac_x_includes = no
-@@ -22605,34 +24140,46 @@
+@@ -22599,41 +24137,53 @@
+ # See if we find them without any special options.
+ # Don't add to $LIBS permanently.
+ ac_save_LIBS=$LIBS
+- LIBS="-lXt $LIBS"
++ LIBS="-lX11 $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14586,7 +14386,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22643,49 +24190,54 @@
+@@ -22644,49 +24194,54 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14597,7 +14397,7 @@
# Don't even attempt the hair of trying to link an X program!
for ac_extension in a so sl; do
- if test -r $ac_dir/libXt.$ac_extension; then
-+ if test -r "$ac_dir/libXt.$ac_extension"; then
++ if test -r "$ac_dir/libX11.$ac_extension"; then
ac_x_libraries=$ac_dir
break 2
fi
@@ -14606,7 +14406,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi # $ac_x_libraries = no
@@ -14660,18 +14460,26 @@
fi
if test "$no_x" = yes; then
-@@ -22708,8 +24260,8 @@
+@@ -22707,12 +24262,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 . . . .
- case `(uname -sr) 2>/dev/null` in
- "SunOS 5"*)
+- case `(uname -sr) 2>/dev/null` in
+- "SunOS 5"*)
- echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
-+ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
+- cat >conftest.$ac_ext <<_ACEOF
++ { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
- cat >conftest.$ac_ext <<_ACEOF
++ ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
++ ac_xsave_c_werror_flag=$ac_c_werror_flag
++ ac_c_werror_flag=yes
++ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
-@@ -22727,24 +24279,36 @@
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -22728,43 +24283,48 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14716,26 +14524,30 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22753,13 +24317,14 @@
+- ac_R_nospace=yes
++ { echo "$as_me:$LINENO: result: no" >&5
++echo "${ECHO_T}no" >&6; }
++ X_LIBS="$X_LIBS -R$x_libraries"
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_R_nospace=no
-+ ac_R_nospace=no
- fi
+-fi
-rm -f conftest.err conftest.$ac_objext \
-+
-+rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_nospace = yes; then
+- conftest$ac_exeext conftest.$ac_ext
+- if test $ac_R_nospace = yes; then
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-+ { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- X_LIBS="$X_LIBS -R$x_libraries"
- else
+- X_LIBS="$X_LIBS -R$x_libraries"
+- else
LIBS="$ac_xsave_LIBS -R $x_libraries"
-@@ -22779,24 +24344,36 @@
+- cat >conftest.$ac_ext <<_ACEOF
++ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+@@ -22780,47 +24340,58 @@
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
@@ -14780,32 +14592,43 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22805,17 +24382,18 @@
+- ac_R_space=yes
++ { echo "$as_me:$LINENO: result: yes" >&5
++echo "${ECHO_T}yes" >&6; }
++ X_LIBS="$X_LIBS -R $x_libraries"
+ else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_R_space=no
-+ ac_R_space=no
++ { echo "$as_me:$LINENO: result: neither works" >&5
++echo "${ECHO_T}neither works" >&6; }
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- if test $ac_R_space = yes; then
+- if test $ac_R_space = yes; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-+ { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- X_LIBS="$X_LIBS -R $x_libraries"
- else
+- X_LIBS="$X_LIBS -R $x_libraries"
+- else
- echo "$as_me:$LINENO: result: neither works" >&5
-echo "${ECHO_T}neither works" >&6
-+ { echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
- fi
- LIBS=$ac_xsave_LIBS
-@@ -22840,40 +24418,52 @@
+- fi
+- fi
+- LIBS=$ac_xsave_LIBS
+- esac
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++ ac_c_werror_flag=$ac_xsave_c_werror_flag
++ LIBS=$ac_xsave_LIBS
+ fi
+
+ # Check for system-dependent libraries X programs must link with.
+@@ -22841,40 +24412,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14870,7 +14693,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22882,8 +24472,8 @@
+@@ -22883,8 +24466,8 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14881,7 +14704,7 @@
if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22896,40 +24486,52 @@
+@@ -22897,40 +24480,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -14946,7 +14769,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -22938,21 +24540,22 @@
+@@ -22939,21 +24534,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -14955,7 +14778,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -14975,7 +14798,7 @@
if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -22965,40 +24568,52 @@
+@@ -22966,40 +24562,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15040,7 +14863,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23007,21 +24622,23 @@
+@@ -23008,21 +24616,23 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15049,7 +14872,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15065,11 +14888,11 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$ac_xsave_LIBS"
-@@ -23033,8 +24650,8 @@
+@@ -23034,8 +24644,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.
@@ -15080,7 +14903,7 @@
if test "${ac_cv_func_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23061,53 +24678,59 @@
+@@ -23062,53 +24672,59 @@
#undef gethostbyname
@@ -15159,7 +14982,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23116,17 +24739,18 @@
+@@ -23117,17 +24733,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15168,7 +14991,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
@@ -15184,7 +15007,7 @@
if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23139,40 +24763,52 @@
+@@ -23140,40 +24757,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15249,7 +15072,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23181,21 +24817,22 @@
+@@ -23182,21 +24811,22 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15258,7 +15081,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15278,7 +15101,7 @@
if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23208,40 +24845,52 @@
+@@ -23209,40 +24839,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15343,7 +15166,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23250,14 +24899,15 @@
+@@ -23251,14 +24893,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15352,7 +15175,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15363,7 +15186,7 @@
if test $ac_cv_lib_bsd_gethostbyname = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
fi
-@@ -23272,8 +24922,8 @@
+@@ -23273,8 +24916,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.
@@ -15374,7 +15197,7 @@
if test "${ac_cv_func_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23300,53 +24950,59 @@
+@@ -23301,53 +24944,59 @@
#undef connect
@@ -15453,7 +15276,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23355,17 +25011,18 @@
+@@ -23356,17 +25005,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15462,7 +15285,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
@@ -15478,7 +15301,7 @@
if test "${ac_cv_lib_socket_connect+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23378,40 +25035,52 @@
+@@ -23379,40 +25029,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15543,7 +15366,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23420,14 +25089,15 @@
+@@ -23421,14 +25083,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15552,7 +15375,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15563,7 +15386,7 @@
if test $ac_cv_lib_socket_connect = yes; then
X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
fi
-@@ -23435,8 +25105,8 @@
+@@ -23436,8 +25099,8 @@
fi
# Guillermo Gomez says -lposix is necessary on A/UX.
@@ -15574,7 +15397,7 @@
if test "${ac_cv_func_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23463,53 +25133,59 @@
+@@ -23464,53 +25127,59 @@
#undef remove
@@ -15653,7 +15476,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23518,17 +25194,18 @@
+@@ -23519,17 +25188,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15662,7 +15485,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
@@ -15678,7 +15501,7 @@
if test "${ac_cv_lib_posix_remove+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23541,40 +25218,52 @@
+@@ -23542,40 +25212,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15743,7 +15566,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23583,14 +25272,15 @@
+@@ -23584,14 +25266,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15752,7 +15575,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15763,7 +15586,7 @@
if test $ac_cv_lib_posix_remove = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
fi
-@@ -23598,8 +25288,8 @@
+@@ -23599,8 +25282,8 @@
fi
# BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -15774,7 +15597,7 @@
if test "${ac_cv_func_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23626,53 +25316,59 @@
+@@ -23627,53 +25310,59 @@
#undef shmat
@@ -15853,7 +15676,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23681,17 +25377,18 @@
+@@ -23682,17 +25371,18 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15862,7 +15685,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
@@ -15878,7 +15701,7 @@
if test "${ac_cv_lib_ipc_shmat+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23704,40 +25401,52 @@
+@@ -23705,40 +25395,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -15943,7 +15766,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23746,14 +25455,15 @@
+@@ -23747,14 +25449,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -15952,7 +15775,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -15963,7 +15786,7 @@
if test $ac_cv_lib_ipc_shmat = yes; then
X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
fi
-@@ -23770,8 +25480,8 @@
+@@ -23771,8 +25474,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
@@ -15974,7 +15797,7 @@
if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -23784,40 +25494,52 @@
+@@ -23785,40 +25488,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16039,7 +15862,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23826,14 +25548,15 @@
+@@ -23827,14 +25542,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16048,7 +15871,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16059,7 +15882,7 @@
if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
fi
-@@ -23851,17 +25574,17 @@
+@@ -23852,17 +25568,17 @@
CFLAGS="$CFLAGS $X_CFLAGS"
LDFLAGS="$LDFLAGS $X_LIBS"
if test "${ac_cv_header_X11_extensions_scrnsaver_h+set}" = set; then
@@ -16083,7 +15906,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23872,24 +25595,36 @@
+@@ -23873,24 +25589,36 @@
#include <X11/extensions/scrnsaver.h>
_ACEOF
rm -f conftest.$ac_objext
@@ -16128,7 +15951,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -23898,15 +25633,16 @@
+@@ -23899,15 +25627,16 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16151,7 +15974,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23915,8 +25651,13 @@
+@@ -23916,8 +25645,13 @@
/* end confdefs.h. */
#include <X11/extensions/scrnsaver.h>
_ACEOF
@@ -16167,7 +15990,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -23940,9 +25681,10 @@
+@@ -23941,9 +25675,10 @@
ac_header_preproc=no
fi
@@ -16180,7 +16003,7 @@
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -23966,25 +25708,18 @@
+@@ -23967,25 +25702,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;}
@@ -16211,7 +16034,7 @@
fi
if test $ac_cv_header_X11_extensions_scrnsaver_h = yes; then
-@@ -23994,8 +25729,8 @@
+@@ -23995,8 +25723,8 @@
fi
@@ -16222,7 +16045,7 @@
if test "${ac_cv_lib_Xss_XScreenSaverQueryExtension+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -24008,40 +25743,52 @@
+@@ -24009,40 +25737,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -16287,7 +16110,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -24050,14 +25797,15 @@
+@@ -24051,14 +25791,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -16296,7 +16119,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -16307,7 +16130,7 @@
if test $ac_cv_lib_Xss_XScreenSaverQueryExtension = yes; then
enable_libxss=yes
else
-@@ -24088,13 +25836,13 @@
+@@ -24089,13 +25830,13 @@
LDFLAGS="$OLD_LDFLAGS"
LIBS="$OLD_LIBS"
@@ -16325,7 +16148,7 @@
if test "x$enable_tbird" = "xyes"; then
-@@ -24107,13 +25855,13 @@
+@@ -24108,13 +25849,13 @@
@@ -16343,7 +16166,7 @@
-@@ -24132,8 +25880,8 @@
+@@ -24133,8 +25874,8 @@
# we get the GNOME prefix from libgnome-2.0
pkg_failed=no
@@ -16354,7 +16177,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$GNOME_VFS_CFLAGS"; then
-@@ -24237,16 +25985,16 @@
+@@ -24238,16 +25979,16 @@
else
GNOME_VFS_CFLAGS=$pkg_cv_GNOME_VFS_CFLAGS
GNOME_VFS_LIBS=$pkg_cv_GNOME_VFS_LIBS
@@ -16375,7 +16198,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$BEAGLE_UI_CFLAGS"; then
-@@ -24420,16 +26168,16 @@
+@@ -24421,16 +26162,16 @@
else
BEAGLE_UI_CFLAGS=$pkg_cv_BEAGLE_UI_CFLAGS
BEAGLE_UI_LIBS=$pkg_cv_BEAGLE_UI_LIBS
@@ -16396,7 +16219,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$UIGLUE_CFLAGS"; then
-@@ -24533,8 +26281,8 @@
+@@ -24534,8 +26275,8 @@
else
UIGLUE_CFLAGS=$pkg_cv_UIGLUE_CFLAGS
UIGLUE_LIBS=$pkg_cv_UIGLUE_LIBS
@@ -16407,7 +16230,7 @@
:
fi
-@@ -24546,8 +26294,8 @@
+@@ -24547,8 +26288,8 @@
pkg_failed=no
@@ -16418,7 +16241,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$LIBTRAYICON_CFLAGS"; then
-@@ -24681,8 +26429,8 @@
+@@ -24682,8 +26423,8 @@
else
LIBTRAYICON_CFLAGS=$pkg_cv_LIBTRAYICON_CFLAGS
LIBTRAYICON_LIBS=$pkg_cv_LIBTRAYICON_LIBS
@@ -16429,7 +16252,7 @@
:
fi
-@@ -24693,8 +26441,8 @@
+@@ -24694,8 +26435,8 @@
pkg_failed=no
@@ -16440,7 +16263,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$OPEN_WITH_CFLAGS"; then
-@@ -24766,14 +26514,16 @@
+@@ -24767,14 +26508,16 @@
# Put the nasty error message in config.log where it belongs
echo "$OPEN_WITH_PKG_ERRORS" >&5
@@ -16460,7 +16283,7 @@
OPEN_WITH=yes
fi
-@@ -24788,13 +26538,13 @@
+@@ -24789,13 +26532,13 @@
@@ -16478,7 +16301,7 @@
EVO_SHARP_PREFIX=`$PKG_CONFIG --variable=prefix evolution-sharp`
-@@ -24804,8 +26554,8 @@
+@@ -24805,8 +26548,8 @@
pkg_failed=no
@@ -16489,7 +16312,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$EVO_CFLAGS"; then
-@@ -24877,14 +26627,16 @@
+@@ -24878,14 +26621,16 @@
# Put the nasty error message in config.log where it belongs
echo "$EVO_PKG_ERRORS" >&5
@@ -16509,7 +16332,7 @@
have_evo_dependencies=yes
fi
-@@ -24936,13 +26688,13 @@
+@@ -24937,13 +26682,13 @@
@@ -16527,7 +16350,7 @@
if test "x$os_has_inotify" = "xno"; then
-@@ -24979,8 +26731,8 @@
+@@ -24980,8 +26725,8 @@
pkg_failed=no
@@ -16538,7 +16361,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$GSF_SHARP_CFLAGS"; then
-@@ -25036,14 +26788,16 @@
+@@ -25037,14 +26782,16 @@
# Put the nasty error message in config.log where it belongs
echo "$GSF_SHARP_PKG_ERRORS" >&5
@@ -16558,7 +16381,7 @@
enable_gsf_sharp=yes
fi
-@@ -25065,8 +26819,8 @@
+@@ -25066,8 +26813,8 @@
pkg_failed=no
@@ -16569,7 +16392,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$LIBEXIF_CFLAGS"; then
-@@ -25170,14 +26924,14 @@
+@@ -25171,14 +26918,14 @@
else
LIBEXIF_CFLAGS=$pkg_cv_LIBEXIF_CFLAGS
LIBEXIF_LIBS=$pkg_cv_LIBEXIF_LIBS
@@ -16588,7 +16411,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$LIBEXIF_API_CHECK_CFLAGS"; then
-@@ -25233,14 +26987,16 @@
+@@ -25234,14 +26981,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBEXIF_API_CHECK_PKG_ERRORS" >&5
@@ -16608,7 +16431,7 @@
have_old_libexif=no
fi
-@@ -25249,8 +27005,8 @@
+@@ -25250,8 +26999,8 @@
else
pkg_failed=no
@@ -16619,7 +16442,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$LIBEXIF_VERSION_CHECK_CFLAGS"; then
-@@ -25306,14 +27062,16 @@
+@@ -25307,14 +27056,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBEXIF_VERSION_CHECK_PKG_ERRORS" >&5
@@ -16639,7 +16462,7 @@
EXIF_SOVERSION=12
fi
fi
-@@ -25321,8 +27079,8 @@
+@@ -25322,8 +27073,8 @@
pkg_failed=no
@@ -16650,7 +16473,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$BEAGLED_CFLAGS"; then
-@@ -25466,8 +27224,8 @@
+@@ -25467,8 +27218,8 @@
else
BEAGLED_CFLAGS=$pkg_cv_BEAGLED_CFLAGS
BEAGLED_LIBS=$pkg_cv_BEAGLED_LIBS
@@ -16661,7 +16484,7 @@
:
fi
BEAGLED_LIBS="$BEAGLED_LIBS $GSF_SHARP_LIBS"
-@@ -25480,31 +27238,31 @@
+@@ -25481,31 +27232,31 @@
@@ -16703,7 +16526,7 @@
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -25519,28 +27277,29 @@
+@@ -25520,28 +27271,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -16739,7 +16562,7 @@
fi
if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
have_gtk_doc=yes
-@@ -25548,14 +27307,14 @@
+@@ -25549,14 +27301,14 @@
gtk_doc_min_version=1.0
if test "$have_gtk_doc" = yes; then
@@ -16760,7 +16583,7 @@
have_gtk_doc=no
fi
fi
-@@ -25587,13 +27346,13 @@
+@@ -25588,13 +27340,13 @@
@@ -16778,7 +16601,7 @@
LIBBEAGLE_CURRENT=0
-@@ -25606,8 +27365,8 @@
+@@ -25607,8 +27359,8 @@
pkg_failed=no
@@ -16789,7 +16612,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$LIBBEAGLE_CFLAGS"; then
-@@ -25687,14 +27446,16 @@
+@@ -25688,14 +27440,16 @@
# Put the nasty error message in config.log where it belongs
echo "$LIBBEAGLE_PKG_ERRORS" >&5
@@ -16809,7 +16632,7 @@
have_libbeagle_deps=yes
fi
-@@ -25729,13 +27490,13 @@
+@@ -25730,13 +27484,13 @@
fi
@@ -16827,7 +16650,7 @@
if test "x$enable_bludgeon" = "xyes"; then
-@@ -25749,13 +27510,13 @@
+@@ -25750,13 +27504,13 @@
@@ -16845,7 +16668,7 @@
if $PKG_CONFIG --exists epiphany-2.14; then
EPIPHANY_MAJOR=2.14
-@@ -25783,8 +27544,8 @@
+@@ -25784,8 +27538,8 @@
pkg_failed=no
@@ -16856,7 +16679,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$EPIPHANY_DEPENDENCY_CFLAGS"; then
-@@ -25880,14 +27641,16 @@
+@@ -25881,14 +27635,16 @@
# Put the nasty error message in config.log where it belongs
echo "$EPIPHANY_DEPENDENCY_PKG_ERRORS" >&5
@@ -16876,7 +16699,7 @@
have_epiphany_dependencies=yes
fi
-@@ -25917,13 +27680,13 @@
+@@ -25918,13 +27674,13 @@
fi
@@ -16894,7 +16717,7 @@
-@@ -25940,8 +27703,8 @@
+@@ -25941,8 +27697,8 @@
pkg_failed=no
@@ -16905,7 +16728,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$GALAGO_CFLAGS"; then
-@@ -25997,14 +27760,16 @@
+@@ -25998,14 +27754,16 @@
# Put the nasty error message in config.log where it belongs
echo "$GALAGO_PKG_ERRORS" >&5
@@ -16925,7 +16748,7 @@
enable_galago=yes
fi
-@@ -26032,8 +27797,8 @@
+@@ -26033,8 +27791,8 @@
pkg_failed=no
@@ -16936,7 +16759,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$WV1_CFLAGS"; then
-@@ -26089,14 +27854,16 @@
+@@ -26090,14 +27848,16 @@
# Put the nasty error message in config.log where it belongs
echo "$WV1_PKG_ERRORS" >&5
@@ -16956,7 +16779,7 @@
enable_wv1=yes
fi
-@@ -26116,8 +27883,8 @@
+@@ -26117,8 +27877,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
@@ -16967,7 +16790,7 @@
if test "${ac_cv_path_KDE_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26132,28 +27899,29 @@
+@@ -26133,28 +27893,29 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17003,7 +16826,7 @@
if test ! "x$KDE_CONFIG" = "xno"; then
KDE_PREFIX=`$KDE_CONFIG --prefix`
kde_prefix_print="$KDE_PREFIX"
-@@ -26187,8 +27955,8 @@
+@@ -26188,8 +27949,8 @@
# Check for libchm for CHM filter
@@ -17014,7 +16837,7 @@
if test "${ac_cv_lib_chm_chm_open+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26201,40 +27969,52 @@
+@@ -26202,40 +27963,52 @@
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
@@ -17079,7 +16902,7 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
-@@ -26243,14 +28023,15 @@
+@@ -26244,14 +28017,15 @@
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -17088,7 +16911,7 @@
fi
-rm -f conftest.err conftest.$ac_objext \
+
-+rm -f core conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -17099,7 +16922,7 @@
if test $ac_cv_lib_chm_chm_open = yes; then
has_libchm=yes
else
-@@ -26272,13 +28053,13 @@
+@@ -26273,13 +28047,13 @@
BEAGLE_DEFINES=""
@@ -17117,7 +16940,7 @@
if test "x$enable_xml_dump" = "xyes"; then
-@@ -26293,13 +28074,13 @@
+@@ -26294,13 +28068,13 @@
@@ -17135,7 +16958,7 @@
have_python=no
if test "x$enable_libbeagle" = "xyes" -a "x$enable_python" != "xno"; then
-@@ -26312,14 +28093,69 @@
+@@ -26313,14 +28087,69 @@
@@ -17213,7 +17036,7 @@
if test "${ac_cv_path_PYTHON+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26334,33 +28170,31 @@
+@@ -26335,33 +28164,31 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17255,7 +17078,7 @@
if test "$PYTHON" = :; then
-@@ -26370,15 +28204,15 @@
+@@ -26371,15 +28198,15 @@
else
@@ -17275,7 +17098,7 @@
PYTHON_VERSION=$am_cv_python_version
-@@ -26389,30 +28223,30 @@
+@@ -26390,30 +28217,30 @@
@@ -17314,7 +17137,7 @@
pythondir=$am_cv_python_pythondir
-@@ -26420,16 +28254,16 @@
+@@ -26421,16 +28248,16 @@
pkgpythondir=\${pythondir}/$PACKAGE
@@ -17335,7 +17158,7 @@
pyexecdir=$am_cv_python_pyexecdir
-@@ -26470,8 +28304,8 @@
+@@ -26471,8 +28298,8 @@
echo "$as_me: WARNING: Python version $PYTHON_REQUIRED not found" >&2;}
else
@@ -17346,7 +17169,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}"
-@@ -26489,8 +28323,13 @@
+@@ -26490,8 +28317,13 @@
/* end confdefs.h. */
#include <Python.h>
_ACEOF
@@ -17362,7 +17185,7 @@
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
-@@ -26507,17 +28346,18 @@
+@@ -26508,17 +28340,18 @@
ac_cpp_err=yes
fi
if test -z "$ac_cpp_err"; then
@@ -17385,7 +17208,7 @@
rm -f conftest.err conftest.$ac_ext
CPPFLAGS="$save_CPPFLAGS"
-@@ -26529,8 +28369,8 @@
+@@ -26530,8 +28363,8 @@
else
pkg_failed=no
@@ -17396,7 +17219,7 @@
if test -n "$PKG_CONFIG"; then
if test -n "$PYBEAGLE_CFLAGS"; then
-@@ -26594,14 +28434,16 @@
+@@ -26595,14 +28428,16 @@
# Put the nasty error message in config.log where it belongs
echo "$PYBEAGLE_PKG_ERRORS" >&5
@@ -17416,7 +17239,7 @@
have_pygtk_deps=yes
fi
fi
-@@ -26612,8 +28454,8 @@
+@@ -26613,8 +28448,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
@@ -17427,7 +17250,7 @@
if test "${ac_cv_path_PYGTK_CODEGEN+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
-@@ -26628,39 +28470,40 @@
+@@ -26629,39 +28464,40 @@
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
@@ -17478,7 +17301,7 @@
have_python=yes
fi
-@@ -26693,7 +28536,8 @@
+@@ -26694,7 +28530,8 @@
@@ -17488,7 +17311,7 @@
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
-@@ -26712,39 +28556,58 @@
+@@ -26713,39 +28550,58 @@
# The following way of writing the cache mishandles newlines in values,
# but we know of no workaround that is simple, portable, and efficient.
@@ -17563,7 +17386,7 @@
fi
fi
rm -f confcache
-@@ -26753,32 +28616,18 @@
+@@ -26754,32 +28610,18 @@
# Let make expand exec_prefix.
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -17602,19 +17425,16 @@
done
LIBOBJS=$ac_libobjs
-@@ -26849,9 +28698,8 @@
+@@ -26850,7 +28692,7 @@
{ (exit 1); exit 1; }; }
fi
-- mv -f po/POTFILES po/POTFILES.tmp
-- sed -e '/[[]encoding.*]/d' -e 's/[[].*] *//' < po/POTFILES.tmp > po/POTFILES
-- rm -f po/POTFILES.tmp
+- ac_config_commands="$ac_config_commands po/stamp-it"
+ ac_config_commands="$ac_config_commands po/stamp-it"
-+
+
if test -z "${ENABLE_LIBXSS_TRUE}" && test -z "${ENABLE_LIBXSS_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"ENABLE_LIBXSS\" was never defined.
-@@ -27017,11 +28865,35 @@
+@@ -27017,11 +28859,35 @@
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
@@ -17652,7 +17472,7 @@
# Support unset when possible.
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
as_unset=unset
-@@ -27030,8 +28902,43 @@
+@@ -27030,8 +28896,43 @@
fi
@@ -17697,7 +17517,7 @@
PS1='$ '
PS2='> '
PS4='+ '
-@@ -27045,18 +28952,19 @@
+@@ -27045,18 +28946,19 @@
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
eval $as_var=C; export $as_var
else
@@ -17720,7 +17540,7 @@
as_basename=basename
else
as_basename=false
-@@ -27064,159 +28972,120 @@
+@@ -27064,159 +28966,120 @@
# Name of the executable.
@@ -17737,6 +17557,14 @@
- /^X\/\(\/\).*/{ s//\1/; q; }
- s/.*/./; q'`
-
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
+ sed '/^.*\/\([^/][^/]*\)\/*$/{
+ s//\1/
+ q
@@ -17751,16 +17579,6 @@
+ }
+ s/.*/./; q'`
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
-+# CDPATH.
-+$as_unset CDPATH
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
@@ -17773,12 +17591,14 @@
- fi
- rm -f conf$$.sh
-fi
++# CDPATH.
++$as_unset CDPATH
- as_lineno_1=$LINENO
- as_lineno_2=$LINENO
+- as_lineno_1=$LINENO
+- as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
- test "x$as_lineno_1" != "x$as_lineno_2" &&
+- test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" || {
- # Find who we are. Look in the path if we contain no path at all
- # relative or not.
@@ -17791,7 +17611,7 @@
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
--
+
- ;;
- esac
- # We did not find ourselves, most probably we were run as `sh COMMAND'
@@ -17815,10 +17635,10 @@
- case $as_dir in
- /*)
- if ("$as_dir/$as_base" -c '
-- as_lineno_1=$LINENO
-- as_lineno_2=$LINENO
+ as_lineno_1=$LINENO
+ as_lineno_2=$LINENO
- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-- test "x$as_lineno_1" != "x$as_lineno_2" &&
+ test "x$as_lineno_1" != "x$as_lineno_2" &&
- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then
- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
@@ -17951,7 +17771,7 @@
if mkdir -p . 2>/dev/null; then
as_mkdir_p=:
-@@ -27225,7 +29094,19 @@
+@@ -27225,7 +29088,19 @@
as_mkdir_p=false
fi
@@ -17972,7 +17792,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'"
-@@ -27234,31 +29115,14 @@
+@@ -27234,31 +29109,14 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
@@ -18004,11 +17824,11 @@
+ac_log="
This file was extended by $as_me, which was
-generated by GNU Autoconf 2.59. Invocation command line was
-+generated by GNU Autoconf 2.60. Invocation command line was
++generated by GNU Autoconf 2.60a. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
-@@ -27266,30 +29130,20 @@
+@@ -27266,30 +29124,20 @@
CONFIG_COMMANDS = $CONFIG_COMMANDS
$ $0 $@
@@ -18047,7 +17867,16 @@
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-@@ -27316,19 +29170,21 @@
+@@ -27297,7 +29145,7 @@
+ Usage: $0 [OPTIONS] [FILE]...
+
+ -h, --help print this help, then exit
+- -V, --version print version number, then exit
++ -V, --version print version number and configuration settings, then exit
+ -q, --quiet do not print progress messages
+ -d, --debug don't remove temporary files
+ --recheck update $as_me by reconfiguring in the same conditions
+@@ -27316,19 +29164,21 @@
$config_commands
Report bugs to <bug-autoconf at gnu.org>."
@@ -18059,7 +17888,7 @@
config.status
-configured by $0, generated by GNU Autoconf 2.59,
- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60,
++configured by $0, generated by GNU Autoconf 2.60a,
+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2003 Free Software Foundation, Inc.
@@ -18075,7 +17904,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -27339,39 +29195,24 @@
+@@ -27339,39 +29189,24 @@
do
case $1 in
--*=*)
@@ -18121,7 +17950,7 @@
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
-@@ -27381,18 +29222,24 @@
+@@ -27381,18 +29216,24 @@
$ac_shift
CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
ac_need_defaults=false;;
@@ -18151,7 +17980,7 @@
esac
shift
-@@ -27408,71 +29255,85 @@
+@@ -27408,17 +29249,28 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
if \$ac_cs_recheck; then
@@ -18182,17 +18011,10 @@
#
-
AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
--INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
--INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
--MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
--XGETTEXT='${INTLTOOL_XGETTEXT}'
-+INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-+prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-+INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-+INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-+INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
+ INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
+ prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
+@@ -27429,52 +29281,53 @@
-
_ACEOF
-
@@ -18235,6 +18057,7 @@
- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
- "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+- "po/stamp-it" ) CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
+ case $ac_config_target in
+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
@@ -18281,7 +18104,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
-@@ -27484,774 +29345,806 @@
+@@ -27486,776 +29339,806 @@
fi
# Have a temporary directory for convenience. Make it in the build tree
@@ -18473,6 +18296,7 @@
-s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
-s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
-s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
+-s, at INTLTOOL_SERVICE_RULE@,$INTLTOOL_SERVICE_RULE,;t t
-s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
-s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
-s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
@@ -18481,6 +18305,7 @@
-s, at INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
-s, at INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
-s, at INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
+-s, at ALL_LINGUAS@,$ALL_LINGUAS,;t t
-s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-s, at USE_NLS@,$USE_NLS,;t t
-s, at MSGFMT@,$MSGFMT,;t t
@@ -18889,7 +18714,7 @@
+OPEN_WITH_CFLAGS!$OPEN_WITH_CFLAGS$ac_delim
+OPEN_WITH_LIBS!$OPEN_WITH_LIBS$ac_delim
+_ACEOF
-
++
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+ break
+ elif $ac_last_try; then
@@ -19014,8 +18839,8 @@
+PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
+LIBOBJS!$LIBOBJS$ac_delim
+LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-+
++_ACEOF
+
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+ break
+ elif $ac_last_try; then
@@ -19036,7 +18861,7 @@
+cat >>$CONFIG_STATUS <<_ACEOF
+cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+_ACEOF
+ _ACEOF
+sed '
+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
+s/^/s,@/; s/!/@,|#_!!_#|/
@@ -19765,7 +19590,7 @@
# Compute $ac_file's index in $config_headers.
_am_stamp_count=1
for _am_header in $config_headers :; do
-@@ -28262,135 +30155,39 @@
+@@ -28266,135 +30149,39 @@
_am_stamp_count=`expr $_am_stamp_count + 1` ;;
esac
done
@@ -19927,7 +19752,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.
-@@ -28400,18 +30197,29 @@
+@@ -28404,18 +30191,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
@@ -19965,7 +19790,7 @@
else
continue
fi
-@@ -28433,96 +30241,126 @@
+@@ -28437,49 +30235,76 @@
sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
# Make sure the directory exists.
test -f "$dirpart/$file" && continue
@@ -20065,91 +19890,28 @@
done
;;
- intltool )
--
--intltool_edit="-e 's#@INTLTOOL_EXTRACT@#`pwd`/intltool-extract#g' \
-- -e 's#@INTLTOOL_ICONV@#${INTLTOOL_ICONV}#g' \
-- -e 's#@INTLTOOL_MSGFMT@#${INTLTOOL_MSGFMT}#g' \
-- -e 's#@INTLTOOL_MSGMERGE@#${INTLTOOL_MSGMERGE}#g' \
-- -e 's#@INTLTOOL_XGETTEXT@#${INTLTOOL_XGETTEXT}#g' \
-- -e 's#@INTLTOOL_PERL@#${INTLTOOL_PERL}#g'"
--
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-- > intltool-extract.out
--if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-- rm -f intltool-extract.out
--else
-- mv -f intltool-extract.out intltool-extract
--fi
--chmod ugo+x intltool-extract
--chmod u+w intltool-extract
--
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-- > intltool-merge.out
--if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-- rm -f intltool-merge.out
--else
-- mv -f intltool-merge.out intltool-merge
--fi
--chmod ugo+x intltool-merge
--chmod u+w intltool-merge
+ "intltool":C)
--eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-- > intltool-update.out
--if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-- rm -f intltool-update.out
--else
-- mv -f intltool-update.out intltool-update
--fi
--chmod ugo+x intltool-update
--chmod u+w intltool-update
-+for file in intltool-extract intltool-merge intltool-update; do
-+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
-+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
-+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
-+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
-+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
-+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
-+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-+ < ${ac_aux_dir}/${file}.in > ${file}.out
-+ if cmp -s ${file} ${file}.out 2>/dev/null; then
-+ rm -f ${file}.out
-+ else
-+ mv -f ${file}.out ${file}
-+ fi
-+ chmod ugo+x ${file}
-+ chmod u+w ${file}
-+done
+ for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+@@ -28500,10 +30325,10 @@
+ done
;;
- default-1 ) case "$CONFIG_FILES" in *po/Makefile.in*)
+ "default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
+- po/stamp-it )
+ "po/stamp-it":C)
-+ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
-+ >"po/stamp-it.tmp"
-+ sed '/^#/d
-+ s/^[[].*] *//
-+ /^[ ]*$/d
-+ '"s|^| $ac_top_srcdir/|" \
-+ "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES"
+ rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+ >"po/stamp-it.tmp"
+ sed '/^#/d
+@@ -28526,11 +30351,10 @@
+ rm -f "po/Makefile.tmp"
+ mv "po/stamp-it.tmp" "po/stamp-it"
+ ;;
+
-+ if test ! -f "po/Makefile"; then
-+ { { echo "$as_me:$LINENO: error: po/Makefile is not ready." >&5
-+echo "$as_me: error: po/Makefile is not ready." >&2;}
-+ { (exit 1); exit 1; }; }
-+ fi
-+ mv "po/Makefile" "po/Makefile.tmp"
-+ sed '/^POTFILES =/,/[^\\]$/ {
-+ /^POTFILES =/!d
-+ r po/POTFILES
-+ }
-+ ' "po/Makefile.tmp" >"po/Makefile"
-+ rm -f "po/Makefile.tmp"
-+ mv "po/stamp-it.tmp" "po/stamp-it"
-+ ;;
-+
esac
-done
-_ACEOF
@@ -20159,2567 +19921,9 @@
{ (exit 0); exit 0; }
_ACEOF
-diff -urNad beagle-0.2.8~/configure.rej beagle-0.2.8/configure.rej
---- beagle-0.2.8~/configure.rej 1970-01-01 01:00:00.000000000 +0100
-+++ beagle-0.2.8/configure.rej 2006-08-24 11:59:38.000000000 +0200
-@@ -0,0 +1,2554 @@
-+***************
-+*** 454,470 ****
-+ #endif
-+ #if HAVE_INTTYPES_H
-+ # include <inttypes.h>
-+- #else
-+- # if HAVE_STDINT_H
-+- # include <stdint.h>
-+- # endif
-+ #endif
-+ #if HAVE_UNISTD_H
-+ # include <unistd.h>
-+ #endif"
-+
-+- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG BASH ZIP MONO MCS ac_pt_PKG_CONFIG MONO_CFLAGS MONO_LIBS SHARPZIPLIB_LIBS OS_LINUX_TRUE OS_LINUX_FALSE OS_FREEBSD_TRUE OS_FREEBSD_FALSE DESKTOP_LAUNCH ENABLE_DESKTOP_LAUNCH_TRUE ENABLE_DESKTOP_LAUNCH_FALSE WSDL ENABLE_GOOGLEDRIVER_TRUE ENABLE_GOOGLEDRIVER_FALSE INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB SQLITE_CFLAGS SQLITE_LIBS SQLITE3_CFLAGS SQLITE3_LIBS SQLITE_MAJ_VER X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS HAS_LIBXSS_TRUE HAS_LIBXSS_FALSE ENABLE_GUI_TRUE ENABLE_GUI_FALSE GNOME_VFS_CFLAGS GNOME_VFS_LIBS BEAGLE_UI_CFLAGS BEAGLE_UI_LIBS UIGLUE_CFLAGS UIGLUE_LIBS LIBTRAYICON_CFLAGS LIBTRAYICON_LIBS OPEN_WITH_CFLAGS OPEN_WITH_LIBS ENABLE_OPEN_WITH_TRUE ENABLE_OPEN_WITH_FALSE EVO_LIBDIR EVO_CFLAGS EVO_LIBS ENABLE_EVOLUTION_TRUE ENABLE_EVOLUTION_FALSE USE_LOCAL_SQLITE_TRUE USE_LOCAL_SQLITE_FALSE ENABLE_INOTIFY_TRUE ENABLE_INOTIFY_FALSE GSF_SHARP_CFLAGS GSF_SHARP_LIBS ENABLE_GSF_SHARP_TRUE ENABLE_GSF_SHARP_FALSE LIBEXIF_CFLAGS LIBEXIF_LIBS LIBEXIF_API_CHECK_CFLAGS LIBEXIF_API_CHECK_LIBS LIBEXIF_VERSION_CHECK_CFLAGS LIBEXIF_VERSION_CHECK_LIBS EXIF_SOVERSION BEAGLED_CFLAGS BEAGLED_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBBEAGLE_VERSION_INFO LIBBEAGLE_CFLAGS LIBBEAGLE_LIBS ENABLE_LIBBEAGLE_TRUE ENABLE_LIBBEAGLE_FALSE ENABLE_BLUDGEON_TRUE ENABLE_BLUDGEON_FALSE EPIPHANY_REQUIRED LIBXML_REQUIRED LIBGLIB_REQUIRED LIBGTK_REQUIRED EPIPHANY_DEPENDENCY_CFLAGS EPIPHANY_DEPENDENCY_LIBS EPIPHANY_EXTENSIONS_DIR EPIPHANY_PREFIX ENABLE_EPIPHANY_EXTENSION_TRUE ENABLE_EPIPHANY_EXTENSION_FALSE INSTALL_EPIPHANY_EXTENSION_TRUE INSTALL_EPIPHANY_EXTENSION_FALSE GALAGO_CFLAGS GALAGO_LIBS ENABLE_GALAGO_TRUE ENABLE_GALAGO_FALSE GTK_BINARY_VERSION SYSTEMINFO_GLUE_CFLAGS SYSTEMINFO_GLUE_LIBS SYSTEMINFO_GLUE_X_LIBS WV1_CFLAGS WV1_LIBS ENABLE_WV1_TRUE ENABLE_WV1_FALSE KDE_CONFIG KDE_PREFIX ENABLE_WEBSERVICES_TRUE ENABLE_WEBSERVICES_FALSE GAC_PREFIX GNOME_PREFIX HAS_LIBCHM_TRUE HAS_LIBCHM_FALSE BEAGLE_DEFINES PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYBEAGLE_CFLAGS PYBEAGLE_LIBS PYGTK_CODEGEN ENABLE_PYTHON_TRUE ENABLE_PYTHON_FALSE PYGTK_DEFSDIR LIBOBJS LTLIBOBJS'
-+ ac_subst_files=''
-+
-+ # Initialize some variables set by options.
-+ ac_init_help=
-+--- 744,1094 ----
-+ #endif
-+ #if HAVE_INTTYPES_H
-+ # include <inttypes.h>
-++ #endif
-++ #if HAVE_STDINT_H
-++ # include <stdint.h>
-+ #endif
-+ #if HAVE_UNISTD_H
-+ # include <unistd.h>
-+ #endif"
-+
-++ ac_subst_vars='SHELL
-++ PATH_SEPARATOR
-++ PACKAGE_NAME
-++ PACKAGE_TARNAME
-++ PACKAGE_VERSION
-++ PACKAGE_STRING
-++ PACKAGE_BUGREPORT
-++ exec_prefix
-++ prefix
-++ program_transform_name
-++ bindir
-++ sbindir
-++ libexecdir
-++ datarootdir
-++ datadir
-++ sysconfdir
-++ sharedstatedir
-++ localstatedir
-++ includedir
-++ oldincludedir
-++ docdir
-++ infodir
-++ htmldir
-++ dvidir
-++ pdfdir
-++ psdir
-++ libdir
-++ localedir
-++ mandir
-++ DEFS
-++ ECHO_C
-++ ECHO_N
-++ ECHO_T
-++ LIBS
-++ build_alias
-++ host_alias
-++ target_alias
-++ build
-++ build_cpu
-++ build_vendor
-++ build_os
-++ host
-++ host_cpu
-++ host_vendor
-++ host_os
-++ target
-++ target_cpu
-++ target_vendor
-++ target_os
-++ INSTALL_PROGRAM
-++ INSTALL_SCRIPT
-++ INSTALL_DATA
-++ CYGPATH_W
-++ PACKAGE
-++ VERSION
-++ ACLOCAL
-++ AUTOCONF
-++ AUTOMAKE
-++ AUTOHEADER
-++ MAKEINFO
-++ install_sh
-++ STRIP
-++ INSTALL_STRIP_PROGRAM
-++ mkdir_p
-++ AWK
-++ SET_MAKE
-++ am__leading_dot
-++ AMTAR
-++ am__tar
-++ am__untar
-++ MAINTAINER_MODE_TRUE
-++ MAINTAINER_MODE_FALSE
-++ MAINT
-++ CC
-++ CFLAGS
-++ LDFLAGS
-++ CPPFLAGS
-++ ac_ct_CC
-++ EXEEXT
-++ OBJEXT
-++ DEPDIR
-++ am__include
-++ am__quote
-++ AMDEP_TRUE
-++ AMDEP_FALSE
-++ AMDEPBACKSLASH
-++ CCDEPMODE
-++ am__fastdepCC_TRUE
-++ am__fastdepCC_FALSE
-++ GREP
-++ EGREP
-++ LN_S
-++ ECHO
-++ AR
-++ RANLIB
-++ CPP
-++ CXX
-++ CXXFLAGS
-++ ac_ct_CXX
-++ CXXDEPMODE
-++ am__fastdepCXX_TRUE
-++ am__fastdepCXX_FALSE
-++ CXXCPP
-++ F77
-++ FFLAGS
-++ ac_ct_F77
-++ LIBTOOL
-++ PKG_CONFIG
-++ BASH
-++ ZIP
-++ MONO
-++ MCS
-++ MONO_CFLAGS
-++ MONO_LIBS
-++ SHARPZIPLIB_LIBS
-++ OS_LINUX_TRUE
-++ OS_LINUX_FALSE
-++ OS_FREEBSD_TRUE
-++ OS_FREEBSD_FALSE
-++ DESKTOP_LAUNCH
-++ ENABLE_DESKTOP_LAUNCH_TRUE
-++ ENABLE_DESKTOP_LAUNCH_FALSE
-++ WSDL
-++ ENABLE_GOOGLEDRIVER_TRUE
-++ ENABLE_GOOGLEDRIVER_FALSE
-++ INTLTOOL_DESKTOP_RULE
-++ INTLTOOL_DIRECTORY_RULE
-++ INTLTOOL_KEYS_RULE
-++ INTLTOOL_PROP_RULE
-++ INTLTOOL_OAF_RULE
-++ INTLTOOL_PONG_RULE
-++ INTLTOOL_SERVER_RULE
-++ INTLTOOL_SHEET_RULE
-++ INTLTOOL_SOUNDLIST_RULE
-++ INTLTOOL_UI_RULE
-++ INTLTOOL_XAM_RULE
-++ INTLTOOL_KBD_RULE
-++ INTLTOOL_XML_RULE
-++ INTLTOOL_XML_NOMERGE_RULE
-++ INTLTOOL_CAVES_RULE
-++ INTLTOOL_SCHEMAS_RULE
-++ INTLTOOL_THEME_RULE
-++ INTLTOOL_SERVICE_RULE
-++ INTLTOOL_EXTRACT
-++ INTLTOOL_MERGE
-++ INTLTOOL_UPDATE
-++ INTLTOOL_PERL
-++ INTLTOOL_ICONV
-++ INTLTOOL_MSGFMT
-++ INTLTOOL_MSGMERGE
-++ INTLTOOL_XGETTEXT
-++ ALL_LINGUAS
-++ GETTEXT_PACKAGE
-++ USE_NLS
-++ MSGFMT
-++ GMSGFMT
-++ XGETTEXT
-++ CATALOGS
-++ CATOBJEXT
-++ DATADIRNAME
-++ GMOFILES
-++ INSTOBJEXT
-++ INTLLIBS
-++ PO_IN_DATADIR_TRUE
-++ PO_IN_DATADIR_FALSE
-++ POFILES
-++ POSUB
-++ MKINSTALLDIRS
-++ SQLITE_CFLAGS
-++ SQLITE_LIBS
-++ SQLITE3_CFLAGS
-++ SQLITE3_LIBS
-++ SQLITE_MAJ_VER
-++ XMKMF
-++ X_CFLAGS
-++ X_PRE_LIBS
-++ X_LIBS
-++ X_EXTRA_LIBS
-++ HAS_LIBXSS_TRUE
-++ HAS_LIBXSS_FALSE
-++ ENABLE_GUI_TRUE
-++ ENABLE_GUI_FALSE
-++ GNOME_VFS_CFLAGS
-++ GNOME_VFS_LIBS
-++ BEAGLE_UI_CFLAGS
-++ BEAGLE_UI_LIBS
-++ UIGLUE_CFLAGS
-++ UIGLUE_LIBS
-++ LIBTRAYICON_CFLAGS
-++ LIBTRAYICON_LIBS
-++ OPEN_WITH_CFLAGS
-++ OPEN_WITH_LIBS
-++ ENABLE_OPEN_WITH_TRUE
-++ ENABLE_OPEN_WITH_FALSE
-++ EVO_LIBDIR
-++ EVO_CFLAGS
-++ EVO_LIBS
-++ ENABLE_EVOLUTION_TRUE
-++ ENABLE_EVOLUTION_FALSE
-++ USE_LOCAL_SQLITE_TRUE
-++ USE_LOCAL_SQLITE_FALSE
-++ ENABLE_INOTIFY_TRUE
-++ ENABLE_INOTIFY_FALSE
-++ GSF_SHARP_CFLAGS
-++ GSF_SHARP_LIBS
-++ ENABLE_GSF_SHARP_TRUE
-++ ENABLE_GSF_SHARP_FALSE
-++ LIBEXIF_CFLAGS
-++ LIBEXIF_LIBS
-++ LIBEXIF_API_CHECK_CFLAGS
-++ LIBEXIF_API_CHECK_LIBS
-++ LIBEXIF_VERSION_CHECK_CFLAGS
-++ LIBEXIF_VERSION_CHECK_LIBS
-++ EXIF_SOVERSION
-++ BEAGLED_CFLAGS
-++ BEAGLED_LIBS
-++ HTML_DIR
-++ ENABLE_GTK_DOC_TRUE
-++ ENABLE_GTK_DOC_FALSE
-++ GTK_DOC_USE_LIBTOOL_TRUE
-++ GTK_DOC_USE_LIBTOOL_FALSE
-++ LIBBEAGLE_VERSION_INFO
-++ LIBBEAGLE_CFLAGS
-++ LIBBEAGLE_LIBS
-++ ENABLE_LIBBEAGLE_TRUE
-++ ENABLE_LIBBEAGLE_FALSE
-++ ENABLE_BLUDGEON_TRUE
-++ ENABLE_BLUDGEON_FALSE
-++ EPIPHANY_REQUIRED
-++ LIBXML_REQUIRED
-++ LIBGLIB_REQUIRED
-++ LIBGTK_REQUIRED
-++ EPIPHANY_DEPENDENCY_CFLAGS
-++ EPIPHANY_DEPENDENCY_LIBS
-++ EPIPHANY_EXTENSIONS_DIR
-++ EPIPHANY_PREFIX
-++ ENABLE_EPIPHANY_EXTENSION_TRUE
-++ ENABLE_EPIPHANY_EXTENSION_FALSE
-++ INSTALL_EPIPHANY_EXTENSION_TRUE
-++ INSTALL_EPIPHANY_EXTENSION_FALSE
-++ GALAGO_CFLAGS
-++ GALAGO_LIBS
-++ ENABLE_GALAGO_TRUE
-++ ENABLE_GALAGO_FALSE
-++ GTK_BINARY_VERSION
-++ SYSTEMINFO_GLUE_CFLAGS
-++ SYSTEMINFO_GLUE_LIBS
-++ SYSTEMINFO_GLUE_X_LIBS
-++ WV1_CFLAGS
-++ WV1_LIBS
-++ ENABLE_WV1_TRUE
-++ ENABLE_WV1_FALSE
-++ KDE_CONFIG
-++ KDE_PREFIX
-++ ENABLE_WEBSERVICES_TRUE
-++ ENABLE_WEBSERVICES_FALSE
-++ GAC_PREFIX
-++ GNOME_PREFIX
-++ HAS_LIBCHM_TRUE
-++ HAS_LIBCHM_FALSE
-++ BEAGLE_DEFINES
-++ PYTHON
-++ PYTHON_VERSION
-++ PYTHON_PREFIX
-++ PYTHON_EXEC_PREFIX
-++ PYTHON_PLATFORM
-++ pythondir
-++ pkgpythondir
-++ pyexecdir
-++ pkgpyexecdir
-++ PYTHON_INCLUDES
-++ PYBEAGLE_CFLAGS
-++ PYBEAGLE_LIBS
-++ PYGTK_CODEGEN
-++ ENABLE_PYTHON_TRUE
-++ ENABLE_PYTHON_FALSE
-++ PYGTK_DEFSDIR
-++ LIBOBJS
-++ LTLIBOBJS'
-+ ac_subst_files=''
-++ ac_precious_vars='build_alias
-++ host_alias
-++ target_alias
-++ CC
-++ CFLAGS
-++ LDFLAGS
-++ CPPFLAGS
-++ CPP
-++ CXX
-++ CXXFLAGS
-++ CCC
-++ CXXCPP
-++ F77
-++ FFLAGS
-++ PKG_CONFIG
-++ MONO_CFLAGS
-++ MONO_LIBS
-++ SQLITE_CFLAGS
-++ SQLITE_LIBS
-++ SQLITE3_CFLAGS
-++ SQLITE3_LIBS
-++ XMKMF
-++ GNOME_VFS_CFLAGS
-++ GNOME_VFS_LIBS
-++ BEAGLE_UI_CFLAGS
-++ BEAGLE_UI_LIBS
-++ UIGLUE_CFLAGS
-++ UIGLUE_LIBS
-++ LIBTRAYICON_CFLAGS
-++ LIBTRAYICON_LIBS
-++ OPEN_WITH_CFLAGS
-++ OPEN_WITH_LIBS
-++ EVO_CFLAGS
-++ EVO_LIBS
-++ GSF_SHARP_CFLAGS
-++ GSF_SHARP_LIBS
-++ LIBEXIF_CFLAGS
-++ LIBEXIF_LIBS
-++ LIBEXIF_API_CHECK_CFLAGS
-++ LIBEXIF_API_CHECK_LIBS
-++ LIBEXIF_VERSION_CHECK_CFLAGS
-++ LIBEXIF_VERSION_CHECK_LIBS
-++ BEAGLED_CFLAGS
-++ BEAGLED_LIBS
-++ LIBBEAGLE_CFLAGS
-++ LIBBEAGLE_LIBS
-++ EPIPHANY_DEPENDENCY_CFLAGS
-++ EPIPHANY_DEPENDENCY_LIBS
-++ GALAGO_CFLAGS
-++ GALAGO_LIBS
-++ SYSTEMINFO_GLUE_CFLAGS
-++ SYSTEMINFO_GLUE_LIBS
-++ WV1_CFLAGS
-++ WV1_LIBS
-++ PYBEAGLE_CFLAGS
-++ PYBEAGLE_LIBS'
-++
-+
-+ # Initialize some variables set by options.
-+ ac_init_help=
-+***************
-+*** 856,1113 ****
-+ test "$silent" = yes && exec 6>/dev/null
-+
-+
-+ # Find the source files, if location was not specified.
-+ if test -z "$srcdir"; then
-+ ac_srcdir_defaulted=yes
-+- # Try the directory containing this script, then its parent.
-+- ac_confdir=`(dirname "$0") 2>/dev/null ||
-+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-+- X"$0" : 'X\(/\)' \| \
-+- . : '\(.\)' 2>/dev/null ||
-+ echo X"$0" |
-+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+- /^X\(\/\/\)$/{ s//\1/; q; }
-+- /^X\(\/\).*/{ s//\1/; q; }
-+- s/.*/./; q'`
-+ srcdir=$ac_confdir
-+- if test ! -r $srcdir/$ac_unique_file; then
-+ srcdir=..
-+ fi
-+ else
-+ ac_srcdir_defaulted=no
-+ fi
-+- if test ! -r $srcdir/$ac_unique_file; then
-+- if test "$ac_srcdir_defaulted" = yes; then
-+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-+- { (exit 1); exit 1; }; }
-+- else
-+- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+- fi
-+ fi
-+- (cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-+- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-+ { (exit 1); exit 1; }; }
-+- srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-+- ac_env_build_alias_set=${build_alias+set}
-+- ac_env_build_alias_value=$build_alias
-+- ac_cv_env_build_alias_set=${build_alias+set}
-+- ac_cv_env_build_alias_value=$build_alias
-+- ac_env_host_alias_set=${host_alias+set}
-+- ac_env_host_alias_value=$host_alias
-+- ac_cv_env_host_alias_set=${host_alias+set}
-+- ac_cv_env_host_alias_value=$host_alias
-+- ac_env_target_alias_set=${target_alias+set}
-+- ac_env_target_alias_value=$target_alias
-+- ac_cv_env_target_alias_set=${target_alias+set}
-+- ac_cv_env_target_alias_value=$target_alias
-+- ac_env_CC_set=${CC+set}
-+- ac_env_CC_value=$CC
-+- ac_cv_env_CC_set=${CC+set}
-+- ac_cv_env_CC_value=$CC
-+- ac_env_CFLAGS_set=${CFLAGS+set}
-+- ac_env_CFLAGS_value=$CFLAGS
-+- ac_cv_env_CFLAGS_set=${CFLAGS+set}
-+- ac_cv_env_CFLAGS_value=$CFLAGS
-+- ac_env_LDFLAGS_set=${LDFLAGS+set}
-+- ac_env_LDFLAGS_value=$LDFLAGS
-+- ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-+- ac_cv_env_LDFLAGS_value=$LDFLAGS
-+- ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-+- ac_env_CPPFLAGS_value=$CPPFLAGS
-+- ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-+- ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-+- ac_env_CPP_set=${CPP+set}
-+- ac_env_CPP_value=$CPP
-+- ac_cv_env_CPP_set=${CPP+set}
-+- ac_cv_env_CPP_value=$CPP
-+- ac_env_CXX_set=${CXX+set}
-+- ac_env_CXX_value=$CXX
-+- ac_cv_env_CXX_set=${CXX+set}
-+- ac_cv_env_CXX_value=$CXX
-+- ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-+- ac_env_CXXFLAGS_value=$CXXFLAGS
-+- ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-+- ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-+- ac_env_CXXCPP_set=${CXXCPP+set}
-+- ac_env_CXXCPP_value=$CXXCPP
-+- ac_cv_env_CXXCPP_set=${CXXCPP+set}
-+- ac_cv_env_CXXCPP_value=$CXXCPP
-+- ac_env_F77_set=${F77+set}
-+- ac_env_F77_value=$F77
-+- ac_cv_env_F77_set=${F77+set}
-+- ac_cv_env_F77_value=$F77
-+- ac_env_FFLAGS_set=${FFLAGS+set}
-+- ac_env_FFLAGS_value=$FFLAGS
-+- ac_cv_env_FFLAGS_set=${FFLAGS+set}
-+- ac_cv_env_FFLAGS_value=$FFLAGS
-+- ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+- ac_env_PKG_CONFIG_value=$PKG_CONFIG
-+- ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-+- ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-+- ac_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
-+- ac_env_MONO_CFLAGS_value=$MONO_CFLAGS
-+- ac_cv_env_MONO_CFLAGS_set=${MONO_CFLAGS+set}
-+- ac_cv_env_MONO_CFLAGS_value=$MONO_CFLAGS
-+- ac_env_MONO_LIBS_set=${MONO_LIBS+set}
-+- ac_env_MONO_LIBS_value=$MONO_LIBS
-+- ac_cv_env_MONO_LIBS_set=${MONO_LIBS+set}
-+- ac_cv_env_MONO_LIBS_value=$MONO_LIBS
-+- ac_env_SQLITE_CFLAGS_set=${SQLITE_CFLAGS+set}
-+- ac_env_SQLITE_CFLAGS_value=$SQLITE_CFLAGS
-+- ac_cv_env_SQLITE_CFLAGS_set=${SQLITE_CFLAGS+set}
-+- ac_cv_env_SQLITE_CFLAGS_value=$SQLITE_CFLAGS
-+- ac_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
-+- ac_env_SQLITE_LIBS_value=$SQLITE_LIBS
-+- ac_cv_env_SQLITE_LIBS_set=${SQLITE_LIBS+set}
-+- ac_cv_env_SQLITE_LIBS_value=$SQLITE_LIBS
-+- ac_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
-+- ac_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
-+- ac_cv_env_SQLITE3_CFLAGS_set=${SQLITE3_CFLAGS+set}
-+- ac_cv_env_SQLITE3_CFLAGS_value=$SQLITE3_CFLAGS
-+- ac_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
-+- ac_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
-+- ac_cv_env_SQLITE3_LIBS_set=${SQLITE3_LIBS+set}
-+- ac_cv_env_SQLITE3_LIBS_value=$SQLITE3_LIBS
-+- ac_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
-+- ac_env_GNOME_VFS_CFLAGS_value=$GNOME_VFS_CFLAGS
-+- ac_cv_env_GNOME_VFS_CFLAGS_set=${GNOME_VFS_CFLAGS+set}
-+- ac_cv_env_GNOME_VFS_CFLAGS_value=$GNOME_VFS_CFLAGS
-+- ac_env_GNOME_VFS_LIBS_set=${GNOME_VFS_LIBS+set}
-+- ac_env_GNOME_VFS_LIBS_value=$GNOME_VFS_LIBS
-+- ac_cv_env_GNOME_VFS_LIBS_set=${GNOME_VFS_LIBS+set}
-+- ac_cv_env_GNOME_VFS_LIBS_value=$GNOME_VFS_LIBS
-+- ac_env_BEAGLE_UI_CFLAGS_set=${BEAGLE_UI_CFLAGS+set}
-+- ac_env_BEAGLE_UI_CFLAGS_value=$BEAGLE_UI_CFLAGS
-+- ac_cv_env_BEAGLE_UI_CFLAGS_set=${BEAGLE_UI_CFLAGS+set}
-+- ac_cv_env_BEAGLE_UI_CFLAGS_value=$BEAGLE_UI_CFLAGS
-+- ac_env_BEAGLE_UI_LIBS_set=${BEAGLE_UI_LIBS+set}
-+- ac_env_BEAGLE_UI_LIBS_value=$BEAGLE_UI_LIBS
-+- ac_cv_env_BEAGLE_UI_LIBS_set=${BEAGLE_UI_LIBS+set}
-+- ac_cv_env_BEAGLE_UI_LIBS_value=$BEAGLE_UI_LIBS
-+- ac_env_UIGLUE_CFLAGS_set=${UIGLUE_CFLAGS+set}
-+- ac_env_UIGLUE_CFLAGS_value=$UIGLUE_CFLAGS
-+- ac_cv_env_UIGLUE_CFLAGS_set=${UIGLUE_CFLAGS+set}
-+- ac_cv_env_UIGLUE_CFLAGS_value=$UIGLUE_CFLAGS
-+- ac_env_UIGLUE_LIBS_set=${UIGLUE_LIBS+set}
-+- ac_env_UIGLUE_LIBS_value=$UIGLUE_LIBS
-+- ac_cv_env_UIGLUE_LIBS_set=${UIGLUE_LIBS+set}
-+- ac_cv_env_UIGLUE_LIBS_value=$UIGLUE_LIBS
-+- ac_env_LIBTRAYICON_CFLAGS_set=${LIBTRAYICON_CFLAGS+set}
-+- ac_env_LIBTRAYICON_CFLAGS_value=$LIBTRAYICON_CFLAGS
-+- ac_cv_env_LIBTRAYICON_CFLAGS_set=${LIBTRAYICON_CFLAGS+set}
-+- ac_cv_env_LIBTRAYICON_CFLAGS_value=$LIBTRAYICON_CFLAGS
-+- ac_env_LIBTRAYICON_LIBS_set=${LIBTRAYICON_LIBS+set}
-+- ac_env_LIBTRAYICON_LIBS_value=$LIBTRAYICON_LIBS
-+- ac_cv_env_LIBTRAYICON_LIBS_set=${LIBTRAYICON_LIBS+set}
-+- ac_cv_env_LIBTRAYICON_LIBS_value=$LIBTRAYICON_LIBS
-+- ac_env_OPEN_WITH_CFLAGS_set=${OPEN_WITH_CFLAGS+set}
-+- ac_env_OPEN_WITH_CFLAGS_value=$OPEN_WITH_CFLAGS
-+- ac_cv_env_OPEN_WITH_CFLAGS_set=${OPEN_WITH_CFLAGS+set}
-+- ac_cv_env_OPEN_WITH_CFLAGS_value=$OPEN_WITH_CFLAGS
-+- ac_env_OPEN_WITH_LIBS_set=${OPEN_WITH_LIBS+set}
-+- ac_env_OPEN_WITH_LIBS_value=$OPEN_WITH_LIBS
-+- ac_cv_env_OPEN_WITH_LIBS_set=${OPEN_WITH_LIBS+set}
-+- ac_cv_env_OPEN_WITH_LIBS_value=$OPEN_WITH_LIBS
-+- ac_env_EVO_CFLAGS_set=${EVO_CFLAGS+set}
-+- ac_env_EVO_CFLAGS_value=$EVO_CFLAGS
-+- ac_cv_env_EVO_CFLAGS_set=${EVO_CFLAGS+set}
-+- ac_cv_env_EVO_CFLAGS_value=$EVO_CFLAGS
-+- ac_env_EVO_LIBS_set=${EVO_LIBS+set}
-+- ac_env_EVO_LIBS_value=$EVO_LIBS
-+- ac_cv_env_EVO_LIBS_set=${EVO_LIBS+set}
-+- ac_cv_env_EVO_LIBS_value=$EVO_LIBS
-+- ac_env_GSF_SHARP_CFLAGS_set=${GSF_SHARP_CFLAGS+set}
-+- ac_env_GSF_SHARP_CFLAGS_value=$GSF_SHARP_CFLAGS
-+- ac_cv_env_GSF_SHARP_CFLAGS_set=${GSF_SHARP_CFLAGS+set}
-+- ac_cv_env_GSF_SHARP_CFLAGS_value=$GSF_SHARP_CFLAGS
-+- ac_env_GSF_SHARP_LIBS_set=${GSF_SHARP_LIBS+set}
-+- ac_env_GSF_SHARP_LIBS_value=$GSF_SHARP_LIBS
-+- ac_cv_env_GSF_SHARP_LIBS_set=${GSF_SHARP_LIBS+set}
-+- ac_cv_env_GSF_SHARP_LIBS_value=$GSF_SHARP_LIBS
-+- ac_env_LIBEXIF_CFLAGS_set=${LIBEXIF_CFLAGS+set}
-+- ac_env_LIBEXIF_CFLAGS_value=$LIBEXIF_CFLAGS
-+- ac_cv_env_LIBEXIF_CFLAGS_set=${LIBEXIF_CFLAGS+set}
-+- ac_cv_env_LIBEXIF_CFLAGS_value=$LIBEXIF_CFLAGS
-+- ac_env_LIBEXIF_LIBS_set=${LIBEXIF_LIBS+set}
-+- ac_env_LIBEXIF_LIBS_value=$LIBEXIF_LIBS
-+- ac_cv_env_LIBEXIF_LIBS_set=${LIBEXIF_LIBS+set}
-+- ac_cv_env_LIBEXIF_LIBS_value=$LIBEXIF_LIBS
-+- ac_env_LIBEXIF_API_CHECK_CFLAGS_set=${LIBEXIF_API_CHECK_CFLAGS+set}
-+- ac_env_LIBEXIF_API_CHECK_CFLAGS_value=$LIBEXIF_API_CHECK_CFLAGS
-+- ac_cv_env_LIBEXIF_API_CHECK_CFLAGS_set=${LIBEXIF_API_CHECK_CFLAGS+set}
-+- ac_cv_env_LIBEXIF_API_CHECK_CFLAGS_value=$LIBEXIF_API_CHECK_CFLAGS
-+- ac_env_LIBEXIF_API_CHECK_LIBS_set=${LIBEXIF_API_CHECK_LIBS+set}
-+- ac_env_LIBEXIF_API_CHECK_LIBS_value=$LIBEXIF_API_CHECK_LIBS
-+- ac_cv_env_LIBEXIF_API_CHECK_LIBS_set=${LIBEXIF_API_CHECK_LIBS+set}
-+- ac_cv_env_LIBEXIF_API_CHECK_LIBS_value=$LIBEXIF_API_CHECK_LIBS
-+- ac_env_LIBEXIF_VERSION_CHECK_CFLAGS_set=${LIBEXIF_VERSION_CHECK_CFLAGS+set}
-+- ac_env_LIBEXIF_VERSION_CHECK_CFLAGS_value=$LIBEXIF_VERSION_CHECK_CFLAGS
-+- ac_cv_env_LIBEXIF_VERSION_CHECK_CFLAGS_set=${LIBEXIF_VERSION_CHECK_CFLAGS+set}
-+- ac_cv_env_LIBEXIF_VERSION_CHECK_CFLAGS_value=$LIBEXIF_VERSION_CHECK_CFLAGS
-+- ac_env_LIBEXIF_VERSION_CHECK_LIBS_set=${LIBEXIF_VERSION_CHECK_LIBS+set}
-+- ac_env_LIBEXIF_VERSION_CHECK_LIBS_value=$LIBEXIF_VERSION_CHECK_LIBS
-+- ac_cv_env_LIBEXIF_VERSION_CHECK_LIBS_set=${LIBEXIF_VERSION_CHECK_LIBS+set}
-+- ac_cv_env_LIBEXIF_VERSION_CHECK_LIBS_value=$LIBEXIF_VERSION_CHECK_LIBS
-+- ac_env_BEAGLED_CFLAGS_set=${BEAGLED_CFLAGS+set}
-+- ac_env_BEAGLED_CFLAGS_value=$BEAGLED_CFLAGS
-+- ac_cv_env_BEAGLED_CFLAGS_set=${BEAGLED_CFLAGS+set}
-+- ac_cv_env_BEAGLED_CFLAGS_value=$BEAGLED_CFLAGS
-+- ac_env_BEAGLED_LIBS_set=${BEAGLED_LIBS+set}
-+- ac_env_BEAGLED_LIBS_value=$BEAGLED_LIBS
-+- ac_cv_env_BEAGLED_LIBS_set=${BEAGLED_LIBS+set}
-+- ac_cv_env_BEAGLED_LIBS_value=$BEAGLED_LIBS
-+- ac_env_LIBBEAGLE_CFLAGS_set=${LIBBEAGLE_CFLAGS+set}
-+- ac_env_LIBBEAGLE_CFLAGS_value=$LIBBEAGLE_CFLAGS
-+- ac_cv_env_LIBBEAGLE_CFLAGS_set=${LIBBEAGLE_CFLAGS+set}
-+- ac_cv_env_LIBBEAGLE_CFLAGS_value=$LIBBEAGLE_CFLAGS
-+- ac_env_LIBBEAGLE_LIBS_set=${LIBBEAGLE_LIBS+set}
-+- ac_env_LIBBEAGLE_LIBS_value=$LIBBEAGLE_LIBS
-+- ac_cv_env_LIBBEAGLE_LIBS_set=${LIBBEAGLE_LIBS+set}
-+- ac_cv_env_LIBBEAGLE_LIBS_value=$LIBBEAGLE_LIBS
-+- ac_env_EPIPHANY_DEPENDENCY_CFLAGS_set=${EPIPHANY_DEPENDENCY_CFLAGS+set}
-+- ac_env_EPIPHANY_DEPENDENCY_CFLAGS_value=$EPIPHANY_DEPENDENCY_CFLAGS
-+- ac_cv_env_EPIPHANY_DEPENDENCY_CFLAGS_set=${EPIPHANY_DEPENDENCY_CFLAGS+set}
-+- ac_cv_env_EPIPHANY_DEPENDENCY_CFLAGS_value=$EPIPHANY_DEPENDENCY_CFLAGS
-+- ac_env_EPIPHANY_DEPENDENCY_LIBS_set=${EPIPHANY_DEPENDENCY_LIBS+set}
-+- ac_env_EPIPHANY_DEPENDENCY_LIBS_value=$EPIPHANY_DEPENDENCY_LIBS
-+- ac_cv_env_EPIPHANY_DEPENDENCY_LIBS_set=${EPIPHANY_DEPENDENCY_LIBS+set}
-+- ac_cv_env_EPIPHANY_DEPENDENCY_LIBS_value=$EPIPHANY_DEPENDENCY_LIBS
-+- ac_env_GALAGO_CFLAGS_set=${GALAGO_CFLAGS+set}
-+- ac_env_GALAGO_CFLAGS_value=$GALAGO_CFLAGS
-+- ac_cv_env_GALAGO_CFLAGS_set=${GALAGO_CFLAGS+set}
-+- ac_cv_env_GALAGO_CFLAGS_value=$GALAGO_CFLAGS
-+- ac_env_GALAGO_LIBS_set=${GALAGO_LIBS+set}
-+- ac_env_GALAGO_LIBS_value=$GALAGO_LIBS
-+- ac_cv_env_GALAGO_LIBS_set=${GALAGO_LIBS+set}
-+- ac_cv_env_GALAGO_LIBS_value=$GALAGO_LIBS
-+- ac_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
-+- ac_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
-+- ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_set=${SYSTEMINFO_GLUE_CFLAGS+set}
-+- ac_cv_env_SYSTEMINFO_GLUE_CFLAGS_value=$SYSTEMINFO_GLUE_CFLAGS
-+- ac_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
-+- ac_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
-+- ac_cv_env_SYSTEMINFO_GLUE_LIBS_set=${SYSTEMINFO_GLUE_LIBS+set}
-+- ac_cv_env_SYSTEMINFO_GLUE_LIBS_value=$SYSTEMINFO_GLUE_LIBS
-+- ac_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
-+- ac_env_WV1_CFLAGS_value=$WV1_CFLAGS
-+- ac_cv_env_WV1_CFLAGS_set=${WV1_CFLAGS+set}
-+- ac_cv_env_WV1_CFLAGS_value=$WV1_CFLAGS
-+- ac_env_WV1_LIBS_set=${WV1_LIBS+set}
-+- ac_env_WV1_LIBS_value=$WV1_LIBS
-+- ac_cv_env_WV1_LIBS_set=${WV1_LIBS+set}
-+- ac_cv_env_WV1_LIBS_value=$WV1_LIBS
-+- ac_env_PYBEAGLE_CFLAGS_set=${PYBEAGLE_CFLAGS+set}
-+- ac_env_PYBEAGLE_CFLAGS_value=$PYBEAGLE_CFLAGS
-+- ac_cv_env_PYBEAGLE_CFLAGS_set=${PYBEAGLE_CFLAGS+set}
-+- ac_cv_env_PYBEAGLE_CFLAGS_value=$PYBEAGLE_CFLAGS
-+- ac_env_PYBEAGLE_LIBS_set=${PYBEAGLE_LIBS+set}
-+- ac_env_PYBEAGLE_LIBS_value=$PYBEAGLE_LIBS
-+- ac_cv_env_PYBEAGLE_LIBS_set=${PYBEAGLE_LIBS+set}
-+- ac_cv_env_PYBEAGLE_LIBS_value=$PYBEAGLE_LIBS
-+
-+ #
-+ # Report the --help message.
-+--- 1512,1587 ----
-+ test "$silent" = yes && exec 6>/dev/null
-+
-+
-++ ac_pwd=`pwd` && test -n "$ac_pwd" &&
-++ ac_ls_di=`ls -di .` &&
-++ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
-++ { echo "$as_me: error: Working directory cannot be determined" >&2
-++ { (exit 1); exit 1; }; }
-++ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-++ { echo "$as_me: error: pwd does not report name of working directory" >&2
-++ { (exit 1); exit 1; }; }
-++
-++
-+ # Find the source files, if location was not specified.
-+ if test -z "$srcdir"; then
-+ ac_srcdir_defaulted=yes
-++ # Try the directory containing this script, then the parent directory.
-++ ac_confdir=`$as_dirname -- "$0" ||
-+ $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$0" : 'X\(//\)[^/]' \| \
-+ X"$0" : 'X\(//\)$' \| \
-++ X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$0" |
-++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)[^/].*/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\).*/{
-++ s//\1/
-++ q
-++ }
-++ s/.*/./; q'`
-+ srcdir=$ac_confdir
-++ if test ! -r "$srcdir/$ac_unique_file"; then
-+ srcdir=..
-+ fi
-+ else
-+ ac_srcdir_defaulted=no
-+ fi
-++ if test ! -r "$srcdir/$ac_unique_file"; then
-++ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-++ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-+ { (exit 1); exit 1; }; }
-+ fi
-++ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
-++ ac_abs_confdir=`(
-++ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
-+ { (exit 1); exit 1; }; }
-++ pwd)`
-++ # When building in place, set srcdir=.
-++ if test "$ac_abs_confdir" = "$ac_pwd"; then
-++ srcdir=.
-++ fi
-++ # Remove unnecessary trailing slashes from srcdir.
-++ # Double slashes in file names in object file debugging info
-++ # mess up M-x gdb in Emacs.
-++ case $srcdir in
-++ */) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-++ esac
-++ for ac_var in $ac_precious_vars; do
-++ eval ac_env_${ac_var}_set=\${${ac_var}+set}
-++ eval ac_env_${ac_var}_value=\$${ac_var}
-++ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-++ eval ac_cv_env_${ac_var}_value=\$${ac_var}
-++ done
-+
-+ #
-+ # Report the --help message.
-+***************
-+*** 4063,4069 ****
-+ ;;
-+ *-*-irix6*)
-+ # Find out which ABI we are using.
-+- echo '#line 4075 "configure"' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+--- 4811,4817 ----
-+ ;;
-+ *-*-irix6*)
-+ # Find out which ABI we are using.
-++ echo '#line 4823 "configure"' > conftest.$ac_ext
-+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+ (eval $ac_compile) 2>&5
-+ ac_status=$?
-+***************
-+*** 5635,5682 ****
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-+- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+ ac_cv_prog_ac_ct_F77="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+ done
-+ done
-+
-+ fi
-+ fi
-+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
-+ if test -n "$ac_ct_F77"; then
-+- echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-+- echo "${ECHO_T}$ac_ct_F77" >&6
-+ else
-+- echo "$as_me:$LINENO: result: no" >&5
-+- echo "${ECHO_T}no" >&6
-+ fi
-+
-+ test -n "$ac_ct_F77" && break
-+ done
-+
-+- F77=$ac_ct_F77
-+ fi
-+
-+
-+ # Provide some information about the compiler.
-+- echo "$as_me:5674:" \
-+- "checking for Fortran 77 compiler version" >&5
-+ ac_compiler=`set X $ac_compile; echo $2`
-+- { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-+- (eval $ac_compiler --version </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+- { (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-+- (eval $ac_compiler -v </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+- { (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-+- (eval $ac_compiler -V </dev/null >&5) 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+--- 6576,6653 ----
-+ IFS=$as_save_IFS
-+ test -z "$as_dir" && as_dir=.
-+ for ac_exec_ext in '' $ac_executable_extensions; do
-++ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+ ac_cv_prog_ac_ct_F77="$ac_prog"
-+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+ break 2
-+ fi
-+ done
-+ done
-++ IFS=$as_save_IFS
-+
-+ fi
-+ fi
-+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
-+ if test -n "$ac_ct_F77"; then
-++ { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-++ echo "${ECHO_T}$ac_ct_F77" >&6; }
-+ else
-++ { echo "$as_me:$LINENO: result: no" >&5
-++ echo "${ECHO_T}no" >&6; }
-+ fi
-+
-++
-+ test -n "$ac_ct_F77" && break
-+ done
-+
-++ if test "x$ac_ct_F77" = x; then
-++ F77=""
-++ else
-++ case $cross_compiling:$ac_tool_warned in
-++ yes:)
-++ { echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-++ whose name does not start with the host triplet. If you think this
-++ configuration is useful to you, please write to autoconf at gnu.org." >&5
-++ echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-++ whose name does not start with the host triplet. If you think this
-++ configuration is useful to you, please write to autoconf at gnu.org." >&2;}
-++ ac_tool_warned=yes ;;
-++ esac
-++ F77=$ac_ct_F77
-++ fi
-+ fi
-+
-+
-+ # Provide some information about the compiler.
-++ echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ ac_compiler=`set X $ac_compile; echo $2`
-++ { (ac_try="$ac_compiler --version >&5"
-++ case "(($ac_try" in
-++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-++ *) ac_try_echo=$ac_try;;
-++ esac
-++ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-++ (eval "$ac_compiler --version >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-++ { (ac_try="$ac_compiler -v >&5"
-++ case "(($ac_try" in
-++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-++ *) ac_try_echo=$ac_try;;
-++ esac
-++ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-++ (eval "$ac_compiler -v >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-++ { (ac_try="$ac_compiler -V >&5"
-++ case "(($ac_try" in
-++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-++ *) ac_try_echo=$ac_try;;
-++ esac
-++ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-++ (eval "$ac_compiler -V >&5") 2>&5
-+ ac_status=$?
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); }
-+***************
-+*** 6725,6735 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:6737: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:6741: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 7770,7780 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:7782: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:7786: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 6993,7003 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:7005: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:7009: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 8038,8048 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:8050: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:8054: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 7097,7107 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:7109: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:7113: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 8142,8152 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:8154: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:8158: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 9442,9448 ****
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+- #line 9454 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+--- 10583,10589 ----
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-++ #line 10595 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+***************
-+*** 9542,9548 ****
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-+- #line 9554 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+--- 10683,10689 ----
-+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+ lt_status=$lt_dlunknown
-+ cat > conftest.$ac_ext <<EOF
-++ #line 10695 "configure"
-+ #include "confdefs.h"
-+
-+ #if HAVE_DLFCN_H
-+***************
-+*** 11882,11892 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:11894: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:11898: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 13051,13061 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:13063: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:13067: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 11986,11996 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:11998: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:12002: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 13155,13165 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:13167: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:13171: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 13556,13566 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:13568: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:13572: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 14716,14726 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:14728: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:14732: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 13660,13670 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:13672: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:13676: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 14820,14830 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:14832: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:14836: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 15863,15873 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:15875: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:15879: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 17039,17049 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:17051: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:17055: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 16131,16141 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:16143: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-+- echo "$as_me:16147: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+--- 17307,17317 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:17319: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>conftest.err)
-+ ac_status=$?
-+ cat conftest.err >&5
-++ echo "$as_me:17323: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s "$ac_outfile"; then
-+ # The compiler can only warn and ignore the option if not recognized
-+ # So say no if there are warnings other than the usual output.
-+***************
-+*** 16235,16245 ****
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-+- (eval echo "\"\$as_me:16247: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-+- echo "$as_me:16251: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+--- 17411,17421 ----
-+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-+ -e 's:$: $lt_compiler_flag:'`
-++ (eval echo "\"\$as_me:17423: $lt_compile\"" >&5)
-+ (eval "$lt_compile" 2>out/conftest.err)
-+ ac_status=$?
-+ cat out/conftest.err >&5
-++ echo "$as_me:17427: \$? = $ac_status" >&5
-+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+ then
-+ # The compiler can only warn and ignore the option if not recognized
-+***************
-+*** 26027,26034 ****
-+
-+
-+ pkg_failed=no
-+- echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
-+- echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6
-+
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$SYSTEMINFO_GLUE_CFLAGS"; then
-+--- 27766,27773 ----
-+
-+
-+ pkg_failed=no
-++ { echo "$as_me:$LINENO: checking for SYSTEMINFO_GLUE" >&5
-++ echo $ECHO_N "checking for SYSTEMINFO_GLUE... $ECHO_C" >&6; }
-+
-+ if test -n "$PKG_CONFIG"; then
-+ if test -n "$SYSTEMINFO_GLUE_CFLAGS"; then
-+***************
-+*** 26132,26139 ****
-+ else
-+ SYSTEMINFO_GLUE_CFLAGS=$pkg_cv_SYSTEMINFO_GLUE_CFLAGS
-+ SYSTEMINFO_GLUE_LIBS=$pkg_cv_SYSTEMINFO_GLUE_LIBS
-+- echo "$as_me:$LINENO: result: yes" >&5
-+- echo "${ECHO_T}yes" >&6
-+ :
-+ fi
-+ SYSTEMINFO_GLUE_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $XSS_LIBS $X_EXTRA_LIBS"
-+--- 27871,27878 ----
-+ else
-+ SYSTEMINFO_GLUE_CFLAGS=$pkg_cv_SYSTEMINFO_GLUE_CFLAGS
-+ SYSTEMINFO_GLUE_LIBS=$pkg_cv_SYSTEMINFO_GLUE_LIBS
-++ { echo "$as_me:$LINENO: result: yes" >&5
-++ echo "${ECHO_T}yes" >&6; }
-+ :
-+ fi
-+ SYSTEMINFO_GLUE_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 $XSS_LIBS $X_EXTRA_LIBS"
-+***************
-+*** 26693,26699 ****
-+
-+
-+
-+- ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
-+ cat >confcache <<\_ACEOF
-+ # This file is a shell script that caches the results of configure
-+ # tests run on this system so they can be shared between configure
-+--- 28506,28513 ----
-+
-+
-+
-++ ac_config_files="$ac_config_files Makefile Util/Makefile Util/Util.dll.config images/Makefile glue/Makefile BeagleClient/Makefile beagled/Makefile Filters/Makefile tools/Makefile search/Makefile ImLogViewer/Makefile libbeagle/Makefile libbeagle/libbeagle-0.0.pc libbeagle/beagle/Makefile libbeagle/examples/Makefile libbeagle/docs/Makefile libbeagle/docs/reference/Makefile epiphany-extension/Makefile mozilla-extension/Makefile bludgeon/Makefile wrappers/Makefile wrappers/python/Makefile beagle-0.0.pc beagle-daemon.pc beagle-ui-0.0.pc beagle.spec po/Makefile.in"
-++
-+ cat >confcache <<\_ACEOF
-+ # This file is a shell script that caches the results of configure
-+ # tests run on this system so they can be shared between configure
-+***************
-+*** 27408,27477 ****
-+ _ACEOF
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ if \$ac_cs_recheck; then
-+- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-+- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ fi
-+
-+ _ACEOF
-+
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ #
-+- # INIT-COMMANDS section.
-+ #
-+-
-+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+- INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir=${ac_aux_dir}
-+- INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' ICONV='${INTLTOOL_ICONV}'
-+- MSGFMT='${INTLTOOL_MSGFMT}' MSGMERGE='${INTLTOOL_MSGMERGE}'
-+- XGETTEXT='${INTLTOOL_XGETTEXT}'
-+
-+
-+ _ACEOF
-+
-+-
-+-
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+ for ac_config_target in $ac_config_targets
-+ do
-+- case "$ac_config_target" in
-+- # Handling of arguments.
-+- "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+- "Util/Makefile" ) CONFIG_FILES="$CONFIG_FILES Util/Makefile" ;;
-+- "Util/Util.dll.config" ) CONFIG_FILES="$CONFIG_FILES Util/Util.dll.config" ;;
-+- "images/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
-+- "glue/Makefile" ) CONFIG_FILES="$CONFIG_FILES glue/Makefile" ;;
-+- "BeagleClient/Makefile" ) CONFIG_FILES="$CONFIG_FILES BeagleClient/Makefile" ;;
-+- "beagled/Makefile" ) CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
-+- "Filters/Makefile" ) CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
-+- "tools/Makefile" ) CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-+- "search/Makefile" ) CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
-+- "ImLogViewer/Makefile" ) CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
-+- "libbeagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
-+- "libbeagle/libbeagle-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
-+- "libbeagle/beagle/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
-+- "libbeagle/examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/examples/Makefile" ;;
-+- "libbeagle/docs/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/docs/Makefile" ;;
-+- "libbeagle/docs/reference/Makefile" ) CONFIG_FILES="$CONFIG_FILES libbeagle/docs/reference/Makefile" ;;
-+- "epiphany-extension/Makefile" ) CONFIG_FILES="$CONFIG_FILES epiphany-extension/Makefile" ;;
-+- "mozilla-extension/Makefile" ) CONFIG_FILES="$CONFIG_FILES mozilla-extension/Makefile" ;;
-+- "bludgeon/Makefile" ) CONFIG_FILES="$CONFIG_FILES bludgeon/Makefile" ;;
-+- "wrappers/Makefile" ) CONFIG_FILES="$CONFIG_FILES wrappers/Makefile" ;;
-+- "wrappers/python/Makefile" ) CONFIG_FILES="$CONFIG_FILES wrappers/python/Makefile" ;;
-+- "beagle-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-0.0.pc" ;;
-+- "beagle-daemon.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-daemon.pc" ;;
-+- "beagle-ui-0.0.pc" ) CONFIG_FILES="$CONFIG_FILES beagle-ui-0.0.pc" ;;
-+- "beagle.spec" ) CONFIG_FILES="$CONFIG_FILES beagle.spec" ;;
-+- "po/Makefile.in" ) CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-+- "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+- "intltool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
-+- "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-+- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ done
-+
-+ # If the user did not use the arguments to specify the items to instantiate,
-+ # then the envvar interface is used. Set only those that are not.
-+ # We use the long form for the default assignment because of an extremely
-+--- 29225,29308 ----
-+ _ACEOF
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ if \$ac_cs_recheck; then
-++ echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-++ CONFIG_SHELL=$SHELL
-++ export CONFIG_SHELL
-++ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+ fi
-+
-+ _ACEOF
-++ cat >>$CONFIG_STATUS <<\_ACEOF
-++ exec 5>>config.log
-++ {
-++ echo
-++ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-++ ## Running $as_me. ##
-++ _ASBOX
-++ echo "$ac_log"
-++ } >&5
-+
-++ _ACEOF
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ #
-++ # INIT-COMMANDS
-+ #
-+ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-++ INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
-++ prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
-++ INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
-++ INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
-++ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
-+
-+
-+ _ACEOF
-+
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-++
-++ # Handling of arguments.
-+ for ac_config_target in $ac_config_targets
-+ do
-++ case $ac_config_target in
-++ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-++ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-++ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
-++ "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
-++ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-++ "Util/Makefile") CONFIG_FILES="$CONFIG_FILES Util/Makefile" ;;
-++ "Util/Util.dll.config") CONFIG_FILES="$CONFIG_FILES Util/Util.dll.config" ;;
-++ "images/Makefile") CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
-++ "glue/Makefile") CONFIG_FILES="$CONFIG_FILES glue/Makefile" ;;
-++ "BeagleClient/Makefile") CONFIG_FILES="$CONFIG_FILES BeagleClient/Makefile" ;;
-++ "beagled/Makefile") CONFIG_FILES="$CONFIG_FILES beagled/Makefile" ;;
-++ "Filters/Makefile") CONFIG_FILES="$CONFIG_FILES Filters/Makefile" ;;
-++ "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
-++ "search/Makefile") CONFIG_FILES="$CONFIG_FILES search/Makefile" ;;
-++ "ImLogViewer/Makefile") CONFIG_FILES="$CONFIG_FILES ImLogViewer/Makefile" ;;
-++ "libbeagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/Makefile" ;;
-++ "libbeagle/libbeagle-0.0.pc") CONFIG_FILES="$CONFIG_FILES libbeagle/libbeagle-0.0.pc" ;;
-++ "libbeagle/beagle/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/beagle/Makefile" ;;
-++ "libbeagle/examples/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/examples/Makefile" ;;
-++ "libbeagle/docs/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/docs/Makefile" ;;
-++ "libbeagle/docs/reference/Makefile") CONFIG_FILES="$CONFIG_FILES libbeagle/docs/reference/Makefile" ;;
-++ "epiphany-extension/Makefile") CONFIG_FILES="$CONFIG_FILES epiphany-extension/Makefile" ;;
-++ "mozilla-extension/Makefile") CONFIG_FILES="$CONFIG_FILES mozilla-extension/Makefile" ;;
-++ "bludgeon/Makefile") CONFIG_FILES="$CONFIG_FILES bludgeon/Makefile" ;;
-++ "wrappers/Makefile") CONFIG_FILES="$CONFIG_FILES wrappers/Makefile" ;;
-++ "wrappers/python/Makefile") CONFIG_FILES="$CONFIG_FILES wrappers/python/Makefile" ;;
-++ "beagle-0.0.pc") CONFIG_FILES="$CONFIG_FILES beagle-0.0.pc" ;;
-++ "beagle-daemon.pc") CONFIG_FILES="$CONFIG_FILES beagle-daemon.pc" ;;
-++ "beagle-ui-0.0.pc") CONFIG_FILES="$CONFIG_FILES beagle-ui-0.0.pc" ;;
-++ "beagle.spec") CONFIG_FILES="$CONFIG_FILES beagle.spec" ;;
-++ "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
-++ "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
-++
-+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-+ { (exit 1); exit 1; }; };;
-+ esac
-+ done
-+
-++
-+ # If the user did not use the arguments to specify the items to instantiate,
-+ # then the envvar interface is used. Set only those that are not.
-+ # We use the long form for the default assignment because of an extremely
-+***************
-+*** 27483,28007 ****
-+ fi
-+
-+ # Have a temporary directory for convenience. Make it in the build tree
-+- # simply because there is no reason to put it here, and in addition,
-+ # creating and moving files from /tmp can sometimes cause problems.
-+- # Create a temporary directory, and hook for its removal unless debugging.
-+ $debug ||
-+ {
-+- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+ }
-+-
-+ # Create a (secure) tmp directory for tmp files.
-+
-+ {
-+- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+ } ||
-+ {
-+- tmp=./confstat$$-$RANDOM
-+- (umask 077 && mkdir $tmp)
-+ } ||
-+ {
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+ }
-+
-+- _ACEOF
-+-
-+- cat >>$CONFIG_STATUS <<_ACEOF
-+-
-+ #
-+- # CONFIG_FILES section.
-+ #
-+
-+ # No need to generate the scripts if there are no CONFIG_FILES.
-+ # This happens for instance when ./config.status config.h
-+- if test -n "\$CONFIG_FILES"; then
-+- # Protect against being on the right side of a sed subst in config.status.
-+- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-+- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-+- s, at SHELL@,$SHELL,;t t
-+- s, at PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-+- s, at PACKAGE_NAME@,$PACKAGE_NAME,;t t
-+- s, at PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-+- s, at PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-+- s, at PACKAGE_STRING@,$PACKAGE_STRING,;t t
-+- s, at PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-+- s, at exec_prefix@,$exec_prefix,;t t
-+- s, at prefix@,$prefix,;t t
-+- s, at program_transform_name@,$program_transform_name,;t t
-+- s, at bindir@,$bindir,;t t
-+- s, at sbindir@,$sbindir,;t t
-+- s, at libexecdir@,$libexecdir,;t t
-+- s, at datadir@,$datadir,;t t
-+- s, at sysconfdir@,$sysconfdir,;t t
-+- s, at sharedstatedir@,$sharedstatedir,;t t
-+- s, at localstatedir@,$localstatedir,;t t
-+- s, at libdir@,$libdir,;t t
-+- s, at includedir@,$includedir,;t t
-+- s, at oldincludedir@,$oldincludedir,;t t
-+- s, at infodir@,$infodir,;t t
-+- s, at mandir@,$mandir,;t t
-+- s, at build_alias@,$build_alias,;t t
-+- s, at host_alias@,$host_alias,;t t
-+- s, at target_alias@,$target_alias,;t t
-+- s, at DEFS@,$DEFS,;t t
-+- s, at ECHO_C@,$ECHO_C,;t t
-+- s, at ECHO_N@,$ECHO_N,;t t
-+- s, at ECHO_T@,$ECHO_T,;t t
-+- s, at LIBS@,$LIBS,;t t
-+- s, at build@,$build,;t t
-+- s, at build_cpu@,$build_cpu,;t t
-+- s, at build_vendor@,$build_vendor,;t t
-+- s, at build_os@,$build_os,;t t
-+- s, at host@,$host,;t t
-+- s, at host_cpu@,$host_cpu,;t t
-+- s, at host_vendor@,$host_vendor,;t t
-+- s, at host_os@,$host_os,;t t
-+- s, at target@,$target,;t t
-+- s, at target_cpu@,$target_cpu,;t t
-+- s, at target_vendor@,$target_vendor,;t t
-+- s, at target_os@,$target_os,;t t
-+- s, at INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-+- s, at INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-+- s, at INSTALL_DATA@,$INSTALL_DATA,;t t
-+- s, at CYGPATH_W@,$CYGPATH_W,;t t
-+- s, at PACKAGE@,$PACKAGE,;t t
-+- s, at VERSION@,$VERSION,;t t
-+- s, at ACLOCAL@,$ACLOCAL,;t t
-+- s, at AUTOCONF@,$AUTOCONF,;t t
-+- s, at AUTOMAKE@,$AUTOMAKE,;t t
-+- s, at AUTOHEADER@,$AUTOHEADER,;t t
-+- s, at MAKEINFO@,$MAKEINFO,;t t
-+- s, at install_sh@,$install_sh,;t t
-+- s, at STRIP@,$STRIP,;t t
-+- s, at ac_ct_STRIP@,$ac_ct_STRIP,;t t
-+- s, at INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-+- s, at mkdir_p@,$mkdir_p,;t t
-+- s, at AWK@,$AWK,;t t
-+- s, at SET_MAKE@,$SET_MAKE,;t t
-+- s, at am__leading_dot@,$am__leading_dot,;t t
-+- s, at AMTAR@,$AMTAR,;t t
-+- s, at am__tar@,$am__tar,;t t
-+- s, at am__untar@,$am__untar,;t t
-+- s, at MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-+- s, at MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-+- s, at MAINT@,$MAINT,;t t
-+- s, at CC@,$CC,;t t
-+- s, at CFLAGS@,$CFLAGS,;t t
-+- s, at LDFLAGS@,$LDFLAGS,;t t
-+- s, at CPPFLAGS@,$CPPFLAGS,;t t
-+- s, at ac_ct_CC@,$ac_ct_CC,;t t
-+- s, at EXEEXT@,$EXEEXT,;t t
-+- s, at OBJEXT@,$OBJEXT,;t t
-+- s, at DEPDIR@,$DEPDIR,;t t
-+- s, at am__include@,$am__include,;t t
-+- s, at am__quote@,$am__quote,;t t
-+- s, at AMDEP_TRUE@,$AMDEP_TRUE,;t t
-+- s, at AMDEP_FALSE@,$AMDEP_FALSE,;t t
-+- s, at AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-+- s, at CCDEPMODE@,$CCDEPMODE,;t t
-+- s, at am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-+- s, at am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-+- s, at EGREP@,$EGREP,;t t
-+- s, at LN_S@,$LN_S,;t t
-+- s, at ECHO@,$ECHO,;t t
-+- s, at AR@,$AR,;t t
-+- s, at ac_ct_AR@,$ac_ct_AR,;t t
-+- s, at RANLIB@,$RANLIB,;t t
-+- s, at ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-+- s, at CPP@,$CPP,;t t
-+- s, at CXX@,$CXX,;t t
-+- s, at CXXFLAGS@,$CXXFLAGS,;t t
-+- s, at ac_ct_CXX@,$ac_ct_CXX,;t t
-+- s, at CXXDEPMODE@,$CXXDEPMODE,;t t
-+- s, at am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-+- s, at am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-+- s, at CXXCPP@,$CXXCPP,;t t
-+- s, at F77@,$F77,;t t
-+- s, at FFLAGS@,$FFLAGS,;t t
-+- s, at ac_ct_F77@,$ac_ct_F77,;t t
-+- s, at LIBTOOL@,$LIBTOOL,;t t
-+- s, at PKG_CONFIG@,$PKG_CONFIG,;t t
-+- s, at BASH@,$BASH,;t t
-+- s, at ZIP@,$ZIP,;t t
-+- s, at MONO@,$MONO,;t t
-+- s, at MCS@,$MCS,;t t
-+- s, at ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-+- s, at MONO_CFLAGS@,$MONO_CFLAGS,;t t
-+- s, at MONO_LIBS@,$MONO_LIBS,;t t
-+- s, at SHARPZIPLIB_LIBS@,$SHARPZIPLIB_LIBS,;t t
-+- s, at OS_LINUX_TRUE@,$OS_LINUX_TRUE,;t t
-+- s, at OS_LINUX_FALSE@,$OS_LINUX_FALSE,;t t
-+- s, at OS_FREEBSD_TRUE@,$OS_FREEBSD_TRUE,;t t
-+- s, at OS_FREEBSD_FALSE@,$OS_FREEBSD_FALSE,;t t
-+- s, at DESKTOP_LAUNCH@,$DESKTOP_LAUNCH,;t t
-+- s, at ENABLE_DESKTOP_LAUNCH_TRUE@,$ENABLE_DESKTOP_LAUNCH_TRUE,;t t
-+- s, at ENABLE_DESKTOP_LAUNCH_FALSE@,$ENABLE_DESKTOP_LAUNCH_FALSE,;t t
-+- s, at WSDL@,$WSDL,;t t
-+- s, at ENABLE_GOOGLEDRIVER_TRUE@,$ENABLE_GOOGLEDRIVER_TRUE,;t t
-+- s, at ENABLE_GOOGLEDRIVER_FALSE@,$ENABLE_GOOGLEDRIVER_FALSE,;t t
-+- s, at INTLTOOL_DESKTOP_RULE@,$INTLTOOL_DESKTOP_RULE,;t t
-+- s, at INTLTOOL_DIRECTORY_RULE@,$INTLTOOL_DIRECTORY_RULE,;t t
-+- s, at INTLTOOL_KEYS_RULE@,$INTLTOOL_KEYS_RULE,;t t
-+- s, at INTLTOOL_PROP_RULE@,$INTLTOOL_PROP_RULE,;t t
-+- s, at INTLTOOL_OAF_RULE@,$INTLTOOL_OAF_RULE,;t t
-+- s, at INTLTOOL_PONG_RULE@,$INTLTOOL_PONG_RULE,;t t
-+- s, at INTLTOOL_SERVER_RULE@,$INTLTOOL_SERVER_RULE,;t t
-+- s, at INTLTOOL_SHEET_RULE@,$INTLTOOL_SHEET_RULE,;t t
-+- s, at INTLTOOL_SOUNDLIST_RULE@,$INTLTOOL_SOUNDLIST_RULE,;t t
-+- s, at INTLTOOL_UI_RULE@,$INTLTOOL_UI_RULE,;t t
-+- s, at INTLTOOL_XAM_RULE@,$INTLTOOL_XAM_RULE,;t t
-+- s, at INTLTOOL_KBD_RULE@,$INTLTOOL_KBD_RULE,;t t
-+- s, at INTLTOOL_XML_RULE@,$INTLTOOL_XML_RULE,;t t
-+- s, at INTLTOOL_XML_NOMERGE_RULE@,$INTLTOOL_XML_NOMERGE_RULE,;t t
-+- s, at INTLTOOL_CAVES_RULE@,$INTLTOOL_CAVES_RULE,;t t
-+- s, at INTLTOOL_SCHEMAS_RULE@,$INTLTOOL_SCHEMAS_RULE,;t t
-+- s, at INTLTOOL_THEME_RULE@,$INTLTOOL_THEME_RULE,;t t
-+- s, at INTLTOOL_EXTRACT@,$INTLTOOL_EXTRACT,;t t
-+- s, at INTLTOOL_MERGE@,$INTLTOOL_MERGE,;t t
-+- s, at INTLTOOL_UPDATE@,$INTLTOOL_UPDATE,;t t
-+- s, at INTLTOOL_PERL@,$INTLTOOL_PERL,;t t
-+- s, at INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
-+- s, at INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
-+- s, at INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
-+- s, at INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
-+- s, at GETTEXT_PACKAGE@,$GETTEXT_PACKAGE,;t t
-+- s, at USE_NLS@,$USE_NLS,;t t
-+- s, at MSGFMT@,$MSGFMT,;t t
-+- s, at GMSGFMT@,$GMSGFMT,;t t
-+- s, at XGETTEXT@,$XGETTEXT,;t t
-+- s, at CATALOGS@,$CATALOGS,;t t
-+- s, at CATOBJEXT@,$CATOBJEXT,;t t
-+- s, at DATADIRNAME@,$DATADIRNAME,;t t
-+- s, at GMOFILES@,$GMOFILES,;t t
-+- s, at INSTOBJEXT@,$INSTOBJEXT,;t t
-+- s, at INTLLIBS@,$INTLLIBS,;t t
-+- s, at PO_IN_DATADIR_TRUE@,$PO_IN_DATADIR_TRUE,;t t
-+- s, at PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t
-+- s, at POFILES@,$POFILES,;t t
-+- s, at POSUB@,$POSUB,;t t
-+- s, at SQLITE_CFLAGS@,$SQLITE_CFLAGS,;t t
-+- s, at SQLITE_LIBS@,$SQLITE_LIBS,;t t
-+- s, at SQLITE3_CFLAGS@,$SQLITE3_CFLAGS,;t t
-+- s, at SQLITE3_LIBS@,$SQLITE3_LIBS,;t t
-+- s, at SQLITE_MAJ_VER@,$SQLITE_MAJ_VER,;t t
-+- s, at X_CFLAGS@,$X_CFLAGS,;t t
-+- s, at X_PRE_LIBS@,$X_PRE_LIBS,;t t
-+- s, at X_LIBS@,$X_LIBS,;t t
-+- s, at X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-+- s, at HAS_LIBXSS_TRUE@,$HAS_LIBXSS_TRUE,;t t
-+- s, at HAS_LIBXSS_FALSE@,$HAS_LIBXSS_FALSE,;t t
-+- s, at ENABLE_GUI_TRUE@,$ENABLE_GUI_TRUE,;t t
-+- s, at ENABLE_GUI_FALSE@,$ENABLE_GUI_FALSE,;t t
-+- s, at GNOME_VFS_CFLAGS@,$GNOME_VFS_CFLAGS,;t t
-+- s, at GNOME_VFS_LIBS@,$GNOME_VFS_LIBS,;t t
-+- s, at BEAGLE_UI_CFLAGS@,$BEAGLE_UI_CFLAGS,;t t
-+- s, at BEAGLE_UI_LIBS@,$BEAGLE_UI_LIBS,;t t
-+- s, at UIGLUE_CFLAGS@,$UIGLUE_CFLAGS,;t t
-+- s, at UIGLUE_LIBS@,$UIGLUE_LIBS,;t t
-+- s, at LIBTRAYICON_CFLAGS@,$LIBTRAYICON_CFLAGS,;t t
-+- s, at LIBTRAYICON_LIBS@,$LIBTRAYICON_LIBS,;t t
-+- s, at OPEN_WITH_CFLAGS@,$OPEN_WITH_CFLAGS,;t t
-+- s, at OPEN_WITH_LIBS@,$OPEN_WITH_LIBS,;t t
-+- s, at ENABLE_OPEN_WITH_TRUE@,$ENABLE_OPEN_WITH_TRUE,;t t
-+- s, at ENABLE_OPEN_WITH_FALSE@,$ENABLE_OPEN_WITH_FALSE,;t t
-+- s, at EVO_LIBDIR@,$EVO_LIBDIR,;t t
-+- s, at EVO_CFLAGS@,$EVO_CFLAGS,;t t
-+- s, at EVO_LIBS@,$EVO_LIBS,;t t
-+- s, at ENABLE_EVOLUTION_TRUE@,$ENABLE_EVOLUTION_TRUE,;t t
-+- s, at ENABLE_EVOLUTION_FALSE@,$ENABLE_EVOLUTION_FALSE,;t t
-+- s, at USE_LOCAL_SQLITE_TRUE@,$USE_LOCAL_SQLITE_TRUE,;t t
-+- s, at USE_LOCAL_SQLITE_FALSE@,$USE_LOCAL_SQLITE_FALSE,;t t
-+- s, at ENABLE_INOTIFY_TRUE@,$ENABLE_INOTIFY_TRUE,;t t
-+- s, at ENABLE_INOTIFY_FALSE@,$ENABLE_INOTIFY_FALSE,;t t
-+- s, at GSF_SHARP_CFLAGS@,$GSF_SHARP_CFLAGS,;t t
-+- s, at GSF_SHARP_LIBS@,$GSF_SHARP_LIBS,;t t
-+- s, at ENABLE_GSF_SHARP_TRUE@,$ENABLE_GSF_SHARP_TRUE,;t t
-+- s, at ENABLE_GSF_SHARP_FALSE@,$ENABLE_GSF_SHARP_FALSE,;t t
-+- s, at LIBEXIF_CFLAGS@,$LIBEXIF_CFLAGS,;t t
-+- s, at LIBEXIF_LIBS@,$LIBEXIF_LIBS,;t t
-+- s, at LIBEXIF_API_CHECK_CFLAGS@,$LIBEXIF_API_CHECK_CFLAGS,;t t
-+- s, at LIBEXIF_API_CHECK_LIBS@,$LIBEXIF_API_CHECK_LIBS,;t t
-+- s, at LIBEXIF_VERSION_CHECK_CFLAGS@,$LIBEXIF_VERSION_CHECK_CFLAGS,;t t
-+- s, at LIBEXIF_VERSION_CHECK_LIBS@,$LIBEXIF_VERSION_CHECK_LIBS,;t t
-+- s, at EXIF_SOVERSION@,$EXIF_SOVERSION,;t t
-+- s, at BEAGLED_CFLAGS@,$BEAGLED_CFLAGS,;t t
-+- s, at BEAGLED_LIBS@,$BEAGLED_LIBS,;t t
-+- s, at HTML_DIR@,$HTML_DIR,;t t
-+- s, at ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
-+- s, at ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t
-+- s, at GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t
-+- s, at GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t
-+- s, at LIBBEAGLE_VERSION_INFO@,$LIBBEAGLE_VERSION_INFO,;t t
-+- s, at LIBBEAGLE_CFLAGS@,$LIBBEAGLE_CFLAGS,;t t
-+- s, at LIBBEAGLE_LIBS@,$LIBBEAGLE_LIBS,;t t
-+- s, at ENABLE_LIBBEAGLE_TRUE@,$ENABLE_LIBBEAGLE_TRUE,;t t
-+- s, at ENABLE_LIBBEAGLE_FALSE@,$ENABLE_LIBBEAGLE_FALSE,;t t
-+- s, at ENABLE_BLUDGEON_TRUE@,$ENABLE_BLUDGEON_TRUE,;t t
-+- s, at ENABLE_BLUDGEON_FALSE@,$ENABLE_BLUDGEON_FALSE,;t t
-+- s, at EPIPHANY_REQUIRED@,$EPIPHANY_REQUIRED,;t t
-+- s, at LIBXML_REQUIRED@,$LIBXML_REQUIRED,;t t
-+- s, at LIBGLIB_REQUIRED@,$LIBGLIB_REQUIRED,;t t
-+- s, at LIBGTK_REQUIRED@,$LIBGTK_REQUIRED,;t t
-+- s, at EPIPHANY_DEPENDENCY_CFLAGS@,$EPIPHANY_DEPENDENCY_CFLAGS,;t t
-+- s, at EPIPHANY_DEPENDENCY_LIBS@,$EPIPHANY_DEPENDENCY_LIBS,;t t
-+- s, at EPIPHANY_EXTENSIONS_DIR@,$EPIPHANY_EXTENSIONS_DIR,;t t
-+- s, at EPIPHANY_PREFIX@,$EPIPHANY_PREFIX,;t t
-+- s, at ENABLE_EPIPHANY_EXTENSION_TRUE@,$ENABLE_EPIPHANY_EXTENSION_TRUE,;t t
-+- s, at ENABLE_EPIPHANY_EXTENSION_FALSE@,$ENABLE_EPIPHANY_EXTENSION_FALSE,;t t
-+- s, at INSTALL_EPIPHANY_EXTENSION_TRUE@,$INSTALL_EPIPHANY_EXTENSION_TRUE,;t t
-+- s, at INSTALL_EPIPHANY_EXTENSION_FALSE@,$INSTALL_EPIPHANY_EXTENSION_FALSE,;t t
-+- s, at GALAGO_CFLAGS@,$GALAGO_CFLAGS,;t t
-+- s, at GALAGO_LIBS@,$GALAGO_LIBS,;t t
-+- s, at ENABLE_GALAGO_TRUE@,$ENABLE_GALAGO_TRUE,;t t
-+- s, at ENABLE_GALAGO_FALSE@,$ENABLE_GALAGO_FALSE,;t t
-+- s, at GTK_BINARY_VERSION@,$GTK_BINARY_VERSION,;t t
-+- s, at SYSTEMINFO_GLUE_CFLAGS@,$SYSTEMINFO_GLUE_CFLAGS,;t t
-+- s, at SYSTEMINFO_GLUE_LIBS@,$SYSTEMINFO_GLUE_LIBS,;t t
-+- s, at SYSTEMINFO_GLUE_X_LIBS@,$SYSTEMINFO_GLUE_X_LIBS,;t t
-+- s, at WV1_CFLAGS@,$WV1_CFLAGS,;t t
-+- s, at WV1_LIBS@,$WV1_LIBS,;t t
-+- s, at ENABLE_WV1_TRUE@,$ENABLE_WV1_TRUE,;t t
-+- s, at ENABLE_WV1_FALSE@,$ENABLE_WV1_FALSE,;t t
-+- s, at KDE_CONFIG@,$KDE_CONFIG,;t t
-+- s, at KDE_PREFIX@,$KDE_PREFIX,;t t
-+- s, at ENABLE_WEBSERVICES_TRUE@,$ENABLE_WEBSERVICES_TRUE,;t t
-+- s, at ENABLE_WEBSERVICES_FALSE@,$ENABLE_WEBSERVICES_FALSE,;t t
-+- s, at GAC_PREFIX@,$GAC_PREFIX,;t t
-+- s, at GNOME_PREFIX@,$GNOME_PREFIX,;t t
-+- s, at HAS_LIBCHM_TRUE@,$HAS_LIBCHM_TRUE,;t t
-+- s, at HAS_LIBCHM_FALSE@,$HAS_LIBCHM_FALSE,;t t
-+- s, at BEAGLE_DEFINES@,$BEAGLE_DEFINES,;t t
-+- s, at PYTHON@,$PYTHON,;t t
-+- s, at PYTHON_VERSION@,$PYTHON_VERSION,;t t
-+- s, at PYTHON_PREFIX@,$PYTHON_PREFIX,;t t
-+- s, at PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t
-+- s, at PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t
-+- s, at pythondir@,$pythondir,;t t
-+- s, at pkgpythondir@,$pkgpythondir,;t t
-+- s, at pyexecdir@,$pyexecdir,;t t
-+- s, at pkgpyexecdir@,$pkgpyexecdir,;t t
-+- s, at PYTHON_INCLUDES@,$PYTHON_INCLUDES,;t t
-+- s, at PYBEAGLE_CFLAGS@,$PYBEAGLE_CFLAGS,;t t
-+- s, at PYBEAGLE_LIBS@,$PYBEAGLE_LIBS,;t t
-+- s, at PYGTK_CODEGEN@,$PYGTK_CODEGEN,;t t
-+- s, at ENABLE_PYTHON_TRUE@,$ENABLE_PYTHON_TRUE,;t t
-+- s, at ENABLE_PYTHON_FALSE@,$ENABLE_PYTHON_FALSE,;t t
-+- s, at PYGTK_DEFSDIR@,$PYGTK_DEFSDIR,;t t
-+- s, at LIBOBJS@,$LIBOBJS,;t t
-+- s, at LTLIBOBJS@,$LTLIBOBJS,;t t
-+- CEOF
-+
-+ _ACEOF
-+
-+- cat >>$CONFIG_STATUS <<\_ACEOF
-+- # Split the substitutions into bite-sized pieces for seds with
-+- # small command number limits, like on Digital OSF/1 and HP-UX.
-+- ac_max_sed_lines=48
-+- ac_sed_frag=1 # Number of current file.
-+- ac_beg=1 # First line for current file.
-+- ac_end=$ac_max_sed_lines # Line after last line for current file.
-+- ac_more_lines=:
-+- ac_sed_cmds=
-+- while $ac_more_lines; do
-+- if test $ac_beg -gt 1; then
-+- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+- else
-+- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-+- fi
-+- if test ! -s $tmp/subs.frag; then
-+- ac_more_lines=false
-+- else
-+- # The purpose of the label and of the branching condition is to
-+- # speed up the sed processing (if there are no `@' at all, there
-+- # is no need to browse any of the substitutions).
-+- # These are the two extra sed commands mentioned above.
-+- (echo ':t
-+- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-+- if test -z "$ac_sed_cmds"; then
-+- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-+- else
-+- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-+- fi
-+- ac_sed_frag=`expr $ac_sed_frag + 1`
-+- ac_beg=$ac_end
-+- ac_end=`expr $ac_end + $ac_max_sed_lines`
-+- fi
-+- done
-+- if test -z "$ac_sed_cmds"; then
-+- ac_sed_cmds=cat
-+ fi
-+- fi # test -n "$CONFIG_FILES"
-+
-+ _ACEOF
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-+- for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-+- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-+- case $ac_file in
-+- - | *:- | *:-:* ) # input from stdin
-+- cat >$tmp/stdin
-+- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-+- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-+- * ) ac_file_in=$ac_file.in ;;
-+ esac
-+
-+- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-+- ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-+- X"$ac_file" : 'X\(/\)' \| \
-+- . : '\(.\)' 2>/dev/null ||
-+ echo X"$ac_file" |
-+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+- /^X\(\/\/\)$/{ s//\1/; q; }
-+- /^X\(\/\).*/{ s//\1/; q; }
-+- s/.*/./; q'`
-+- { if $as_mkdir_p; then
-+- mkdir -p "$ac_dir"
-+- else
-+- as_dir="$ac_dir"
-+ as_dirs=
-+- while test ! -d "$as_dir"; do
-+- as_dirs="$as_dir $as_dirs"
-+- as_dir=`(dirname "$as_dir") 2>/dev/null ||
-+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-+- X"$as_dir" : 'X\(/\)' \| \
-+- . : '\(.\)' 2>/dev/null ||
-+ echo X"$as_dir" |
-+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-+- /^X\(\/\/\)$/{ s//\1/; q; }
-+- /^X\(\/\).*/{ s//\1/; q; }
-+- s/.*/./; q'`
-+ done
-+- test ! -n "$as_dirs" || mkdir $as_dirs
-+- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-+- echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+-
-+ ac_builddir=.
-+
-+- if test "$ac_dir" != .; then
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-+- # A "../" for each directory in $ac_dir_suffix.
-+- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-+- else
-+- ac_dir_suffix= ac_top_builddir=
-+- fi
-+
-+ case $srcdir in
-+- .) # No --srcdir option. We are building in place.
-+ ac_srcdir=.
-+- if test -z "$ac_top_builddir"; then
-+- ac_top_srcdir=.
-+- else
-+- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-+- fi ;;
-+- [\\/]* | ?:[\\/]* ) # Absolute path.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-+- ac_top_srcdir=$srcdir ;;
-+- *) # Relative path.
-+- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-+- ac_top_srcdir=$ac_top_builddir$srcdir ;;
-+ esac
-+
-+- # Do not use `cd foo && pwd` to compute absolute paths, because
-+- # the directories may not exist.
-+- case `pwd` in
-+- .) ac_abs_builddir="$ac_dir";;
-+- *)
-+- case "$ac_dir" in
-+- .) ac_abs_builddir=`pwd`;;
-+- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-+- *) ac_abs_builddir=`pwd`/"$ac_dir";;
-+- esac;;
-+- esac
-+- case $ac_abs_builddir in
-+- .) ac_abs_top_builddir=${ac_top_builddir}.;;
-+- *)
-+- case ${ac_top_builddir}. in
-+- .) ac_abs_top_builddir=$ac_abs_builddir;;
-+- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-+- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-+- esac;;
-+- esac
-+- case $ac_abs_builddir in
-+- .) ac_abs_srcdir=$ac_srcdir;;
-+- *)
-+- case $ac_srcdir in
-+- .) ac_abs_srcdir=$ac_abs_builddir;;
-+- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-+- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-+- esac;;
-+- esac
-+- case $ac_abs_builddir in
-+- .) ac_abs_top_srcdir=$ac_top_srcdir;;
-+- *)
-+- case $ac_top_srcdir in
-+- .) ac_abs_top_srcdir=$ac_abs_builddir;;
-+- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-+- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-+- esac;;
-+- esac
-+
-+
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+- *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-+ esac
-+
-+- if test x"$ac_file" != x-; then
-+- { echo "$as_me:$LINENO: creating $ac_file" >&5
-+- echo "$as_me: creating $ac_file" >&6;}
-+- rm -f "$ac_file"
-+- fi
-+- # Let's still pretend it is `configure' which instantiates (i.e., don't
-+- # use $as_me), people would be surprised to read:
-+- # /* config.h. Generated by config.status. */
-+- if test x"$ac_file" = x-; then
-+- configure_input=
-+- else
-+- configure_input="$ac_file. "
-+- fi
-+- configure_input=$configure_input"Generated from `echo $ac_file_in |
-+- sed 's,.*/,,'` by configure."
-+
-+- # First look for the input files in the build tree, otherwise in the
-+- # src tree.
-+- ac_file_inputs=`IFS=:
-+- for f in $ac_file_in; do
-+- case $f in
-+- -) echo $tmp/stdin ;;
-+- [\\/$]*)
-+- # Absolute (can't be DOS-style, as IFS=:)
-+- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+- echo "$as_me: error: cannot find input file: $f" >&2;}
-+- { (exit 1); exit 1; }; }
-+- echo "$f";;
-+- *) # Relative
-+- if test -f "$f"; then
-+- # Build tree
-+- echo "$f"
-+- elif test -f "$srcdir/$f"; then
-+- # Source tree
-+- echo "$srcdir/$f"
-+- else
-+- # /dev/null tree
-+- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-+- echo "$as_me: error: cannot find input file: $f" >&2;}
-+- { (exit 1); exit 1; }; }
-+- fi;;
-+- esac
-+- done` || { (exit 1); exit 1; }
-+ _ACEOF
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
-+ $extrasub
-+--- 29314,29988 ----
-+ fi
-+
-+ # Have a temporary directory for convenience. Make it in the build tree
-++ # simply because there is no reason against having it here, and in addition,
-+ # creating and moving files from /tmp can sometimes cause problems.
-++ # Hook for its removal unless debugging.
-++ # Note that there is a small window in which the directory will not be cleaned:
-++ # after its creation but before its name has been assigned to `$tmp'.
-+ $debug ||
-+ {
-++ tmp=
-++ trap 'exit_status=$?
-++ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-++ ' 0
-+ trap '{ (exit 1); exit 1; }' 1 2 13 15
-+ }
-+ # Create a (secure) tmp directory for tmp files.
-+
-+ {
-++ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+ test -n "$tmp" && test -d "$tmp"
-+ } ||
-+ {
-++ tmp=./conf$$-$RANDOM
-++ (umask 077 && mkdir "$tmp")
-+ } ||
-+ {
-+ echo "$me: cannot create a temporary directory in ." >&2
-+ { (exit 1); exit 1; }
-+ }
-+
-+ #
-++ # Set up the sed scripts for CONFIG_FILES section.
-+ #
-+
-+ # No need to generate the scripts if there are no CONFIG_FILES.
-+ # This happens for instance when ./config.status config.h
-++ if test -n "$CONFIG_FILES"; then
-+
-+ _ACEOF
-+
-++
-++
-++ ac_delim='%!_!# '
-++ for ac_last_try in false false false false false :; do
-++ cat >conf$$subs.sed <<_ACEOF
-++ SHELL!$SHELL$ac_delim
-++ PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-++ PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-++ PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-++ PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-++ PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-++ PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-++ exec_prefix!$exec_prefix$ac_delim
-++ prefix!$prefix$ac_delim
-++ program_transform_name!$program_transform_name$ac_delim
-++ bindir!$bindir$ac_delim
-++ sbindir!$sbindir$ac_delim
-++ libexecdir!$libexecdir$ac_delim
-++ datarootdir!$datarootdir$ac_delim
-++ datadir!$datadir$ac_delim
-++ sysconfdir!$sysconfdir$ac_delim
-++ sharedstatedir!$sharedstatedir$ac_delim
-++ localstatedir!$localstatedir$ac_delim
-++ includedir!$includedir$ac_delim
-++ oldincludedir!$oldincludedir$ac_delim
-++ docdir!$docdir$ac_delim
-++ infodir!$infodir$ac_delim
-++ htmldir!$htmldir$ac_delim
-++ dvidir!$dvidir$ac_delim
-++ pdfdir!$pdfdir$ac_delim
-++ psdir!$psdir$ac_delim
-++ libdir!$libdir$ac_delim
-++ localedir!$localedir$ac_delim
-++ mandir!$mandir$ac_delim
-++ DEFS!$DEFS$ac_delim
-++ ECHO_C!$ECHO_C$ac_delim
-++ ECHO_N!$ECHO_N$ac_delim
-++ ECHO_T!$ECHO_T$ac_delim
-++ LIBS!$LIBS$ac_delim
-++ build_alias!$build_alias$ac_delim
-++ host_alias!$host_alias$ac_delim
-++ target_alias!$target_alias$ac_delim
-++ build!$build$ac_delim
-++ build_cpu!$build_cpu$ac_delim
-++ build_vendor!$build_vendor$ac_delim
-++ build_os!$build_os$ac_delim
-++ host!$host$ac_delim
-++ host_cpu!$host_cpu$ac_delim
-++ host_vendor!$host_vendor$ac_delim
-++ host_os!$host_os$ac_delim
-++ target!$target$ac_delim
-++ target_cpu!$target_cpu$ac_delim
-++ target_vendor!$target_vendor$ac_delim
-++ target_os!$target_os$ac_delim
-++ INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-++ INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-++ INSTALL_DATA!$INSTALL_DATA$ac_delim
-++ CYGPATH_W!$CYGPATH_W$ac_delim
-++ PACKAGE!$PACKAGE$ac_delim
-++ VERSION!$VERSION$ac_delim
-++ ACLOCAL!$ACLOCAL$ac_delim
-++ AUTOCONF!$AUTOCONF$ac_delim
-++ AUTOMAKE!$AUTOMAKE$ac_delim
-++ AUTOHEADER!$AUTOHEADER$ac_delim
-++ MAKEINFO!$MAKEINFO$ac_delim
-++ install_sh!$install_sh$ac_delim
-++ STRIP!$STRIP$ac_delim
-++ INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim
-++ mkdir_p!$mkdir_p$ac_delim
-++ AWK!$AWK$ac_delim
-++ SET_MAKE!$SET_MAKE$ac_delim
-++ am__leading_dot!$am__leading_dot$ac_delim
-++ AMTAR!$AMTAR$ac_delim
-++ am__tar!$am__tar$ac_delim
-++ am__untar!$am__untar$ac_delim
-++ MAINTAINER_MODE_TRUE!$MAINTAINER_MODE_TRUE$ac_delim
-++ MAINTAINER_MODE_FALSE!$MAINTAINER_MODE_FALSE$ac_delim
-++ MAINT!$MAINT$ac_delim
-++ CC!$CC$ac_delim
-++ CFLAGS!$CFLAGS$ac_delim
-++ LDFLAGS!$LDFLAGS$ac_delim
-++ CPPFLAGS!$CPPFLAGS$ac_delim
-++ ac_ct_CC!$ac_ct_CC$ac_delim
-++ EXEEXT!$EXEEXT$ac_delim
-++ OBJEXT!$OBJEXT$ac_delim
-++ DEPDIR!$DEPDIR$ac_delim
-++ am__include!$am__include$ac_delim
-++ am__quote!$am__quote$ac_delim
-++ AMDEP_TRUE!$AMDEP_TRUE$ac_delim
-++ AMDEP_FALSE!$AMDEP_FALSE$ac_delim
-++ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
-++ CCDEPMODE!$CCDEPMODE$ac_delim
-++ am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
-++ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
-++ GREP!$GREP$ac_delim
-++ EGREP!$EGREP$ac_delim
-++ LN_S!$LN_S$ac_delim
-++ ECHO!$ECHO$ac_delim
-++ AR!$AR$ac_delim
-++ RANLIB!$RANLIB$ac_delim
-++ CPP!$CPP$ac_delim
-++ CXX!$CXX$ac_delim
-++ _ACEOF
-++
-++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-++ break
-++ elif $ac_last_try; then
-++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-++ { (exit 1); exit 1; }; }
-++ else
-++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+ fi
-++ done
-++
-++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-++ if test -n "$ac_eof"; then
-++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-++ ac_eof=`expr $ac_eof + 1`
-++ fi
-++
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-++ _ACEOF
-++ sed '
-++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-++ s/^/s,@/; s/!/@,|#_!!_#|/
-++ :n
-++ t n
-++ s/'"$ac_delim"'$/,g/; t
-++ s/$/\\/; p
-++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-++ ' >>$CONFIG_STATUS <conf$$subs.sed
-++ rm -f conf$$subs.sed
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ CEOF$ac_eof
-++ _ACEOF
-++
-++
-++ ac_delim='%!_!# '
-++ for ac_last_try in false false false false false :; do
-++ cat >conf$$subs.sed <<_ACEOF
-++ CXXFLAGS!$CXXFLAGS$ac_delim
-++ ac_ct_CXX!$ac_ct_CXX$ac_delim
-++ CXXDEPMODE!$CXXDEPMODE$ac_delim
-++ am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
-++ am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-++ CXXCPP!$CXXCPP$ac_delim
-++ F77!$F77$ac_delim
-++ FFLAGS!$FFLAGS$ac_delim
-++ ac_ct_F77!$ac_ct_F77$ac_delim
-++ LIBTOOL!$LIBTOOL$ac_delim
-++ PKG_CONFIG!$PKG_CONFIG$ac_delim
-++ BASH!$BASH$ac_delim
-++ ZIP!$ZIP$ac_delim
-++ MONO!$MONO$ac_delim
-++ MCS!$MCS$ac_delim
-++ MONO_CFLAGS!$MONO_CFLAGS$ac_delim
-++ MONO_LIBS!$MONO_LIBS$ac_delim
-++ SHARPZIPLIB_LIBS!$SHARPZIPLIB_LIBS$ac_delim
-++ OS_LINUX_TRUE!$OS_LINUX_TRUE$ac_delim
-++ OS_LINUX_FALSE!$OS_LINUX_FALSE$ac_delim
-++ OS_FREEBSD_TRUE!$OS_FREEBSD_TRUE$ac_delim
-++ OS_FREEBSD_FALSE!$OS_FREEBSD_FALSE$ac_delim
-++ DESKTOP_LAUNCH!$DESKTOP_LAUNCH$ac_delim
-++ ENABLE_DESKTOP_LAUNCH_TRUE!$ENABLE_DESKTOP_LAUNCH_TRUE$ac_delim
-++ ENABLE_DESKTOP_LAUNCH_FALSE!$ENABLE_DESKTOP_LAUNCH_FALSE$ac_delim
-++ WSDL!$WSDL$ac_delim
-++ ENABLE_GOOGLEDRIVER_TRUE!$ENABLE_GOOGLEDRIVER_TRUE$ac_delim
-++ ENABLE_GOOGLEDRIVER_FALSE!$ENABLE_GOOGLEDRIVER_FALSE$ac_delim
-++ INTLTOOL_DESKTOP_RULE!$INTLTOOL_DESKTOP_RULE$ac_delim
-++ INTLTOOL_DIRECTORY_RULE!$INTLTOOL_DIRECTORY_RULE$ac_delim
-++ INTLTOOL_KEYS_RULE!$INTLTOOL_KEYS_RULE$ac_delim
-++ INTLTOOL_PROP_RULE!$INTLTOOL_PROP_RULE$ac_delim
-++ INTLTOOL_OAF_RULE!$INTLTOOL_OAF_RULE$ac_delim
-++ INTLTOOL_PONG_RULE!$INTLTOOL_PONG_RULE$ac_delim
-++ INTLTOOL_SERVER_RULE!$INTLTOOL_SERVER_RULE$ac_delim
-++ INTLTOOL_SHEET_RULE!$INTLTOOL_SHEET_RULE$ac_delim
-++ INTLTOOL_SOUNDLIST_RULE!$INTLTOOL_SOUNDLIST_RULE$ac_delim
-++ INTLTOOL_UI_RULE!$INTLTOOL_UI_RULE$ac_delim
-++ INTLTOOL_XAM_RULE!$INTLTOOL_XAM_RULE$ac_delim
-++ INTLTOOL_KBD_RULE!$INTLTOOL_KBD_RULE$ac_delim
-++ INTLTOOL_XML_RULE!$INTLTOOL_XML_RULE$ac_delim
-++ INTLTOOL_XML_NOMERGE_RULE!$INTLTOOL_XML_NOMERGE_RULE$ac_delim
-++ INTLTOOL_CAVES_RULE!$INTLTOOL_CAVES_RULE$ac_delim
-++ INTLTOOL_SCHEMAS_RULE!$INTLTOOL_SCHEMAS_RULE$ac_delim
-++ INTLTOOL_THEME_RULE!$INTLTOOL_THEME_RULE$ac_delim
-++ INTLTOOL_SERVICE_RULE!$INTLTOOL_SERVICE_RULE$ac_delim
-++ INTLTOOL_EXTRACT!$INTLTOOL_EXTRACT$ac_delim
-++ INTLTOOL_MERGE!$INTLTOOL_MERGE$ac_delim
-++ INTLTOOL_UPDATE!$INTLTOOL_UPDATE$ac_delim
-++ INTLTOOL_PERL!$INTLTOOL_PERL$ac_delim
-++ INTLTOOL_ICONV!$INTLTOOL_ICONV$ac_delim
-++ INTLTOOL_MSGFMT!$INTLTOOL_MSGFMT$ac_delim
-++ INTLTOOL_MSGMERGE!$INTLTOOL_MSGMERGE$ac_delim
-++ INTLTOOL_XGETTEXT!$INTLTOOL_XGETTEXT$ac_delim
-++ ALL_LINGUAS!$ALL_LINGUAS$ac_delim
-++ GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
-++ USE_NLS!$USE_NLS$ac_delim
-++ MSGFMT!$MSGFMT$ac_delim
-++ GMSGFMT!$GMSGFMT$ac_delim
-++ XGETTEXT!$XGETTEXT$ac_delim
-++ CATALOGS!$CATALOGS$ac_delim
-++ CATOBJEXT!$CATOBJEXT$ac_delim
-++ DATADIRNAME!$DATADIRNAME$ac_delim
-++ GMOFILES!$GMOFILES$ac_delim
-++ INSTOBJEXT!$INSTOBJEXT$ac_delim
-++ INTLLIBS!$INTLLIBS$ac_delim
-++ PO_IN_DATADIR_TRUE!$PO_IN_DATADIR_TRUE$ac_delim
-++ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE$ac_delim
-++ POFILES!$POFILES$ac_delim
-++ POSUB!$POSUB$ac_delim
-++ MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-++ SQLITE_CFLAGS!$SQLITE_CFLAGS$ac_delim
-++ SQLITE_LIBS!$SQLITE_LIBS$ac_delim
-++ SQLITE3_CFLAGS!$SQLITE3_CFLAGS$ac_delim
-++ SQLITE3_LIBS!$SQLITE3_LIBS$ac_delim
-++ SQLITE_MAJ_VER!$SQLITE_MAJ_VER$ac_delim
-++ XMKMF!$XMKMF$ac_delim
-++ X_CFLAGS!$X_CFLAGS$ac_delim
-++ X_PRE_LIBS!$X_PRE_LIBS$ac_delim
-++ X_LIBS!$X_LIBS$ac_delim
-++ X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
-++ HAS_LIBXSS_TRUE!$HAS_LIBXSS_TRUE$ac_delim
-++ HAS_LIBXSS_FALSE!$HAS_LIBXSS_FALSE$ac_delim
-++ ENABLE_GUI_TRUE!$ENABLE_GUI_TRUE$ac_delim
-++ ENABLE_GUI_FALSE!$ENABLE_GUI_FALSE$ac_delim
-++ GNOME_VFS_CFLAGS!$GNOME_VFS_CFLAGS$ac_delim
-++ GNOME_VFS_LIBS!$GNOME_VFS_LIBS$ac_delim
-++ BEAGLE_UI_CFLAGS!$BEAGLE_UI_CFLAGS$ac_delim
-++ BEAGLE_UI_LIBS!$BEAGLE_UI_LIBS$ac_delim
-++ UIGLUE_CFLAGS!$UIGLUE_CFLAGS$ac_delim
-++ UIGLUE_LIBS!$UIGLUE_LIBS$ac_delim
-++ LIBTRAYICON_CFLAGS!$LIBTRAYICON_CFLAGS$ac_delim
-++ LIBTRAYICON_LIBS!$LIBTRAYICON_LIBS$ac_delim
-++ OPEN_WITH_CFLAGS!$OPEN_WITH_CFLAGS$ac_delim
-++ OPEN_WITH_LIBS!$OPEN_WITH_LIBS$ac_delim
-++ ENABLE_OPEN_WITH_TRUE!$ENABLE_OPEN_WITH_TRUE$ac_delim
-++ ENABLE_OPEN_WITH_FALSE!$ENABLE_OPEN_WITH_FALSE$ac_delim
-++ _ACEOF
-++
-++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-++ break
-++ elif $ac_last_try; then
-++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-++ { (exit 1); exit 1; }; }
-++ else
-++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-++ fi
-++ done
-++
-++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-++ if test -n "$ac_eof"; then
-++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-++ ac_eof=`expr $ac_eof + 1`
-++ fi
-++
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-++ _ACEOF
-++ sed '
-++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-++ s/^/s,@/; s/!/@,|#_!!_#|/
-++ :n
-++ t n
-++ s/'"$ac_delim"'$/,g/; t
-++ s/$/\\/; p
-++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-++ ' >>$CONFIG_STATUS <conf$$subs.sed
-++ rm -f conf$$subs.sed
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ CEOF$ac_eof
-++ _ACEOF
-++
-++
-++ ac_delim='%!_!# '
-++ for ac_last_try in false false false false false :; do
-++ cat >conf$$subs.sed <<_ACEOF
-++ EVO_LIBDIR!$EVO_LIBDIR$ac_delim
-++ EVO_CFLAGS!$EVO_CFLAGS$ac_delim
-++ EVO_LIBS!$EVO_LIBS$ac_delim
-++ ENABLE_EVOLUTION_TRUE!$ENABLE_EVOLUTION_TRUE$ac_delim
-++ ENABLE_EVOLUTION_FALSE!$ENABLE_EVOLUTION_FALSE$ac_delim
-++ USE_LOCAL_SQLITE_TRUE!$USE_LOCAL_SQLITE_TRUE$ac_delim
-++ USE_LOCAL_SQLITE_FALSE!$USE_LOCAL_SQLITE_FALSE$ac_delim
-++ ENABLE_INOTIFY_TRUE!$ENABLE_INOTIFY_TRUE$ac_delim
-++ ENABLE_INOTIFY_FALSE!$ENABLE_INOTIFY_FALSE$ac_delim
-++ GSF_SHARP_CFLAGS!$GSF_SHARP_CFLAGS$ac_delim
-++ GSF_SHARP_LIBS!$GSF_SHARP_LIBS$ac_delim
-++ ENABLE_GSF_SHARP_TRUE!$ENABLE_GSF_SHARP_TRUE$ac_delim
-++ ENABLE_GSF_SHARP_FALSE!$ENABLE_GSF_SHARP_FALSE$ac_delim
-++ LIBEXIF_CFLAGS!$LIBEXIF_CFLAGS$ac_delim
-++ LIBEXIF_LIBS!$LIBEXIF_LIBS$ac_delim
-++ LIBEXIF_API_CHECK_CFLAGS!$LIBEXIF_API_CHECK_CFLAGS$ac_delim
-++ LIBEXIF_API_CHECK_LIBS!$LIBEXIF_API_CHECK_LIBS$ac_delim
-++ LIBEXIF_VERSION_CHECK_CFLAGS!$LIBEXIF_VERSION_CHECK_CFLAGS$ac_delim
-++ LIBEXIF_VERSION_CHECK_LIBS!$LIBEXIF_VERSION_CHECK_LIBS$ac_delim
-++ EXIF_SOVERSION!$EXIF_SOVERSION$ac_delim
-++ BEAGLED_CFLAGS!$BEAGLED_CFLAGS$ac_delim
-++ BEAGLED_LIBS!$BEAGLED_LIBS$ac_delim
-++ HTML_DIR!$HTML_DIR$ac_delim
-++ ENABLE_GTK_DOC_TRUE!$ENABLE_GTK_DOC_TRUE$ac_delim
-++ ENABLE_GTK_DOC_FALSE!$ENABLE_GTK_DOC_FALSE$ac_delim
-++ GTK_DOC_USE_LIBTOOL_TRUE!$GTK_DOC_USE_LIBTOOL_TRUE$ac_delim
-++ GTK_DOC_USE_LIBTOOL_FALSE!$GTK_DOC_USE_LIBTOOL_FALSE$ac_delim
-++ LIBBEAGLE_VERSION_INFO!$LIBBEAGLE_VERSION_INFO$ac_delim
-++ LIBBEAGLE_CFLAGS!$LIBBEAGLE_CFLAGS$ac_delim
-++ LIBBEAGLE_LIBS!$LIBBEAGLE_LIBS$ac_delim
-++ ENABLE_LIBBEAGLE_TRUE!$ENABLE_LIBBEAGLE_TRUE$ac_delim
-++ ENABLE_LIBBEAGLE_FALSE!$ENABLE_LIBBEAGLE_FALSE$ac_delim
-++ ENABLE_BLUDGEON_TRUE!$ENABLE_BLUDGEON_TRUE$ac_delim
-++ ENABLE_BLUDGEON_FALSE!$ENABLE_BLUDGEON_FALSE$ac_delim
-++ EPIPHANY_REQUIRED!$EPIPHANY_REQUIRED$ac_delim
-++ LIBXML_REQUIRED!$LIBXML_REQUIRED$ac_delim
-++ LIBGLIB_REQUIRED!$LIBGLIB_REQUIRED$ac_delim
-++ LIBGTK_REQUIRED!$LIBGTK_REQUIRED$ac_delim
-++ EPIPHANY_DEPENDENCY_CFLAGS!$EPIPHANY_DEPENDENCY_CFLAGS$ac_delim
-++ EPIPHANY_DEPENDENCY_LIBS!$EPIPHANY_DEPENDENCY_LIBS$ac_delim
-++ EPIPHANY_EXTENSIONS_DIR!$EPIPHANY_EXTENSIONS_DIR$ac_delim
-++ EPIPHANY_PREFIX!$EPIPHANY_PREFIX$ac_delim
-++ ENABLE_EPIPHANY_EXTENSION_TRUE!$ENABLE_EPIPHANY_EXTENSION_TRUE$ac_delim
-++ ENABLE_EPIPHANY_EXTENSION_FALSE!$ENABLE_EPIPHANY_EXTENSION_FALSE$ac_delim
-++ INSTALL_EPIPHANY_EXTENSION_TRUE!$INSTALL_EPIPHANY_EXTENSION_TRUE$ac_delim
-++ INSTALL_EPIPHANY_EXTENSION_FALSE!$INSTALL_EPIPHANY_EXTENSION_FALSE$ac_delim
-++ GALAGO_CFLAGS!$GALAGO_CFLAGS$ac_delim
-++ GALAGO_LIBS!$GALAGO_LIBS$ac_delim
-++ ENABLE_GALAGO_TRUE!$ENABLE_GALAGO_TRUE$ac_delim
-++ ENABLE_GALAGO_FALSE!$ENABLE_GALAGO_FALSE$ac_delim
-++ GTK_BINARY_VERSION!$GTK_BINARY_VERSION$ac_delim
-++ SYSTEMINFO_GLUE_CFLAGS!$SYSTEMINFO_GLUE_CFLAGS$ac_delim
-++ SYSTEMINFO_GLUE_LIBS!$SYSTEMINFO_GLUE_LIBS$ac_delim
-++ SYSTEMINFO_GLUE_X_LIBS!$SYSTEMINFO_GLUE_X_LIBS$ac_delim
-++ WV1_CFLAGS!$WV1_CFLAGS$ac_delim
-++ WV1_LIBS!$WV1_LIBS$ac_delim
-++ ENABLE_WV1_TRUE!$ENABLE_WV1_TRUE$ac_delim
-++ ENABLE_WV1_FALSE!$ENABLE_WV1_FALSE$ac_delim
-++ KDE_CONFIG!$KDE_CONFIG$ac_delim
-++ KDE_PREFIX!$KDE_PREFIX$ac_delim
-++ ENABLE_WEBSERVICES_TRUE!$ENABLE_WEBSERVICES_TRUE$ac_delim
-++ ENABLE_WEBSERVICES_FALSE!$ENABLE_WEBSERVICES_FALSE$ac_delim
-++ GAC_PREFIX!$GAC_PREFIX$ac_delim
-++ GNOME_PREFIX!$GNOME_PREFIX$ac_delim
-++ HAS_LIBCHM_TRUE!$HAS_LIBCHM_TRUE$ac_delim
-++ HAS_LIBCHM_FALSE!$HAS_LIBCHM_FALSE$ac_delim
-++ BEAGLE_DEFINES!$BEAGLE_DEFINES$ac_delim
-++ PYTHON!$PYTHON$ac_delim
-++ PYTHON_VERSION!$PYTHON_VERSION$ac_delim
-++ PYTHON_PREFIX!$PYTHON_PREFIX$ac_delim
-++ PYTHON_EXEC_PREFIX!$PYTHON_EXEC_PREFIX$ac_delim
-++ PYTHON_PLATFORM!$PYTHON_PLATFORM$ac_delim
-++ pythondir!$pythondir$ac_delim
-++ pkgpythondir!$pkgpythondir$ac_delim
-++ pyexecdir!$pyexecdir$ac_delim
-++ pkgpyexecdir!$pkgpyexecdir$ac_delim
-++ PYTHON_INCLUDES!$PYTHON_INCLUDES$ac_delim
-++ PYBEAGLE_CFLAGS!$PYBEAGLE_CFLAGS$ac_delim
-++ PYBEAGLE_LIBS!$PYBEAGLE_LIBS$ac_delim
-++ PYGTK_CODEGEN!$PYGTK_CODEGEN$ac_delim
-++ ENABLE_PYTHON_TRUE!$ENABLE_PYTHON_TRUE$ac_delim
-++ ENABLE_PYTHON_FALSE!$ENABLE_PYTHON_FALSE$ac_delim
-++ PYGTK_DEFSDIR!$PYGTK_DEFSDIR$ac_delim
-++ LIBOBJS!$LIBOBJS$ac_delim
-++ LTLIBOBJS!$LTLIBOBJS$ac_delim
-++ _ACEOF
-++
-++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
-++ break
-++ elif $ac_last_try; then
-++ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-++ echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
-++ { (exit 1); exit 1; }; }
-++ else
-++ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-++ fi
-++ done
-+
-++ ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-++ if test -n "$ac_eof"; then
-++ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
-++ ac_eof=`expr $ac_eof + 1`
-++ fi
-++
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof
-++ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-+ _ACEOF
-++ sed '
-++ s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-++ s/^/s,@/; s/!/@,|#_!!_#|/
-++ :n
-++ t n
-++ s/'"$ac_delim"'$/,g/; t
-++ s/$/\\/; p
-++ N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-++ ' >>$CONFIG_STATUS <conf$$subs.sed
-++ rm -f conf$$subs.sed
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ :end
-++ s/|#_!!_#|//g
-++ CEOF$ac_eof
-++ _ACEOF
-++
-++
-++ # VPATH may cause trouble with some makes, so we remove $(srcdir),
-++ # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-++ # trailing colons and then remove the whole line if VPATH becomes empty
-++ # (actually we leave an empty line to preserve line numbers).
-++ if test "x$srcdir" = x.; then
-++ ac_vpsub='/^[ ]*VPATH[ ]*=/{
-++ s/:*\$(srcdir):*/:/
-++ s/:*\${srcdir}:*/:/
-++ s/:*@srcdir@:*/:/
-++ s/^\([^=]*=[ ]*\):*/\1/
-++ s/:*$//
-++ s/^[^=]*=[ ]*$//
-++ }'
-++ fi
-++
-+ cat >>$CONFIG_STATUS <<\_ACEOF
-++ fi # test -n "$CONFIG_FILES"
-++
-++
-++ for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS
-++ do
-++ case $ac_tag in
-++ :[FHLC]) ac_mode=$ac_tag; continue;;
-++ esac
-++ case $ac_mode$ac_tag in
-++ :[FHL]*:*);;
-++ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-++ echo "$as_me: error: Invalid tag $ac_tag." >&2;}
-++ { (exit 1); exit 1; }; };;
-++ :[FH]-) ac_tag=-:-;;
-++ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+ esac
-++ ac_save_IFS=$IFS
-++ IFS=:
-++ set x $ac_tag
-++ IFS=$ac_save_IFS
-++ shift
-++ ac_file=$1
-++ shift
-+
-++ case $ac_mode in
-++ :L) ac_source=$1;;
-++ :[FH])
-++ ac_file_inputs=
-++ for ac_f
-++ do
-++ case $ac_f in
-++ -) ac_f="$tmp/stdin";;
-++ *) # Look for the file first in the build tree, then in the source tree
-++ # (if the path is not absolute). The absolute path cannot be DOS-style,
-++ # because $ac_f cannot contain `:'.
-++ test -f "$ac_f" ||
-++ case $ac_f in
-++ [\\/$]*) false;;
-++ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-++ esac ||
-++ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-++ echo "$as_me: error: cannot find input file: $ac_f" >&2;}
-++ { (exit 1); exit 1; }; };;
-++ esac
-++ ac_file_inputs="$ac_file_inputs $ac_f"
-++ done
-++
-++ # Let's still pretend it is `configure' which instantiates (i.e., don't
-++ # use $as_me), people would be surprised to read:
-++ # /* config.h. Generated by config.status. */
-++ configure_input="Generated from "`IFS=:
-++ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
-++ if test x"$ac_file" != x-; then
-++ configure_input="$ac_file. $configure_input"
-++ { echo "$as_me:$LINENO: creating $ac_file" >&5
-++ echo "$as_me: creating $ac_file" >&6;}
-++ fi
-++
-++ case $ac_tag in
-++ *:-:* | *:-) cat >"$tmp/stdin";;
-++ esac
-++ ;;
-++ esac
-++
-++ ac_dir=`$as_dirname -- "$ac_file" ||
-+ $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$ac_file" : 'X\(//\)[^/]' \| \
-+ X"$ac_file" : 'X\(//\)$' \| \
-++ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$ac_file" |
-++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)[^/].*/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\).*/{
-++ s//\1/
-++ q
-++ }
-++ s/.*/./; q'`
-++ { as_dir="$ac_dir"
-++ case $as_dir in #(
-++ -*) as_dir=./$as_dir;;
-++ esac
-++ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
-+ as_dirs=
-++ while :; do
-++ case $as_dir in #(
-++ *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
-++ *) as_qdir=$as_dir;;
-++ esac
-++ as_dirs="'$as_qdir' $as_dirs"
-++ as_dir=`$as_dirname -- "$as_dir" ||
-+ $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+ X"$as_dir" : 'X\(//\)[^/]' \| \
-+ X"$as_dir" : 'X\(//\)$' \| \
-++ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+ echo X"$as_dir" |
-++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)[^/].*/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\/\)$/{
-++ s//\1/
-++ q
-++ }
-++ /^X\(\/\).*/{
-++ s//\1/
-++ q
-++ }
-++ s/.*/./; q'`
-++ test -d "$as_dir" && break
-+ done
-++ test -z "$as_dirs" || eval "mkdir $as_dirs"
-++ } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
-++ echo "$as_me: error: cannot create directory $as_dir" >&2;}
-+ { (exit 1); exit 1; }; }; }
-+ ac_builddir=.
-+
-++ case "$ac_dir" in
-++ .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-++ *)
-+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-++ # A ".." for each directory in $ac_dir_suffix.
-++ ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
-++ case $ac_top_builddir_sub in
-++ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-++ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-++ esac ;;
-++ esac
-++ ac_abs_top_builddir=$ac_pwd
-++ ac_abs_builddir=$ac_pwd$ac_dir_suffix
-++ # for backward compatibility:
-++ ac_top_builddir=$ac_top_build_prefix
-+
-+ case $srcdir in
-++ .) # We are building in place.
-+ ac_srcdir=.
-++ ac_top_srcdir=$ac_top_builddir_sub
-++ ac_abs_top_srcdir=$ac_pwd ;;
-++ [\\/]* | ?:[\\/]* ) # Absolute name.
-+ ac_srcdir=$srcdir$ac_dir_suffix;
-++ ac_top_srcdir=$srcdir
-++ ac_abs_top_srcdir=$srcdir ;;
-++ *) # Relative name.
-++ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-++ ac_top_srcdir=$ac_top_build_prefix$srcdir
-++ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+ esac
-++ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-++ case $ac_mode in
-++ :F)
-++ #
-++ # CONFIG_FILE
-++ #
-+
-+ case $INSTALL in
-+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-++ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+ esac
-++ _ACEOF
-+
-++ cat >>$CONFIG_STATUS <<\_ACEOF
-++ # If the template does not know about datarootdir, expand it.
-++ # FIXME: This hack should be removed a few years after 2.60.
-++ ac_datarootdir_hack=; ac_datarootdir_seen=
-+
-++ case `sed -n '/datarootdir/ {
-++ p
-++ q
-++ }
-++ /@datadir@/p
-++ /@docdir@/p
-++ /@infodir@/p
-++ /@localedir@/p
-++ /@mandir@/p
-++ ' $ac_file_inputs` in
-++ *datarootdir*) ac_datarootdir_seen=yes;;
-++ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-++ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-++ echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
-++ _ACEOF
-++ cat >>$CONFIG_STATUS <<_ACEOF
-++ ac_datarootdir_hack='
-++ s&@datadir@&$datadir&g
-++ s&@docdir@&$docdir&g
-++ s&@infodir@&$infodir&g
-++ s&@localedir@&$localedir&g
-++ s&@mandir@&$mandir&g
-++ s&\\\${datarootdir}&$datarootdir&g' ;;
-++ esac
-+ _ACEOF
-++
-++ # Neutralize VPATH when `$srcdir' = `.'.
-++ # Shell code in configure.ac might set extrasub.
-++ # FIXME: do we really want to maintain this feature?
-+ cat >>$CONFIG_STATUS <<_ACEOF
-+ sed "$ac_vpsub
-+ $extrasub
-diff -urNad beagle-0.2.8~/ltmain.sh beagle-0.2.8/ltmain.sh
---- beagle-0.2.8~/ltmain.sh 2006-04-23 08:57:09.000000000 +0200
-+++ beagle-0.2.8/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
+diff -urNad beagle-0.2.9~/ltmain.sh beagle-0.2.9/ltmain.sh
+--- beagle-0.2.9~/ltmain.sh 2006-04-23 08:57:09.000000000 +0200
++++ beagle-0.2.9/ltmain.sh 2006-03-11 19:49:04.000000000 +0100
@@ -43,7 +43,7 @@
PROGRAM=ltmain.sh
Modified: beagle/trunk/debian/patches/usebash.dpatch
===================================================================
--- beagle/trunk/debian/patches/usebash.dpatch 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/patches/usebash.dpatch 2006-09-02 12:27:06 UTC (rev 2689)
@@ -3,105 +3,105 @@
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Force scripts using "exec -a" to use bash
+## In those scripts using @bash@ we have also to force this so beagle don't
+## need a build dependency in bash to just get that variable set to /bin/bash
@DPATCH@
-diff -urNad beagle-0.2.1~/beagled/beagled.in beagle-0.2.1/beagled/beagled.in
---- beagle-0.2.1~/beagled/beagled.in 2005-12-06 22:17:29.000000000 +0100
-+++ beagle-0.2.1/beagled/beagled.in 2006-02-04 13:40:59.000000000 +0100
+diff -urNad beagle-0.2.9~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.9/ImLogViewer/beagle-imlogviewer.in
+--- beagle-0.2.9~/ImLogViewer/beagle-imlogviewer.in 2006-08-31 21:49:51.000000000 +0200
++++ beagle-0.2.9/ImLogViewer/beagle-imlogviewer.in 2006-09-02 13:28:03.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
-+#!/bin/bash
++#! /bin/bash
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
- echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/beagled/beagled-index-helper.in beagle-0.2.1/beagled/beagled-index-helper.in
---- beagle-0.2.1~/beagled/beagled-index-helper.in 2005-11-03 18:54:47.000000000 +0100
-+++ beagle-0.2.1/beagled/beagled-index-helper.in 2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.9~/beagled/beagled-index-helper.in beagle-0.2.9/beagled/beagled-index-helper.in
+--- beagle-0.2.9~/beagled/beagled-index-helper.in 2006-08-17 18:16:28.000000000 +0200
++++ beagle-0.2.9/beagled/beagled-index-helper.in 2006-09-02 13:27:05.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#! /bin/bash
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
- echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/ImLogViewer/beagle-imlogviewer.in beagle-0.2.1/ImLogViewer/beagle-imlogviewer.in
---- beagle-0.2.1~/ImLogViewer/beagle-imlogviewer.in 2005-01-25 21:13:58.000000000 +0100
-+++ beagle-0.2.1/ImLogViewer/beagle-imlogviewer.in 2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.9~/beagled/beagled.in beagle-0.2.9/beagled/beagled.in
+--- beagle-0.2.9~/beagled/beagled.in 2006-08-17 18:16:28.000000000 +0200
++++ beagle-0.2.9/beagled/beagled.in 2006-09-02 13:27:05.000000000 +0200
@@ -1,4 +1,4 @@
--#!/bin/sh
+-#!@bash@
+#!/bin/bash
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
- echo "*** Running uninstalled @target@ ***"
-diff -urNad beagle-0.2.1~/tools/beagle-index-info beagle-0.2.1/tools/beagle-index-info
---- beagle-0.2.1~/tools/beagle-index-info 2005-05-16 18:05:53.000000000 +0200
-+++ beagle-0.2.1/tools/beagle-index-info 2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.9~/beagled/wrapper.in beagle-0.2.9/beagled/wrapper.in
+--- beagle-0.2.9~/beagled/wrapper.in 2006-08-17 18:16:28.000000000 +0200
++++ beagle-0.2.9/beagled/wrapper.in 2006-09-02 13:27:06.000000000 +0200
@@ -1,4 +1,4 @@
--#!/bin/sh
+-#!@bash@
+#!/bin/bash
- if [ -x "./beagle-info" ]; then
- CMD="./beagle-info"
-diff -urNad beagle-0.2.1~/tools/beagle-ping beagle-0.2.1/tools/beagle-ping
---- beagle-0.2.1~/tools/beagle-ping 2005-05-16 18:05:53.000000000 +0200
-+++ beagle-0.2.1/tools/beagle-ping 2006-02-04 13:40:59.000000000 +0100
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.9~/bludgeon/bludgeon.in beagle-0.2.9/bludgeon/bludgeon.in
+--- beagle-0.2.9~/bludgeon/bludgeon.in 2006-08-17 18:16:29.000000000 +0200
++++ beagle-0.2.9/bludgeon/bludgeon.in 2006-09-02 13:27:07.000000000 +0200
@@ -1,4 +1,4 @@
--#!/bin/sh
+-#!@bash@
+#!/bin/bash
- if [ -x "./beagle-info" ]; then
- CMD="./beagle-info"
---- beagle-0.2.1~/tools/beagle-crawl-system.in.old 2006-07-30 11:30:09.823268500 +0200
-+++ beagle-0.2.1/tools/beagle-crawl-system.in 2006-07-30 11:30:17.831769000 +0200
+ if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
+ echo "*** Running uninstalled @target@ ***"
+diff -urNad beagle-0.2.9~/search/beagle-search.in beagle-0.2.9/search/beagle-search.in
+--- beagle-0.2.9~/search/beagle-search.in 2006-08-31 21:49:52.000000000 +0200
++++ beagle-0.2.9/search/beagle-search.in 2006-09-02 13:27:49.000000000 +0200
@@ -1,4 +1,4 @@
+-#!@bash@
++#! /bin/bash
+
+ # This line will be automatically uncommented when you "make install"
+ #installed=1
+diff -urNad beagle-0.2.9~/tools/beagle-crawl-system.in beagle-0.2.9/tools/beagle-crawl-system.in
+--- beagle-0.2.9~/tools/beagle-crawl-system.in 2006-06-19 19:54:27.000000000 +0200
++++ beagle-0.2.9/tools/beagle-crawl-system.in 2006-09-02 13:27:06.000000000 +0200
+@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
#
# beagle-crawl-system
---- beagle-0.2.1~/tools/beagle-status.old 2006-07-30 11:31:15.079346750 +0200
-+++ beagle-0.2.1/tools/beagle-status 2006-07-30 11:31:26.100035500 +0200
+diff -urNad beagle-0.2.9~/tools/beagle-index-info beagle-0.2.9/tools/beagle-index-info
+--- beagle-0.2.9~/tools/beagle-index-info 2006-04-07 18:16:02.000000000 +0200
++++ beagle-0.2.9/tools/beagle-index-info 2006-09-02 13:27:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
---- beagle-0.2.1~/search/beagle-search.in.old 2006-07-30 11:31:45.485247000 +0200
-+++ beagle-0.2.1/search/beagle-search.in 2006-07-30 11:31:50.973590000 +0200
+diff -urNad beagle-0.2.9~/tools/beagle-ping beagle-0.2.9/tools/beagle-ping
+--- beagle-0.2.9~/tools/beagle-ping 2006-04-07 18:16:02.000000000 +0200
++++ beagle-0.2.9/tools/beagle-ping 2006-09-02 13:27:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
-@@ -21,4 +21,4 @@
- echo "*** Using mono runtime at $BEAGLE_MONO_RUNTIME ***"
- fi
-
--exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
-\ Kein Zeilenumbruch am Dateiende.
-+exec -a beagle-search $BEAGLE_MONO_RUNTIME --debug $MONO_EXTRA_ARGS $THIS_EXE "$@"
---- beagle-0.2.1~/beagled/wrapper.in.old 2006-07-30 11:33:35.032093250 +0200
-+++ beagle-0.2.1/beagled/wrapper.in 2006-07-30 11:33:43.676633500 +0200
-@@ -1,4 +1,4 @@
--#!@bash@
+diff -urNad beagle-0.2.9~/tools/beagle-status beagle-0.2.9/tools/beagle-status
+--- beagle-0.2.9~/tools/beagle-status 2006-09-02 13:27:05.000000000 +0200
++++ beagle-0.2.9/tools/beagle-status 2006-09-02 13:27:06.000000000 +0200
+@@ -1,3 +1,3 @@
+-#!/bin/sh
+#!/bin/bash
- # This line will be automatically uncommented when you "make install"
- #installed=1
---- beagle-0.2.1~/tools/wrapper.in.old 2006-07-30 11:34:19.922898750 +0200
-+++ beagle-0.2.1/tools/wrapper.in 2006-07-30 11:34:27.687384000 +0200
+ watch -n 5 beagle-info --status
+diff -urNad beagle-0.2.9~/tools/wrapper.in beagle-0.2.9/tools/wrapper.in
+--- beagle-0.2.9~/tools/wrapper.in 2006-08-17 18:16:31.000000000 +0200
++++ beagle-0.2.9/tools/wrapper.in 2006-09-02 13:27:06.000000000 +0200
@@ -1,4 +1,4 @@
-#!@bash@
+#!/bin/bash
# This line will be automatically uncommented when you "make install"
#installed=1
---- beagle-0.2.1~/bludgeon/bludgeon.in.old 2006-07-30 11:34:47.420617250 +0200
-+++ beagle-0.2.1/bludgeon/bludgeon.in 2006-07-30 11:34:54.713073000 +0200
-@@ -1,4 +1,4 @@
--#!@bash@
-+#!/bin/bash
-
- if [ -e ./@target@ ] && [ -e ./Makefile.am ] ; then
- echo "*** Running uninstalled @target@ ***"
Modified: beagle/trunk/debian/rules
===================================================================
--- beagle/trunk/debian/rules 2006-08-27 14:03:59 UTC (rev 2688)
+++ beagle/trunk/debian/rules 2006-09-02 12:27:06 UTC (rev 2689)
@@ -92,7 +92,7 @@
dh_installdirs -i
dh_install -i --sourcedir=debian/tmp
- mv debian/beagle/usr/lib/beagle/Backends debian/beagle-backend-evolution/usr/lib/beagle
+ mv debian/beagle/usr/lib/beagle/Backends/Evolution* debian/beagle-backend-evolution/usr/lib/beagle/Backends/
binary-indep: build install
More information about the Pkg-mono-svn-commits
mailing list