--- evolution-2.28.3.orig/debian/evolution.manpages
+++ evolution-2.28.3/debian/evolution.manpages
@@ -0,0 +1,3 @@
+debian/evolution.1
+debian/evolution-addressbook-export.1
+debian/csv2vcard.1
--- evolution-2.28.3.orig/debian/evolution-alarm-notify.desktop.in
+++ evolution-2.28.3/debian/evolution-alarm-notify.desktop.in
@@ -0,0 +1,10 @@
+[Desktop Entry]
+_Name=Evolution Alarm Notifier
+_Comment=Ensures that alarms set in Evolution go off at the appropriate time
+Icon=stock_alarm
+Exec=/usr/lib/evolution/2.28/evolution-alarm-notify
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+Categories=
+X-GNOME-Autostart-Delay=30
--- evolution-2.28.3.orig/debian/evolution-addressbook-export.1
+++ evolution-2.28.3/debian/evolution-addressbook-export.1
@@ -0,0 +1,50 @@
+.TH EVOLUTION-ADDRESSBOOK-EXPORT 1 2006\-05\-13 "GNOME" "GNOME"
+.SH NAME
+evolution-addressbook-export \- export addressbook content from Evoluion
+.SH SYNOPSIS
+.B evolution-addressbook-export
+.RI [ OPTIONS ] " " [ ADDRESSBOOK ]
+.SH DESCRIPTION
+Export the entire contents of the Evolution address book with ID
+.I ADDRESSBOOK
+, or the default address book if none is given. Available address book
+IDs can be listed with the \-l option.  Supported export formats are
+vCard and CSV.
+.SH OPTIONS
+.TP
+.BR \-? ", " \-\-help
+Show a help message listing all the options and their meanings.
+.TP
+.B \-\-usage
+Show a brief help message listing the names of the options only.
+.TP
+.BI \-\-output= OUTPUTFILE
+.RI "Use " OUTPUTFILE "as output file for exported data. Defaults to standard out."
+.TP
+.BR \-l ", " \-\-list\-addressbook\-folders
+Export a comma-separated list of address book IDs, names and number of
+entries instead of address book contents.
+.TP
+.BI \-\-format= FORMAT
+.RI "Specify the output format. " FORMAT " must be either `vcard' or `csv'."
+The default format is vCard.
+.TP
+.BR \-a ", " \-\-async
+.RI "Export in asynchronous mode. " OUTPUTFILE " must be set and will be the prefix for the output files."
+.TP
+.BI \-\-size= NUMBER
+.RI "Export " NUMBER " entries to each output file. The default is 100."
+This option is only valid in asynchronous mode.
+.PP
+In addition, the usual Bonobo activation and GNOME command line options apply.
+See the output of \-\-help for details.
+.SH "SEE ALSO"
+.BR evolution (1)
+.SH AUTHOR
+Gilbert Fang <gilbert.fang@sun.com>
+.PP
+This manual page was originally written by Oystein Gisnas for the
+Debian system.
+.\" Copyright 2006 �ystein Gisn�s
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
--- evolution-2.28.3.orig/debian/evolution.gconf-defaults
+++ evolution-2.28.3/debian/evolution.gconf-defaults
@@ -0,0 +1 @@
+/apps/evolution/shell/skip_warning_dialog	true
--- evolution-2.28.3.orig/debian/evolution-common.install
+++ evolution-2.28.3/debian/evolution-common.install
@@ -0,0 +1,10 @@
+debian/tmp/usr/share/applications
+debian/tmp/usr/share/mime-info
+debian/tmp/usr/share/evolution
+debian/tmp/usr/share/gnome-pilot
+debian/tmp/usr/share/icons/hicolor
+debian/tmp/usr/share/locale
+debian/tmp/usr/share/gnome
+debian/tmp/usr/share/omf
+debian/lintian/evolution-common usr/share/lintian/overrides/
+widgets/e-timezone-dialog/e-timezone-dialog-1024x600.glade usr/share/evolution/2.28/glade/
--- evolution-2.28.3.orig/debian/evolution.xpm
+++ evolution-2.28.3/debian/evolution.xpm
@@ -0,0 +1,198 @@
+/* XPM */
+static char * evolution_xpm[] = {
+"24 24 171 2",
+"  	c None",
+". 	c #888A85",
+"+ 	c #ABACA9",
+"@ 	c #FFFFFF",
+"# 	c #EDEDED",
+"$ 	c #EBEBEB",
+"% 	c #E9E9E9",
+"& 	c #E8E8E8",
+"* 	c #E6E6E6",
+"= 	c #E4E4E4",
+"- 	c #E2E2E2",
+"; 	c #E1E1E1",
+"> 	c #E0E0E0",
+", 	c #DDDDDD",
+"' 	c #DBDBDB",
+") 	c #DADADA",
+"! 	c #E7E7E7",
+"~ 	c #DEDEDE",
+"{ 	c #DCDCDC",
+"] 	c #D9D9D9",
+"^ 	c #D7D7D7",
+"/ 	c #D5D5D5",
+"( 	c #E5E5E5",
+"_ 	c #E3E3E3",
+": 	c #D8D8D8",
+"< 	c #D3D3D3",
+"[ 	c #B0B1AF",
+"} 	c #A6A7A5",
+"| 	c #D2D2D2",
+"1 	c #C9CAC9",
+"2 	c #B8B9B7",
+"3 	c #B2B2B1",
+"4 	c #C0C1BF",
+"5 	c #D0D0CF",
+"6 	c #FAFAFA",
+"7 	c #F5F5F5",
+"8 	c #B0B0AF",
+"9 	c #ACADAA",
+"0 	c #CDCECC",
+"a 	c #C5C5C4",
+"b 	c #C0C0BF",
+"c 	c #B4B4B3",
+"d 	c #BBBBBA",
+"e 	c #CBCBCA",
+"f 	c #F7F7F7",
+"g 	c #FDFDFD",
+"h 	c #FBFBFB",
+"i 	c #F8F8F8",
+"j 	c #C8C8C8",
+"k 	c #C7C7C6",
+"l 	c #E2E4E2",
+"m 	c #F4F4F4",
+"n 	c #FCFCFC",
+"o 	c #F6F6F6",
+"p 	c #F0F0F1",
+"q 	c #917E9B",
+"r 	c #7D6086",
+"s 	c #76527C",
+"t 	c #7B5D84",
+"u 	c #9885A1",
+"v 	c #878984",
+"w 	c #D8DAD8",
+"x 	c #D9DAD9",
+"y 	c #F3F3F3",
+"z 	c #F2F2F2",
+"A 	c #C4BDC9",
+"B 	c #7D5F86",
+"C 	c #B090B1",
+"D 	c #D6B9D3",
+"E 	c #DCC0D9",
+"F 	c #75577E",
+"G 	c #F1F1F1",
+"H 	c #B7B9B6",
+"I 	c #E0E0DF",
+"J 	c #F0F0F0",
+"K 	c #EFEFEF",
+"L 	c #EEEEEE",
+"M 	c #E3E3E5",
+"N 	c #7C5F86",
+"O 	c #C7AAC6",
+"P 	c #CFBDD0",
+"Q 	c #D2CFD0",
+"R 	c #D3D2D1",
+"S 	c #E5E5E4",
+"T 	c #DBD8DA",
+"U 	c #CDBACD",
+"V 	c #75557E",
+"W 	c #E8E9E8",
+"X 	c #ABAEAA",
+"Y 	c #D1D2D0",
+"Z 	c #C8C9C7",
+"` 	c #82708E",
+" .	c #D0BDD0",
+"..	c #F2F2F0",
+"+.	c #9E9E9D",
+"@.	c #F1F1EF",
+"#.	c #F4F4F2",
+"$.	c #EFEFED",
+"%.	c #E7E7E5",
+"&.	c #CEBBCF",
+"*.	c #6F567B",
+"=.	c #DDDEDD",
+"-.	c #A9AAA7",
+";.	c #795B82",
+">.	c #EAE7E8",
+",.	c #F5F5F3",
+"'.	c #EDEDEB",
+").	c #A9A9A8",
+"!.	c #F6F6F4",
+"~.	c #F0F0EE",
+"{.	c #EAEAE8",
+"].	c #DDDADC",
+"^.	c #75567E",
+"/.	c #ECECEC",
+"(.	c #C4C6C3",
+"_.	c #A9ACA8",
+":.	c #DCDBDF",
+"<.	c #75527C",
+"[.	c #D3D2D2",
+"}.	c #F3F3F1",
+"|.	c #F7F7F5",
+"1.	c #868686",
+"2.	c #B7B7B6",
+"3.	c #E2E2E0",
+"4.	c #C1C1C0",
+"5.	c #75517B",
+"6.	c #C0C2BF",
+"7.	c #CCCECB",
+"8.	c #D3D2D6",
+"9.	c #DAD9D8",
+"0.	c #E6E6E4",
+"a.	c #787878",
+"b.	c #C2C2C1",
+"c.	c #EBEBE9",
+"d.	c #E4E4E2",
+"e.	c #CCCBCA",
+"f.	c #EAEAEA",
+"g.	c #C5C7C4",
+"h.	c #785A81",
+"i.	c #E2DFE0",
+"j.	c #6D6D6C",
+"k.	c #D2D2D0",
+"l.	c #E3E3E1",
+"m.	c #DDDBDE",
+"n.	c #74557D",
+"o.	c #E5E6E5",
+"p.	c #826F8D",
+"q.	c #D1BED0",
+"r.	c #DADAD8",
+"s.	c #DEDEDC",
+"t.	c #CFBCD0",
+"u.	c #6E557A",
+"v.	c #F4F3F5",
+"w.	c #D1BED1",
+"x.	c #DCD9DA",
+"y.	c #B3B3B1",
+"z.	c #D1D0CF",
+"A.	c #DCD9DB",
+"B.	c #CEBBCE",
+"C.	c #73547C",
+"D.	c #838580",
+"E.	c #858782",
+"F.	c #746F77",
+"G.	c #74567D",
+"H.	c #73547B",
+"I.	c #604A6B",
+"J.	c #72537B",
+"K.	c #74517B",
+"L.	c #74507B",
+"M.	c #715279",
+"N.	c #5E4667",
+"                                                ",
+"                  . . . . .                     ",
+"                + @ @ @ @ @ .                   ",
+"              . @ # # $ % & @ .                 ",
+"            . @ # $ % * = - ; @ .               ",
+"          . @ $ % * = - > , ' ) @ .             ",
+"        . @ % ! = - > ~ { ] ^ / / @ .           ",
+"      . @ ! ( _ ; ~ { ) : / < [ } | @ .         ",
+"    . @ 1 _ ; ~ { ) : 2 3 4 5 6 7 8 9 @ .       ",
+"    . @ 0 a { b c d e f g h i i i j k @ .       ",
+"    . @ l b a m n h i o o p q r s s t u v       ",
+"    . @ 7 w x o 7 m y z A B C D E E D C F       ",
+"    . @ y G H I J K L M N O P Q R S T U O V     ",
+"    . @ G G W X Y Z Z ` C  ...+.@.#.$.%.&.C *.  ",
+"    . @ K K L =.-.. v ;.D >.,.'.).!.~.{.].D ^.  ",
+"    . @ # # /.(._.o :.<.E [.}.|.1.2.$.3.4.E 5.  ",
+"    . @ $ $ 6.7.y & 8.<.E 9.$.0.a.b.c.d.e.E 5.  ",
+"    . @ f.g.m /.! * ( h.D i.{.j.k.{.%.l.m.D n.  ",
+"    . @ o.m ! * * ( ( p.C q.l.r.s.d.3.s.t.C u.  ",
+"    . @ @ @ @ @ @ @ @ v.h.O w.x.y.z.A.B.O C.    ",
+"    D.. . . . . . . . E.F.G.C D E E D C H.      ",
+"                            I.J.K.L.M.N.        ",
+"                                                ",
+"                                                "};
--- evolution-2.28.3.orig/debian/csv2vcard.1
+++ evolution-2.28.3/debian/csv2vcard.1
@@ -0,0 +1,19 @@
+.TH CSV2VCARD 1 2006\-05\-13 "GNOME" "GNOME"
+.SH NAME
+csv2vcard \- Convert a CSV-formatted list of contacts to vCards
+.SH SYNOPSIS
+.B csv2vcard
+.I INFILE OUTFILE
+.SH DESCRIPTION
+Takes the CSV-formatted list of contacts from Outlook and attempts to
+convert it into a list of vCards suitable for import into Evolution.
+.SH "SEE ALSO"
+.BR evolution (1)
+.SH AUTHOR
+Michael MacDonald <mjmac@ximian.com>
+.PP
+This manual page was originally written by Oystein Gisnas for the
+Debian system.
+.\" Copyright 2006 �ystein Gisn�s
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
--- evolution-2.28.3.orig/debian/evolution-plugins.install
+++ evolution-2.28.3/debian/evolution-plugins.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/evolution/2.28/plugins/*{attachment-reminder,audio-inline,bbdb,email-custom-header,subject-thread,save-calendar,template,select-one-source,copy-tool,mail-to-task,mailing-list-actions,mail-notification,default-mailer,mail-attachments-import-ics,prefer-plain,backup-restore,vcard-inline,pst-import}*.{so,eplug,xml,glade}
+debian/lintian/evolution-plugins usr/share/lintian/overrides/
--- evolution-2.28.3.orig/debian/evolution-plugins-experimental.install
+++ evolution-2.28.3/debian/evolution-plugins-experimental.install
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/evolution/2.28/plugins/*{face,folder-unsubscribe,mail-to-meeting,save-attachments,external-editor,tnef-attachments}*.{so,eplug,xml} 
+debian/lintian/evolution-plugins-experimental usr/share/lintian/overrides/
+
--- evolution-2.28.3.orig/debian/evolution.menu
+++ evolution-2.28.3/debian/evolution.menu
@@ -0,0 +1,3 @@
+?package(evolution):needs="X11" section="Applications/Network/Communication" \
+  title="Evolution" command="/usr/bin/evolution" \
+  hints="Gnome,Mail,Calendar" icon="/usr/share/pixmaps/evolution.xpm"
--- evolution-2.28.3.orig/debian/watch
+++ evolution-2.28.3/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://ftp.gnome.org/pub/GNOME/sources/evolution/([\d\.]+)[02468]/evolution-([\d\.]+)\.tar\.gz	debian	uupdate
--- evolution-2.28.3.orig/debian/evolution-dev.install
+++ evolution-2.28.3/debian/evolution-dev.install
@@ -0,0 +1,26 @@
+debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/include
+debian/tmp/usr/share/idl
+debian/tmp/usr/lib/evolution/*/libeabutil.so
+debian/tmp/usr/lib/evolution/*/libeconduit.so
+debian/tmp/usr/lib/evolution/*/libecontacteditor.so
+debian/tmp/usr/lib/evolution/*/libecontactlisteditor.so
+debian/tmp/usr/lib/evolution/*/libefilterbar.so
+debian/tmp/usr/lib/evolution/*/libemiscwidgets.so
+debian/tmp/usr/lib/evolution/*/libeshell.so
+debian/tmp/usr/lib/evolution/*/libessmime.so
+debian/tmp/usr/lib/evolution/*/libetable.so
+debian/tmp/usr/lib/evolution/*/libetext.so
+debian/tmp/usr/lib/evolution/*/libetimezonedialog.so
+debian/tmp/usr/lib/evolution/*/libeutil.so
+debian/tmp/usr/lib/evolution/*/libevolution-a11y.so
+debian/tmp/usr/lib/evolution/*/libevolution-addressbook-a11y.so
+debian/tmp/usr/lib/evolution/*/libevolution-addressbook-importers.so
+debian/tmp/usr/lib/evolution/*/libevolution-calendar-a11y.so
+debian/tmp/usr/lib/evolution/*/libevolution-calendar-importers.so
+debian/tmp/usr/lib/evolution/*/libevolution-mail-importers.so
+debian/tmp/usr/lib/evolution/*/libevolution-mail-shared.so
+debian/tmp/usr/lib/evolution/*/libevolution-smime.so
+debian/tmp/usr/lib/evolution/*/libevolution-widgets-a11y.so
+debian/tmp/usr/lib/evolution/*/libfilter.so
+debian/tmp/usr/lib/evolution/*/libmenus.so
--- evolution-2.28.3.orig/debian/rules
+++ evolution-2.28.3/debian/rules
@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+LDFLAGS=$(shell echo $$LDFLAGS | sed -e 's/-Wl,-Bsymbolic-functions//')
+export LDFLAGS
+
+include /usr/share/cdbs/1/rules/buildvars.mk
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/cdbs/1/rules/utils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
+
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | grep ^Version | sed -ne 's/^Version: //g' -e 's/-[^-]*$$//pg')
+
+
+ELIBDIR := usr/lib/evolution/2.28
+
+DEB_SHLIBDEPS_INCLUDE := debian/evolution/$(ELIBDIR)
+DEB_DH_MAKESHLIBS_ARGS_evolution += -V'evolution (>= ${UPSTREAM_VERSION})' --noscripts -X $(ELIBDIR)/components
+DEB_DH_MAKESHLIBS_ARGS_ALL += --noscripts -X $(ELIBDIR)/plugins
+
+
+CFLAGS += -fPIC
+
+DEB_CONFIGURE_EXTRA_FLAGS += \
+	--with-openldap \
+	--enable-nls \
+	--without-openssl-includes \
+	--without-openssl-libs \
+	--disable-scrollkeeper \
+	--enable-pilot-conduits \
+	--enable-cairo-calendar \
+	--enable-exchange=yes \
+	--enable-python \
+	--without-krb4 \
+	--with-krb5=/usr \
+	--enable-ipv6 \
+	--disable-openssl \
+	--sysconfdir=/etc \
+	--enable-nntp \
+	--libexecdir=/usr/lib \
+	--enable-plugins=experimental
+
+ifneq ($(DEB_HOST_ARCH_OS),linux)
+DEB_CONFIGURE_EXTRA_FLAGS += --disable-nm
+endif
+
+clean::
+	find -name '*.schemas' | xargs rm -f
--- evolution-2.28.3.orig/debian/evolution.install
+++ evolution-2.28.3/debian/evolution.install
@@ -0,0 +1,18 @@
+debian/tmp/etc/gconf
+debian/tmp/usr/lib/evolution/2.28/*.so.*
+debian/tmp/usr/lib/evolution/2.28/components/*.so
+debian/tmp/usr/lib/evolution/2.28/conduits/*.so
+debian/tmp/usr/lib/evolution/2.28/csv2vcard
+debian/tmp/usr/lib/evolution/2.28/killev
+debian/tmp/usr/lib/evolution/2.28/evolution-addressbook-export
+debian/tmp/usr/lib/evolution/2.28/evolution-addressbook-clean
+debian/tmp/usr/lib/evolution/2.28/evolution-alarm-notify
+debian/tmp/usr/lib/evolution/2.28/evolution-backup
+debian/tmp/usr/lib/evolution/2.28/libevolution-cal-shared.so
+debian/tmp/usr/bin
+debian/tmp/usr/lib/bonobo
+debian/tmp/usr/lib/evolution/2.28/plugins/*{calendar-file,calendar-http,calendar-weather,itip-formatter,plugin-manager,default-source,addressbook-file,python,startup-wizard,mark-all-read,groupwise-features,compose-send-options,gw-account-setup,gnome-evolution-webdav,mail-account-disable,publish-calendar,caldav,imap-features,google,sa-junk-plugin,bogo-junk-plugin,exchange,folder-permissions,folder-subscription}*.{so,eplug,xml,glade}
+debian/evolution-2.2.desktop usr/share/applications
+debian/evolution-alarm-notify.desktop etc/xdg/autostart
+debian/evolution.xpm usr/share/pixmaps/
+
--- evolution-2.28.3.orig/debian/evolution-alarm-notify.desktop
+++ evolution-2.28.3/debian/evolution-alarm-notify.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Evolution Alarm Notifier
+Comment=Ensures that alarms set in Evolution go off at the appropriate time
+Icon=stock_alarm
+Exec=/usr/lib/evolution/2.28/evolution-alarm-notify
+Terminal=false
+Type=Application
+OnlyShowIn=GNOME;
+Categories=
+X-GNOME-Autostart-Delay=30
--- evolution-2.28.3.orig/debian/evolution.links
+++ evolution-2.28.3/debian/evolution.links
@@ -0,0 +1,3 @@
+/usr/lib/evolution/2.28/csv2vcard /usr/bin/csv2vcard
+/usr/lib/evolution/2.28/evolution-addressbook-export /usr/bin/evolution-addressbook-export
+/usr/share/man/man1/evolution.1.gz /usr/share/man/man1/evolution-2.28.1.gz
--- evolution-2.28.3.orig/debian/evolution.1
+++ evolution-2.28.3/debian/evolution.1
@@ -0,0 +1,69 @@
+.TH EVOLUTION 1 2004\-11\-06 "GNOME" "GNOME"
+.SH NAME
+evolution \- groupware suite for GNOME containing e\-mail, calendar,
+addressbook, to-do list and memo tools
+.SH SYNOPSIS
+.B evolution
+.RI [ OPTIONS ] " " [ MAILTO ]
+.SH DESCRIPTION
+This manual page briefly introduces the 
+.B evolution
+command.  Evolution is a graphical groupware suite, a single
+application for reading and sending e\-mail and for managing
+calendars, address books, notes, to-do lists and memos.  It is written
+for the GNOME graphical desktop.
+.PP
+.RI "An optional " MAILTO " expression can be specified, typically"
+.RI "invoked from another application. An example " MAILTO " expression"
+is `mailto:username@example.com`. This will open a new composer window
+with an empty e-mail to `username@example.com`. More advanced expressions
+are also suppported, but should conform to RFC 2368.
+.PP
+For a more detailed explanation of Evolution, please see the Help menu.
+.SH OPTIONS
+.TP
+.B \-?,  \-\-help
+Show a help message listing all the options and their meanings.
+.TP
+.B \-\-usage
+Show a brief help message listing the names of the options only.
+.TP
+.BI "\-c, \-\-component=" COMPONENT
+Start Evolution by activating the desired component.
+.I COMPONENT
+is one of `mail', `calendar', `contacts', `tasks', `memos'.
+.TP
+.B \-\-offline
+Start in offline mode.
+.TP
+.BR \-\-online
+Start in online mode.
+.TP
+.B \-\-force\-shutdown
+Forcibly shut down all Evolution components.
+.TP
+.B \-\-force\-migrate
+Forcibly re-migrate from Evolution 1.4.
+.TP
+.BI \-\-debug= FILE
+.RI "Send the debugging output of all components to " FILE "."
+.TP
+.B \-\-disable-eplugin
+Disable loading of any plugins.
+.PP
+In addition, the usual GTK+ and GNOME command line options apply.
+See the output of \-\-help for details.
+.SH "SEE ALSO"
+http://www.novell.com/products/evolution/
+.SH AUTHOR
+Evolution was originally developed by the company Ximian, now a part
+of Novell.
+Evolution is now part of GNOME, and many people have touched the code.
+See the "About" item in the "Help" menu for a list.
+.PP
+This manual page was originally written by Lars Wirzenius for the
+Debian system.
+.\" Copyright 2004 Lars Wirzenius
+.\" You may copy this manual page under the terms of the version 2 of
+.\" the GNU General Public License.
+.\" Updated by Oystein Gisnas
--- evolution-2.28.3.orig/debian/evolution-2.2.desktop
+++ evolution-2.28.3/debian/evolution-2.2.desktop
@@ -0,0 +1,117 @@
+[Desktop Entry]
+Name=Evolution
+Name[ar]=افُليوشِن
+Name[az]=Evolution
+Name[be]="Эвалюцыя"
+Name[bg]=Evolution
+Name[bn]=Evolution
+Name[ca]=Evolution
+Name[cs]=Evolution
+Name[cy]=Evolution
+Name[da]=Evolution
+Name[de]=Evolution
+Name[el]=Evolution
+Name[en_CA]=Evolution
+Name[en_GB]=Evolution
+Name[es]=Evolution
+Name[et]=Evolution
+Name[eu]=Evolution
+Name[fa]=Evolution
+Name[fi]=Evolution
+Name[fr]=Evolution
+Name[ga]=Evolution
+Name[gl]=Evolution
+Name[gu]=ઈવોલ્યુશન
+Name[hr]=Evolution
+Name[hu]=Evolution
+Name[id]=Evolution
+Name[it]=Evolution
+Name[ja]=Evolution
+Name[ko]=Evolution
+Name[lt]=Evolution
+Name[lv]=Evolution
+Name[mn]=Эволюшин
+Name[ms]=Evolution
+Name[nb]=Evolution
+Name[ne]=इभुलोसन
+Name[nl]=Evolution
+Name[nn]=Evolution
+Name[no]=Evolution
+Name[pa]=ਈਵੇਲੂਸ਼ਨ
+Name[pl]=Evolution
+Name[pt]=Evolution
+Name[pt_BR]=Evolution
+Name[ro]=Evolution
+Name[ru]=Evolution
+Name[rw]=Impinduka
+Name[sk]=Evolution
+Name[sl]=Evolucija
+Name[sq]=Evolution
+Name[sr]=Еволуција
+Name[sr@Latn]=Evolucija
+Name[sv]=Evolution
+Name[th]=Evolution
+Name[tr]=Evolution
+Name[uk]=Evolution
+Name[vi]=Evolution
+Name[wa]=Evolution
+Name[xh]=I-Evolution
+Name[zh_CN]=Evolution
+Name[zh_TW]=Evolution
+Comment=Manage email, calendar, contacts and tasks
+Comment[bg]=Програма за работа в група Evolution
+Comment[bn]=Evolution Groupware Suite
+Comment[ca]=El paquet d'aplicacions de treball en grup Evolution
+Comment[cs]=Sada nástrojů pro skupinovou spolupráci Evolution
+Comment[cy]=Cyfres Meddalwedd Grŵp Evolution
+Comment[da]=Samarbejdsprogrammellet Evolution
+Comment[de]=Die Groupware-Suite Evolution
+Comment[el]=Η σουίτα εφαρμογών του Evolution 
+Comment[en_CA]=The Evolution Groupware Suite
+Comment[en_GB]=The Evolution Groupware Suite
+Comment[es]=La suite de trabajo en grupo Evolution
+Comment[et]=Evolution grupitarkvarakomplekt
+Comment[eu]=Evolution-en talde-lanerako suitea
+Comment[fi]=Evolution työryhmäohjelmisto
+Comment[fr]=La suite de travail collaboratif Evolution
+Comment[gu]=ઈવોલ્યુશન ગ્રુપવેર સેવા
+Comment[hu]=Az Evolution csoportmunka-programcsomag
+Comment[id]=The Evolution Groupware Suite
+Comment[it]=La suite Evolution per il groupware
+Comment[ja]=Evolution グループウェア・スイートです
+Comment[ko]=Evolution 그룹웨어 모음
+Comment[lt]=Evolution grupinio darbo rinkinys
+Comment[ms]=Sut perisian kumpulan Evolution
+Comment[nb]=Gruppevaresuiten Evolution
+Comment[ne]=इभोलुसन ग्रुपवेर सुट
+Comment[nl]=De Evolution Groupware suite
+Comment[nn]=Pakka Evolution Groupware
+Comment[no]=Gruppevaresuiten Evolution
+Comment[pa]=ਈਵੇਲੂਸ਼ਨ ਸਮੂਹਵੇਅਰ ਸਰੂਪ
+Comment[pl]=Pakiet do pracy grupowej Evolution
+Comment[pt]=O Pacote de Colaboração Evolution
+Comment[pt_BR]=O Conjunto de Aplicações para Grupos de Trabalho Evolution
+Comment[ro]=Suita Groupware Evolution
+Comment[ru]=Набор приложений групповой работы Evolution
+Comment[sq]=Suite Groupware e Evolution.
+Comment[sr]=Пакет програма Еволуција
+Comment[sr@Latn]=Paket programa Evolucija
+Comment[sv]=Grupprogramvarusviten Evolution
+Comment[th]=ชุดกรุ๊ปแวร์ Evolution
+Comment[tr]=Evolution Groupware Programları
+Comment[uk]=Набір програм для групової роботи Evolution
+Comment[vi]=Bộ phần mềm nhóm Evolution
+Comment[xh]=I-Groupware Suite ye-Evolution
+Comment[zh_CN]=Evolution 群件套件
+Comment[zh_TW]=Evolution Groupware 套件
+Exec=evolution
+Icon=evolution
+Terminal=false
+Type=Application
+Categories=GNOME;Office;X-Red-Hat-Base;
+NoDisplay=true
+StartupNotify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=Evolution
+X-GNOME-Bugzilla-Version=2.27.x
+X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-2.28;evolution-exchange-storage;evolution-alarm-notify;
--- evolution-2.28.3.orig/debian/control
+++ evolution-2.28.3/debian/control
@@ -0,0 +1,256 @@
+Source: evolution
+Section: gnome
+Priority: optional
+Maintainer: Debian Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Evolution Maintainers <pkg-evolution-maintainers@lists.alioth.debian.org>
+Uploaders: Jordi Mallach <jordi@debian.org>, 
+           Margarita Manterola <debian@marga.com.ar>,
+           Loic Minier <lool@dooz.org>,
+           Heikki Henriksen <heikkih@gmail.com>,
+           Oystein Gisnas <oystein@gisnas.net>,
+           Pedro Fragoso <emberez@gmail.com>,
+           Yves-Alexis Perez <corsac@debian.org>
+Standards-Version: 3.8.3
+Dm-Upload-Allowed: yes
+Homepage: http://www.gnome.org/projects/evolution/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-evolution/unstable/evolution
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/evolution/ubuntu
+Build-Depends: debhelper (>= 5.0.0),
+               cdbs (>= 0.4.62+nmu1ubuntu8),
+               dpkg-dev (>= 1.14.16),
+               scrollkeeper,
+               flex,
+               bison,
+               python-dev,
+               intltool (>= 0.35.0),
+               libtool,
+               pkg-config (>= 0.16.0),
+               gnome-icon-theme (>= 2.19.92),
+               gnome-doc-utils (>= 0.3.2),
+               gtk-doc-tools (>= 0.6),
+               libatk1.0-dev,
+               libldap2-dev,
+               libgtkhtml3.14-dev (>= 3.28.0),
+               libgtkhtml-editor-dev (>= 3.28.0),
+               libgnome-pilot2-dev (>= 2.0.15),
+               libkrb5-dev,
+               libnss3-dev,
+               psmisc,
+               libglib2.0-dev (>= 2.15.3),
+               liborbit2-dev (>= 1:2.9.8),
+               libbonobo2-dev (>= 2.20.3),
+               evolution-data-server-dev (>= 2.28.3),
+               evolution-data-server-dev (<< 2.29.0),
+               libgtk2.0-dev (>= 2.12.0),
+               libbonoboui2-dev (>= 2.4.2),
+               libgnomeui-dev,
+               libglade2-dev,
+               libgnomecanvas2-dev,
+               libxml2-dev,
+               libgconf2-dev,
+               libcamel1.2-dev (>= 2.28.0),
+               libedataserver1.2-dev (>= 2.28.0),
+               libegroupwise1.2-dev (>= 2.28.0),
+               libedataserverui1.2-dev (>= 2.28.0),
+               libebackend1.2-dev (>= 2.28.0),
+               libgdata1.2-dev (>= 2.28.0),
+               libgdata-google1.2-dev (>= 2.28.0),
+               libgnome2-dev,
+               libecal1.2-dev (>= 2.28.0),
+               libebook1.2-dev (>= 2.28.0),
+               libdbus-glib-1-dev,
+               libnm-glib-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+               libnotify-dev (>= 0.3.0),
+               libsoup2.4-dev,
+               libdbus-1-dev,
+               libexchange-storage1.2-dev (>= 2.28.0),
+               libgstreamer0.10-dev,
+               libytnef0-dev,
+               automake,
+               libtool,
+               libical-dev,
+               libicu-dev,
+               libgweather-dev (>= 2.24.5),
+               libgnome-desktop-dev (>= 2.26.0),
+               sharutils,
+               shared-mime-info (>= 0.22),
+               libpst-dev (>=0.6.41),
+               liblpint-bonobo-dev
+
+Package: evolution
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         evolution-common (= ${source:Version}),
+         evolution-data-server (>= 2.28.0),
+         evolution-data-server (<< 2.29.0),
+         gnome-icon-theme (>= 2.19.91),
+         dbus
+Recommends: gnome-desktop-data,
+            evolution-plugins,
+            evolution-webcal,
+            yelp,
+            bogofilter | spamassassin
+Suggests: bug-buddy,
+          gnupg,
+          network-manager,
+          evolution-exchange,
+          evolution-dbg,
+          evolution-plugins-experimental,
+          gnome-pilot-conduits (>= 2.0.9)
+Provides: mail-reader,
+          imap-client
+Replaces: evolution-plugins (<= 2.22.2-1),
+Description: groupware suite with mail client and organizer
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ Additional features include integration with Exchange and Groupwise
+ servers, newsgroup client, LDAP support, web calendars and
+ synchronization with Palm devices.
+ .
+ Evolution is a graphical application that is part of GNOME, and
+ is distributed by Novell, Inc.
+ .
+ See http://www.novell.com/products/evolution/ for more
+ information.
+ .
+ The following plugins belonging to the "base" set are included.
+  - calendar-file
+  - calendar-http
+  - calendar-weather
+  - itip-formatter
+  - plugin-manager
+  - python
+  - default-source
+  - addressbook-file
+  - startup-wizard
+  - mark-all-read
+  - groupwise-features
+  - groupwise-account-setup
+  - mail-account-disable
+  - publish-calendar
+  - caldav
+  - imap-features
+  - google-account-setup
+  - sa-junk-plugin
+  - bogo-junk-plugin
+  - exchange-operations
+  - mono
+  - webdav-account-setup
+
+Package: evolution-common
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: evolution
+Replaces: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv
+Conflicts: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv
+Provides: evolution-documentation-en, evolution-documentation-cs, evolution-documentation-de, evolution-documentation-el, evolution-documentation-es, evolution-documentation-fr, evolution-documentation-mk, evolution-documentation-oc, evolution-documentation-ru, evolution-documentation-sv
+Description: architecture independent files for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains the architecture independent files needed
+ by the evolution package.
+
+Package: evolution-dev
+Section: devel
+Architecture: any
+Depends: evolution (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends},
+# evolution-plugin
+         libxml2-dev,
+         libcamel1.2-dev,
+         libunique-dev,
+         libgtkhtml3.14-dev,
+         libgtkhtml-editor-dev,
+         libgnomecanvas2-dev,
+# evolution-shell
+         libdbus-glib-1-dev,
+         libgconf2-dev,
+         libgnome-desktop-dev,
+         libgtk2.0-dev,
+         libedataserverui1.2-dev,
+         libglade2-dev,
+# other (to check against 2.28)
+         libebook1.2-dev,
+         libgnome2-dev,
+         libgnomeui-dev,
+         libbonoboui2-dev (>= 2.20.3)
+Description: development library files for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains header and static library files
+ for developing Evolution components.
+
+Package: evolution-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: evolution (= ${binary:Version}),
+         ${misc:Depends}
+Description: debugging symbols for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package contains unstripped binaries of evolution for
+ use in debugging.
+
+Package: evolution-plugins
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Recommends: notification-daemon
+Description: standard plugins for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package includes plugins for evolution. The plugins belong
+ to the set of "standard" plugins, which are useful, but not
+ necessary for a functioning application.
+ .
+ The following standard plugins are included.
+  - bbdb
+  - subject-thread
+  - save-calendar
+  - select-one-source
+  - copy-tool
+  - mail-to-task
+  - audio-inline
+  - mailing-list-actions
+  - default-mailer
+  - email-custom-header
+  - import-ics-attachments
+  - prefer-plain
+  - mail-notification
+  - attachment-reminder
+  - backup-restore
+  - vcard-inline
+  - pst-import
+  - templates
+  
+Package: evolution-plugins-experimental
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         evolution (= ${binary:Version}),
+Replaces: evolution-plugins (<< 2.27)
+Description: experimental plugins for Evolution
+ Evolution is a groupware suite which integrates mail, calendar,
+ address book, to-do list and memo tools.
+ .
+ This package includes plugins for Evolution. The plugins belong
+ to the set of "experimental" plugins, which are unsupported, have
+ undergone little testing, and might cause problems to the rest of
+ Evolution. Use with care.
+ .
+ The following plugins are included.
+  - face
+  - folder-unsubscribe
+  - mail-to-meeting
+  - save-attachments
+  - external-editor
+  - tnef-attachments
--- evolution-2.28.3.orig/debian/changelog
+++ evolution-2.28.3/debian/changelog
@@ -0,0 +1,2165 @@
+evolution (2.28.3-0ubuntu10) lucid-proposed; urgency=low
+
+  * add debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch,
+    92_allow_setting_alarms_on_any_meeting_2.patch,
+    93_allow_setting_alarms_on_any_meeting_3.patch:
+    - from upstream git, enable setting alarms on meeting and ungrouping
+      those actions (LP: #528557)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Tue, 08 Jun 2010 18:31:56 +0200
+
+evolution (2.28.3-0ubuntu9) lucid; urgency=low
+
+  * debian/control
+    - Remove unnecessary build dependency libgnomevfs2-dev. (LP: #562368)
+
+ -- Onkar Shinde <onkarshinde@ubuntu.com>  Tue, 13 Apr 2010 19:09:38 +0530
+
+evolution (2.28.3-0ubuntu8) lucid; urgency=low
+
+  * debian/patches/80_git_rtl_bar.patch:
+    - git change to fix rendering issue in the composer in rtl locales
+      (lp: #545459)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 01 Apr 2010 00:11:16 +0200
+
+evolution (2.28.3-0ubuntu7) lucid; urgency=low
+
+  * Bump cdbs build dependency, to ensure that we are building with a
+    langpack.mk which works with multi-section .desktop files. (LP: #535650)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Mon, 22 Mar 2010 09:14:57 +0100
+
+evolution (2.28.3-0ubuntu6) lucid; urgency=low
+
+  * No-change rebuild against a reverted CDBS.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Sat, 20 Mar 2010 18:27:47 +1100
+
+evolution (2.28.3-0ubuntu5) lucid; urgency=low
+
+  * Bump cdbs build dependency, to ensure that we are building with a
+    langpack.mk which works with multi-section .desktop files. (LP: #535650)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri, 19 Mar 2010 15:26:12 +0100
+
+evolution (2.28.3-0ubuntu4) lucid; urgency=low
+
+  * debian/patches/10_desktop_shortcuts.patch
+    - Make names translatable 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 10 Mar 2010 13:49:00 -0500
+
+evolution (2.28.3-0ubuntu3) lucid; urgency=low
+
+  * debian/patches/10_desktop_shortcuts.patch
+    Adds desktop shortcuts for the messaging menu.
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 00:08:13 -0600
+
+evolution (2.28.3-0ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - update the eds requirement to the current version
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 02 Mar 2010 00:32:25 +0100
+
+evolution (2.28.3-0ubuntu1) lucid; urgency=low
+
+  * New upstream version:
+    Bug Fixes:
+    - #601551 - [PST] evolution crashed with SIGSEGV (lp: #471852) 
+    - #554663 - Swap "Save" and "Save as Draft" accelerators in composer
+                (lp: #424416)
+    - #601787 - Double free in destroy_oof_data 
+    - #602185 - Crash after 'Show only this calendar' 
+    - #609042 - Convert quoted-printing to UTF-8 when copying to clipboard 
+    - #610124 - Autosave errors dialogues can't be dismissed 
+    - #607087 - Not all inlined text attachments are included in replies
+    - #607741 - Move folder to claims it's copying in status bar 
+    - #607458 - Fix format security warning 
+    - #603480 - [bbdb] Traverse lists in destinations properly 
+    - #602827 - Disable broken plugins automatically 
+    - #607234 - Open received attachments as read-only 
+    - #604670 - addressbook-export segfaults when specifying addressbook
+    - #605485 - Keeps search from previous folder in message list 
+    - #606449 - Empty mail-notification popups 
+    - #599794 - Set composer as not changed on reply or forward action 
+                (lp: #510529)
+    - #605600 - Meeting reminders with wrong times (lp: #242954)
+    - #565582 - Make sure the comp_data is not NULL before using it 
+                (lp: #351617)
+    - #606340 - Crash on non-utf8 letter in mail folder name 
+    - #549988 - "Empty Trash" in Trash popup empties all Trash folders
+    - #595501 - Crash on a changed mail filter action removal (lp: #452921)
+    - #599615 - i18n support for emae and filter-bar when used as lib 
+    - #250046 - Do not count Post To addresses when not shown (lp: #485831)
+  * debian/patches/90_autoconf.patch:
+    - new version update 
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 01 Mar 2010 23:30:42 +0100
+
+evolution (2.28.2-1ubuntu6) lucid; urgency=low
+
+  * debian/evolution-alarm-notify.desktop,
+    debian/evolution-alarm-notify.desktop.in:
+    - use the new X-GNOME-Autostart-Delay autostart key
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 01 Feb 2010 16:05:23 -0800
+
+evolution (2.28.2-1ubuntu5) lucid; urgency=low
+
+  * Rebuild to get the new gtkhtml shlib
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Mon, 25 Jan 2010 15:58:31 +0100
+
+evolution (2.28.2-1ubuntu4) lucid; urgency=low
+
+  * debian/control:
+    - don't recommends gnome-pilot rather suggests it, it's not used by lot 
+      of users nowadays and rather confusing (lp: #507362)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 14 Jan 2010 11:58:21 +0100
+
+evolution (2.28.2-1ubuntu3) lucid; urgency=low
+
+  * debian/control, debian/evolution-plugins-experimental.install:
+    - don't build ipodsync which upstream stopped shipping in new versions,
+      clean the libhal build-depends which was used only there (lp: #503607)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 06 Jan 2010 23:43:43 +0100
+
+evolution (2.28.2-1ubuntu2) lucid; urgency=low
+
+  * debian/control:
+    - use build-depends on libpst, python and shared-mime-info to fix build
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 17 Dec 2009 10:41:31 +0100
+
+evolution (2.28.2-1ubuntu1) lucid; urgency=low
+
+  * Resync on Debian
+  * New upstream version:
+    Bug Fixes:
+    - #271836 - Incorrect signature for "model_cell_changed" signal handler    
+    - #397265 - Image loading for new contact requires restarting Evolution    
+    - #411768 - Drag and drop header columns (lp: #344373)
+    - #468736 - Prevent recursion in em-format 
+    - #474502 - Don't check for contacts in broken address books 
+    - #551464 - Paste files into composer as attachments 
+    - #551603 - Special case "positive zero alarms" 
+    - #554779 - Removal of task due date does not sync from Palm    
+    - #555901 - Preserve Start/End/Due timezone when editing in list view    
+    - #557613 - evolution crashed with SIGSEGV in try_open_e_book_cb 
+                (lp: #287136)    
+    - #570835 - Custom e-mail headers inserted with double column    
+    - #590127 - Define ETable::vertical-spacing style property 
+    - #596027 - In Anjal, although invalid mail address warning popup, mail's
+                tab closed automatically 
+    - #596566 - Crash on quit with composer window opened (lp: #438382)
+    - #596827 - Don't remove meeting attendees after edit 
+    - #597582 - Original Date: header should be given precedence
+    - #599124 - Signature always includes an empty line in front of text
+                (lp: #456220)    
+    - #599190 - Drag and drop broken for received MIME parts (lp: #456690)
+    - #599245 - Use bitwise AND instead of logical AND for checking flags    
+    - #599627 - Crash when adding a new task in a table 
+    - #599792 - Anjal composer's Send button doesn't work after pressed Save
+                Drafts button 
+    - #599882 - Crash in em_folder_tree_select_prev_path() when wrapping to
+                bottom 
+    - #600132 - Direct print from composer fails when special characters used    
+    - #600133 - Crash on day view print preview without all day events
+                (lp: #464197)    
+    - #601202 - Evo deletes system addressbook 
+    - #601218 - Accepted meeting doesn't show attachments in calendar view    
+    - #601219 - Transient dialogs in composer window blocks main window    
+    - #601644 - Disable rename for system folders 
+    Other Changes:
+    Synchronize with attachment logic in Evolution 2.29. 
+    Improve comments: widgets/misc/e-filter-bar.c 
+    [PATCH] Output an error message on system filter rules loading error 
+    Use same macro name for consistency 
+    Add mail_component_show_status_bar 
+    Explicitly dllimport/export comp_editor_registry on Windows    
+    Support other forward types for Anjal. 
+    Sync to disk the outbox, since if we crash, we endup sending mail again. 
+    Add support for Googlemail and hotmail/live/msn.com accounts.    
+    Translations
+  * debian/control: 
+    - Build-Depends on liblpint-bonobo-dev for the lpi patch
+    - conflicts, replaces, provides the previous documentation binaries
+    - don't Build-Depends on libgnomeprint2.2-dev, libgnomeprintui2.2-dev
+    - don't build depends on pilot-link it's not required
+    - don't split documentation since it goes to langpacks
+    - don't use po-debconf there either
+    - evolution replaces evolution-plugins (<< 2.22.2-1) 
+      since the bogofilter plugin has been moved there
+    - evolution-plugins-experimental replaces evolution-plugins (<< 2.27)
+    - updated descriptions to reflect binary installs
+    - updated evolution-data-server requirement
+  * debian/docs:
+    - renamed evolution-common.docs
+  * debian/evolution-2.2.desktop:
+    - compatibility .desktop for users upgrading
+  * debian/evolution.gconf-defaults:
+    - don't display unstable warning on startup (Ubuntu: #91799)
+  * debian/evolution.install:
+    - install the autostart and compatibility desktop entries
+    - install webdav and python but not hula and print-message there
+  * debian/evolution-common.install:
+    - install extra .glade
+  * debian/evolution-dev.install:
+    - detail the .so to install
+  * debian/evolution-plugins.install,
+    debian/evolution-plugins-experimental.install:
+    - install the .so in binaries corresponding to the upstream options
+  * debian/patches/01_dont-ship-evo-mail-notifier.png.patch:
+    - don't ship that change that debian added without reason
+  * debian/evolution-alarm-notify.desktop, 
+    debian/evolution-alarm-notify.desktop.in,
+    debian/patches/64_translate_autostart_strings.patch: 
+    - autostart desktop file to start evolution-alarm-notify with the session,
+      translate the entry
+  * debian/evolution-mail.desktop, debian/evolution-mail.desktop.in, 
+    debian/patches/61_translate_menu_entry.patch:
+    - don't reapply this ubuntu change and use only one menu entry
+  * debian/evolution.preinst,
+    debian/evolution.templates:
+    - don't display debconf template on upgrade
+  * debian/patches/03_lpi.patch:
+    - launchpad-integration patch
+  * debian/patches/62_no_upstream_email_notification_by_default.patch:
+    - don't enable the notification icon by default since the message indicator 
+      is running
+  * debian/patches/70_1024x600_contact-editor.glade.patch,
+    debian/patches/71_1024x600_em-account-editor.c.patch
+    debian/patches/72_1024x600_e-shell-settings-dialog.c.patch
+    debian/patches/73_1024x600_e-shell-window.c.patch
+    debian/patches/74_1024x600_e-sidebar.c.patch
+    debian/patches/75_1024x600_e-task-bar.c.patch
+    debian/patches/76_1024x600_e-timezone-dialog-1024x600.glade.patch
+    debian/patches/77_1024x600_mail-config.glade.patch
+    debian/patches/78_1024x600_startup-wizard.c.patch:
+    - change by Ying-Chun Liu to work better on small screens (lp: #8629)
+  * debian/patches/79_relayout_preferences.patch:
+    - change by Neil J. Patel to update the preferences dialog layout and get
+      options for the message indicator 
+  * debian/patches/90_autoconf.patch:
+    - autoconf patch
+  * debian/rules:
+    - don't use -Bsymbolic-functions to workaround memos crashing
+    - don't use debconf translation there
+    - use --disable-scrollkeeper --enable-python configure option
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Wed, 16 Dec 2009 22:45:56 +0100
+
+evolution (2.28.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 02_empty-line_signature dropped, included upstream.
+    - 03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work too.
+    - 04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch too. 
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 15 Dec 2009 08:55:42 +0100
+
+evolution (2.28.1-3) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * 02_empty-line_signature.patch: stolen from upstream git. Stop
+    including an empty line in front of the signature.
+
+  [ Yan Li ]
+  * debian/patches/03_GNOME-Bug-599792-Anjal-composer-s-Send-button-doesn-t-work.patch
+    - fixed GNOME Bug #599792
+  * debian/patches/04_GNOME-Bug-596027-In-Anjal-although-invalid-mail-address-wa.patch
+    - fixed GNOME Bug #596027
+
+  [ Yves-Alexis Perez ]
+  * debian/control:
+    - adjust evolution-dev dependencies.                        closes: #559771
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 12 Dec 2009 17:02:42 +0100
+
+evolution (2.28.1-2) unstable; urgency=low
+
+  * debian/rules:
+    - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304
+  * debian/control:
+    - build-dep on hal on kfreebsd.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 10 Nov 2009 08:01:55 +0100
+
+evolution (2.28.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches:
+    - 01_dont-ship-evo-mail-notifier.png.patch added, remove
+      evo_mail_notifier.png from Makefiles so it's not shipped at all.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 18 Oct 2009 20:33:50 +0200
+
+evolution (2.28.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 24 Sep 2009 21:39:25 +0200
+
+evolution (2.28.0-1) experimental; urgency=low
+
+  * New upstream stable release.
+  * debian/watch updated to track stable releases.
+  * debian/control:
+    - (build-)deps updated for 2.28.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 22 Sep 2009 10:58:47 +0200
+
+evolution (2.27.92-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * debian/control:
+    - update build-deps on gtkhtml and eds.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 08 Sep 2009 15:08:13 +0200
+
+evolution (2.27.91-1) experimental; urgency=low
+
+  * New upstream beta release.
+  * debian/control:
+    - update standards version to 3.8.3.
+    - adjust build-deps to gtkhtml and eds 2.27.91.
+  * debian/patches:
+    - 01_fix-evolution-cal-shared-module dropped, included upstream.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 24 Aug 2009 19:28:39 +0200
+
+evolution (2.27.90-2) experimental; urgency=low
+
+  * debian/patches:
+    - 01_fix-evolution-cal-shared-module added, don't build
+      libevolution-cal-shared.so as a module.                   closes: #541195
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 13 Aug 2009 23:18:47 +0200
+
+evolution (2.27.90-1) experimental; urgency=low
+
+  * New upstream release candidate.
+  * debian/control:
+    - adjust build-deps to gtkhtml and eds 2.27.90.
+    - add build-dep on libgnome-desktop-dev. 
+    - add shlibs:Depends to evolution-dev depends.
+  * debian/rules:
+    - ignore shlibs on libevolution-cal-shared.so. 
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 11 Aug 2009 21:07:28 +0200
+
+evolution (2.27.5-1) experimental; urgency=low
+
+  * New upstream development release.
+  * debian/control:
+    - adjust build-deps to gtkhtml and eds 2.27.5
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 04 Aug 2009 07:30:14 +0200
+
+evolution (2.27.4-1) experimental; urgency=low
+
+  [ Josselin Mouette ]
+  * Stop suggesting gnome-spell, evolution uses enchant now.
+
+  [ Yves-Alexis Perez ]
+  * New upstream development release.
+  * debian/control:
+    - adjust build-deps to gtkhtml and eds 2.27.4
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 13 Jul 2009 22:55:22 +0200
+
+evolution (2.27.3-1) experimental; urgency=low
+
+  * New upstream development release.
+  * debian/watch: look in development folder.
+  * po:
+    - fr.po updated, unfuzzified. Thanks Christian Perrier.     closes: #546232
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 11 Sep 2009 23:28:10 +0200
+
+evolution (2.26.3-3) unstable; urgency=low
+
+  * po:
+    - ja.po added, thanks Hideki Yamane.                        closes: #539596
+    - sv.po added, thanks Martin Bagge.                         closes: #522972
+    - de.po added, thanks Helge Kreutzmann.                     closes: #543728
+    - remove spurious spaces in templates. Thanks Christian Perrier for
+      patch against all translations.                           closes: #543725
+  * debian/control:
+    - update standards version to 3.8.3.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 08 Sep 2009 10:26:06 +0200
+
+evolution (2.26.3-2) unstable; urgency=low
+
+  * debian/control:
+    - bump build-deps for 2.26.3 release.                       closes: #536711
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Mon, 13 Jul 2009 08:03:05 +0200
+
+evolution (2.26.3-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream bugfix release.
+  * debian/control:
+    - update standards version to 3.8.2.
+  * po:
+    - cs.po: add czech, thanks to Martin Šín.                   closes: #532165
+    - fi.po: add finnish, thanks to Esko Arajärvi.              closes: #534610 
+  * debian/control:
+    - update deps and build-deps for 2.27 branch.
+    - update standards version to 3.8.2. 
+  * debian/*.install: update folder name to 2.28.
+  * debian/evolution-plugins-experimental.install
+    - add vcard-inline plugin.
+  * debian/lintian/*: 
+    - update folder name to 2.28.
+    - update components to match real rpaths.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 12 Jul 2009 18:03:16 +0200
+
+evolution (2.26.2-2) unstable; urgency=low
+
+  * debian/control
+    - bump build-deps to 2.26.2.                                closes: #530746
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 27 May 2009 19:44:20 +0200
+
+evolution (2.26.2-1) unstable; urgency=low
+
+  * New upstream bugfix release.
+  * po:
+    - es.po: add spanish, thanks Fernando González de Requena.  closes: #528970
+    - it.po: add italian, thanks Luca Monducci.                 closes: #529159
+    - ru.po: add russian, thanks Yuri Kozlov.                   closes: #529809 
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Tue, 26 May 2009 08:11:35 +0200
+
+evolution (2.26.1.1-2) unstable; urgency=low
+
+  [ Josselin Mouette ]
+  * evolution.preinst: use pgrep to match evolution processes instead of 
+    being so strict. Closes: #525985.
+
+  [ Yves-Alexis Perez ]
+  * Debconf translations:
+    - sv.po added, thanks to Martin Bagge.
+    - pt.po added, thanks to Miguel Figueiredo.
+    - fr.po added, Yoann Ciabaud.
+  * debian/rules:
+    - re-enable weather calendar.                               closes: #526827
+    - run debconf-updatepo at clean time.
+  * debian/control:
+    - build-dep on libgweather-dev and po-debconf.
+    - bump build deps on gtkhtml3.14 and evolution-data-server to be sure
+      to use the fixed ones.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 06 May 2009 23:18:32 +0200
+
+evolution (2.26.1.1-1) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * New upstream release.
+    - 2.26 finally available.                                   closes: #520766
+  * debian/control:
+    - update standards version to 3.8.1.
+    - update (build-)deps for 2.26.
+    - add build-dep on libical-dev and libicu-dev.
+  * debian/*.install: upgrade paths to 2.26.
+  * debian/lintian/*: upgrade paths to 2.26.
+
+  [ Josselin Mouette ]
+  * Fix section for the debug package.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 26 Apr 2009 09:51:16 +0200
+
+evolution (2.24.5-3) unstable; urgency=low
+
+  [ Yves-Alexis Perez ]
+  * debian/NEWS.Debian: warn user to make a backup and quit evolution
+    before upgrading.
+
+  [ Josselin Mouette ]
+  * evolution.{preinst,templates): add a pre-upgrade check that prevents 
+    any upgrade if evolution is currently running. Closes: #519206.
+  * Add a Pre-Depends on debconf for the debconf use in preinst.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 01 Apr 2009 13:00:41 +0200
+
+evolution (2.24.5-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sun, 08 Mar 2009 13:42:30 +0100
+
+evolution (2.24.5-1) experimental; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    - update build-deps on evolution-data-server.
+    - update build-deps on libgtkhtml3.14-dev and libgtkhtml-editor-dev
+    - drop build-dep on gtkhtml3.14.
+    - add myself to Uploaders:.
+    - add build-dep on automake and libtool.
+    - drop obsolete Conflicts/Replaces.
+  * debian/rules:
+    - run autoreconf at build time to relibtoolize the package.
+    - ignore plugin folder in dh_makeshlibs.
+  * debian/lintian/evolution-plugins:
+    - update overrides for private rpaths.
+  * debian/evolution-plugins-experimental.install
+    - install lintian override file.
+    - ship email-custom-header, evolution-webdav and templates plugin. 
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Sat, 28 Feb 2009 20:34:59 +0100
+
+evolution (2.22.3.1-1) unstable; urgency=medium
+
+  [ Pedro Fragoso ]
+  * New upstream bugfix release (Closes: #488782)
+    - Fixes security vulnerabilities CVE-2008-1108 and CVE-2008-1109
+      (Closes: #484639)
+    - Set urgency to medium
+  * debian/control:
+    - Add myself to Uploaders
+    - Bump Standards-Version to 3.8.0 (no changes)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Sun, 06 Jul 2008 13:51:11 +0200
+
+evolution (2.22.2-1) unstable; urgency=low
+
+  * New upstream release
+    - bugfixes and translation updates
+  * Remove debian/lintian/evolution
+    - private-dir rpaths are finally ignored with lintian >= 1.23.49
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Mon, 26 May 2008 22:45:36 +0200
+
+evolution (2.22.1.1-1) unstable; urgency=low
+
+  [ Heikki Henriksen ]
+  * debian/evolution-mail.desktop:
+    Set X-GNOME-Bugzilla-Component=BugBuddyBugs (closes: #477213)
+
+  [ Oystein Gisnas ]
+  * New upstream bugfix release
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Sun, 04 May 2008 18:16:59 +0200
+
+evolution (2.22.1-1) unstable; urgency=low
+
+  [ Pedro Fragoso ]
+  * New upstream bugfix release
+    - 35_fix_tnef_locale.patch, Dropped, merged upstream
+
+  [ Heikki Henriksen ]
+  * 2.22.1 fixes subject in composer window (closes: #475370)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Thu, 10 Apr 2008 19:43:54 +0200
+
+evolution (2.22.0-3) unstable; urgency=low
+
+  * Upload to unstable
+  * Add patch 35_fix_tnef_locale.patch
+    - fixes locale-bug in tnef-attachments (closes: #464670)
+  * Update DM-Upload-Allowed according to change in dpkg 1.14.16 and bump
+    build-dep on dpkg-dev
+  * Bump build-dep on cdbs to get dh_icons in postinst (closes: #473029)
+  * Update evolution.menu to follow newest menu sub-policy and use
+    Applications/Network/Communication (fixes lintian-warning)
+  * Convert copyright to UTF-8 (fixes lintian-warning)
+  * Update versioned dirs in lintian-overrides
+  * Add lintian override for desktop-command-not-in-package in
+    evolution-common, and install in evolution-common.install
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Sat, 05 Apr 2008 19:25:32 +0200
+
+evolution (2.22.0-2) experimental; urgency=low
+
+  * Bump build-dep libcamel1.2-dev to >= 2.21.92 (closes: #472991)
+  * Fix file path to Google Calendar plugin (closes: #473309)
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Mon, 31 Mar 2008 14:51:04 +0200
+
+evolution (2.22.0-1) experimental; urgency=low
+
+  [ Heikki Henriksen ]
+  * New upstream release
+  * Acknowledge NMU from Security Team:
+    - remove 80_CVE-2008-0072.patch: applied upstream
+  * Bump Standards-version to 3.7.3
+  * Upgrade build-dep:
+    - libsoup2.4-dev from libsoup2.2-dev
+  * Bump build-deps:
+    - libglib2.0-dev (>= 2.15.3)
+    - libgtk2.0-dev (>= 2.12.0)
+    - evolution-data-server-dev (>= 2.21.92)
+    - evolution-data-server-dev (<< 2.23.0)
+    - gnome-icon-theme (>= 2.19.91)
+    - libbonobo2-dev (>= 2.20.3)
+    - libgtkhtml3.14-dev (>= 3.17.5)
+    - libgnome-pilot2-dev (>= 2.0.15)
+    - libnotify-dev (>= 0.3.0)
+  * Add build-dep:
+    - pilot-link
+  * Update base plugins:
+    - add google-account-setup
+    - add bogo-junk-plugin
+    - wait and evaluate on mono 
+  * Update standard plugins:
+    - add audio-inline
+    - remove bogo-junk-plugin
+    - rename new-mail-notify to mail-notification
+    - add attachment-reminder
+    - add face
+    - add backup-restore
+  * Update experimental plugins:
+    - remove backup-restore
+    - add external-editor
+    - add tnef-attachments
+  * Remove patch:
+    - 70_no-mail-remote-plugin.patch - mail-remote-plugin never worked and is
+      removed upstream
+
+  [ Oystein Gisnas ]
+  * Bump e-d-s build-deps to 2.21.92
+  * Sync build-deps of -dev packages with pkg-config files
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Tue, 18 Mar 2008 00:46:53 +0100
+
+evolution (2.12.3-1.1) unstable; urgency=high
+
+  * Non-maintainer upload by the Security Team.
+  * Fix Encrypted Message Version Format String Vulnerability
+    (CVE-2008-0072).
+
+ -- Thijs Kinkhorst <thijs@debian.org>  Tue, 04 Mar 2008 21:27:27 +0100
+
+evolution (2.12.3-1) unstable; urgency=low
+
+  [ Heikki Henriksen ]
+  * Conflict with older evolution-plugins and evolution-plugins-experimental
+    to ensure full upgrades (closes: #454473)
+  * Add recommends evolution-webcal (closes: #455598)
+
+  [ Oystein Gisnas ]
+  * New upstream release (bugfixes and translations)
+    (closes: #454435, #458728, #443483)
+  * Remove configure flags --with-nspr-includes and --with-nss-includes
+    (closes: #461312, #460615, #460683)
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Tue, 22 Jan 2008 08:19:08 +0100
+
+evolution (2.12.2-1) unstable; urgency=low
+
+  [ Heikki Henriksen ]
+  * New upstream release (bugfixes and translations) (closes: #446890)
+  * Swap bogofilter and spamassassin recommmends, since bogofilter is quite
+    lightweight (closes: #435635)
+  * Versioned build-dependency on eds-dev and dependency on eds (closes:
+    #445375)
+  * Update patch: 70_no-mail-remote-plugin.patch
+  * Upstream fix for glade-dir (closes: #450524)
+  * [debian/rules] Update ELIBDIR
+  * Remove patches applied upstream:
+    - 15_contact-list-editor-expand.patch
+    - 25_mute-debug-messages.patch
+    - 30_mute-alarm-notify.patch
+    - 50_filter_missing_gettext.patch
+    - 50_libnssckbi-location.patch
+    - 60_new_addressbook_set_relative_url.patch
+  * Add Dm-Upload-Allowed, Homepage, Vcs-Browser and Vcs-Svn fields in control
+  * Add build-dep on libytnef0-dev for experimental plugin tnef-attachments
+  * Add tnef-attachments to plugins-experimental
+  * Add build-dep on gtk-doc-tools to build gtk-doc development documentation
+  * Enable building of gtk-doc in rules
+  * Update lintian overrides (version-bumps in rpaths)
+  * Update evolution-mail.desktop
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Mon, 03 Dec 2007 18:06:48 +0100
+
+evolution (2.12.0-2) unstable; urgency=low
+
+  * Conflicts with evolution-exchange (<< 2.11.90) (closes: #444012, #444018)
+  * Tighter build-dependency on libedataserver (>= 1.11.2) for new
+    data-structure, EFlag (closes: #444036)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Wed, 26 Sep 2007 14:58:24 +0200
+
+evolution (2.12.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Adjusted Build-Deps.
+  * Adjusted .install paths to reflect new upstream.
+  * Added attachment-reminder, audio-inline, bogo-junk-plugin, face,
+    mail-notification to the evolution-plugin package.
+  * Dropped patches:
+    08_to_translate_list_update.patch - Applied upstream.
+    20_minicard-email-colon.patch - Upstream has a better fix.
+
+ -- Riccardo Setti <giskard@debian.org>  Mon, 24 Sep 2007 01:43:12 +0200
+
+evolution (2.10.3-1) unstable; urgency=low
+
+  * New upstream stable release; bug fixes.
+
+ -- Loic Minier <lool@dooz.org>  Wed, 25 Jul 2007 16:38:09 +0200
+
+evolution (2.10.2-1) unstable; urgency=low
+
+  * New upstream release. (closes: #423060)
+  * 15_contact-list-editor-expand.patch: Fix contact list dialog resize
+    bug (bugzilla #424055)
+  * 20_minicard-email-colon.patch: Fix for missing row columns in
+    contacts minicard view (bugzilla #404239)
+  * 25_mute-debug-messages.patch: Mute console noise from plugins
+  * 30_mute-alarm-notify.patch: Mute noisy debug output from evolution-
+    alarm-notify
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Mon, 28 May 2007 23:33:35 +0200
+
+evolution (2.10.1-1) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * New upstream release
+    - Add gnome-doc-utils (>= 0.3.2) build-dep
+    - Change libgtkhtml3.8* dependencies to libgtkhtml3.14*
+    - Bump e-d-s build-deps to >= 1.9.4
+    - Bump libgtk2.0-dev to >= 2.10.0
+    - Add evolution Recommends: spamassassin | bogofilter
+    - Drop 10_etasks-missing-include.patch
+    - Drop 90_build_with_new_pisock.patch, fixed upstream
+  * 50_libnssckbi-location.patch: Adapt private library search path
+    to relocated xulruner libraries.
+  * Update watch file to track all stable versions
+  * 08_to_translate_list_update.patch: Translatable files
+  * Don't create shlibs.local - CDBS has been fixed long ago
+  * Create symlink for manpage evolution-2.10
+  * Add lintian overrides
+
+  [ Loic Minier ]
+  * Upload to unstable.
+
+ -- Loic Minier <lool@dooz.org>  Tue, 24 Apr 2007 16:36:09 +0200
+
+evolution (2.8.3-1) experimental; urgency=low
+
+  * New upstream stable release; bug fixes and translations.
+  * Drop Takuo Kitame from Uploaders.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 05 Apr 2007 14:27:55 +0200
+
+evolution (2.8.2.1-1) experimental; urgency=low
+
+  * New upstream release.
+    - Fixes crash on exit; closes: #406492.
+
+ -- Loic Minier <lool@dooz.org>  Thu, 11 Jan 2007 17:28:35 +0100
+
+evolution (2.8.2-1) experimental; urgency=low
+
+  [ Jordi Mallach ]
+  * 50_filter_missing_gettext.patch: Add missing gettext() calls to the
+    filter dialogs (Bugzilla #359276).
+
+  [ Oystein Gisnas ]
+  * New upstream release
+    - debian/control: Move prefer plain plugin to standard
+    - 70_no-mail-remote-plugin.patch: Update patch
+    - Treat data/evolution.{keys,mime} special
+  * Document mailbox summary corruption and removal of
+    IMAP4rev1 provider. [debian/README.Debian]
+  * Document common network-manager error messages.
+    [debian/README.Debian]
+  * Don't depend on HAL and NetworkManager on non-Linux archs. Thanks to
+    Petr Salinger. (closes: #401540) [debian/control]
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Sun,  7 Jan 2007 22:52:16 +0100
+
+evolution (2.8.1.1-1) experimental; urgency=low
+
+  * New upstream release (closes: #347645)
+    - included: debian/patches/20_show-deleted-msgs-in-trash.patch
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Tue, 31 Oct 2006 22:16:23 +0100
+
+evolution (2.8.1-2) experimental; urgency=low
+
+  * Pull patch from upstream (closes: #391250)
+    - debian/patches/20_show-deleted-msgs-in-trash.patch
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Sun, 22 Oct 2006 09:52:34 +0200
+
+evolution (2.8.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Fix symlinks to point to 2.8 [debian/evolution.links] (closes: #389272)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Tue,  3 Oct 2006 15:19:14 +0200
+
+evolution (2.8.0-2) experimental; urgency=low
+
+  * Remove superfluous libusb-dev build-dep [debian/control]
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Tue, 26 Sep 2006 09:56:17 +0200
+
+evolution (2.8.0-1) experimental; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/patches/06_fix_inline_pgp_breaking_charset.patch: Applied
+    upstream
+  * remove debian/patches/11_window_settings_stored.patch
+  * debian/patches/11_window_settings_stored.patch: Applied upstream
+  * debian/patches/12_fix_icon_metaphors_bug_339626.patch: Applied
+    upstream
+  * debian/patches/17_fix_alarm_delay_for_calendar.patch: Doesn't apply
+    cleanly
+  * debian/patches/20_xulrunner.patch: Fixed upstream
+  * debian/patches/30_no-ipod-sync.patch: Doesn't apply cleanly
+  * debian/patches/31_no-audio-inline.patch: Doesn't apply cleanly
+  * debian/patches/40_disposition-notification.patch: Fixed upstream
+  * debian/patches/60_exchange-operations-create-addressbook.patch:
+    Applied upstream
+  * debian/patches/70_build-experimental-plugins.patch: Doesn't apply
+    cleanly
+  * debian/*.install: Update version number in filename paths
+  * Label typo patch applied upstream.
+    [debian/patches/18_fix_label_typo.patch]
+  * Gettext domain patch applied upstream.
+    [debian/patches/20_correct_gettext_domain.patch]
+
+  [ Riccardo Setti ]
+  * Added patch to fix compile with the new libpisock (closes: #341172)
+    [debian/patches/90_build_with_new_pisock.patch]
+
+  [ Heikki Henriksen ]
+  * New upstream release (1.8.0)
+  * Updated debian/watch to follow 2.8-series
+  * --enable-cairo-calender=yes [debian/rules]
+  * Missing include to avoid possible segfault applied upstream.
+    Thanks to Dann Frazier <dannf@debian.org> (closes: #384280)
+  * Remove patches fixed/applied upstream:
+  	- 07_default_shell_only_with_no_uris.patch
+        - 10_pkg-config-rpath.patch
+        - 30_ipod-sync_missing-files.patch
+        - 55_fi-translation-fix.patch
+        - 60_alarm-list-dialog-peek.patch
+        - 61_itip-formatter-date-in-past.patch
+        - 65_null-camel-exception.patch
+  * Update patches:
+        + 10_etasks-missing-include.patch
+        + 70_no-mail-remote-plugin.patch
+  * Add build-dep on gtkhtml3.8 to find Editor.idl [debian/control]
+  * Temporary build-dep on libusb-dev until this is in place at the right
+    place (libpisock-dev) [debian/control]
+  * Bump build-dep on libgtk2.0-dev to (>= 2.8.0) to pull in cairo
+    [debian/control]
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Fri, 22 Sep 2006 12:51:40 +0200
+
+evolution (2.6.3-1) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * New upstream release
+  - does not ping when offline (closes: #360373)
+  * Reorder build-deps to match order in configure.in. [debian/control]
+  * Add build-deps for each e-d-s lib used. [debian/control]
+  * Patches applied upstream:
+    - debian/patches/18_fix_label_typo.patch
+    - debian/patches/20_correct_gettext_domain.patch
+    - debian/patches/31_no-audio-inline.patch: Obsolete
+    - debian/patches/70_build-experimental-plugins.patch: Obsolete
+  * Update patch debian/patches/70_no-mail-remote-plugin.patch
+
+  [ Heikki Henriksen ]
+  * Check build-deps (closes: #383174)
+  * Re-add build-dep on gtkhtml3.8 to fix ftbfs
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Tue, 15 Aug 2006 21:07:17 +0200
+
+evolution (2.6.2-4) unstable; urgency=high
+
+  * Add gnome-icon-theme build-dep. [debian/control] (Closes: #377161)
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Fri,  7 Jul 2006 08:40:16 +0200
+
+evolution (2.6.2-3) unstable; urgency=low
+
+  * debian/control: Add ${misc:Depends}
+  * debian/control: Remove conflict with older evolution
+  * debian/evolution-dev.install: Remove .la files again
+  * debian/patches/10_pkg-config-rpath.patch: Add explicit -rpath to
+    private libs pkg-config to fix .la-less builds against these libs
+  * Convert icon to XPM format for Debian menu
+  * debian/control: Clean up dependencies
+  * Move icon, menu and .desktop from evolution-common to evolution
+  * debian/control: Depend on = source:Version of -common package
+    for binNMU compatibility
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Thu,  6 Jul 2006 09:45:29 +0200
+
+evolution (2.6.2-2) unstable; urgency=low
+
+  * Make the package binNMU-safe:
+    - Build-depend on dpkg-dev >= 1.13.19. [debian/control]
+    - Use ${binary:Version} & ${source:Version} [debian/control]
+    - use UPSTREAM_VERSION [debian/rules]
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Mon, 12 Jun 2006 09:53:50 +0200
+
+evolution (2.6.2-1) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/patches/61_itip-formatter-date-in-past.patch: (Closes:
+    #368920)
+  * Update manpages
+  * Move architecture independent files to package evolution-common
+    (Closes: #232890)
+  * Move experimental plugins to evolution-plugins-experimental
+  * debian/control: Update package descriptions
+  * debian/control: Correct Suggests: and Recommends: for plugins
+
+  [ Heikki Henriksen ]
+  * New upstream release
+  * Update patches:
+    - debian/patches/17_fix_alarm_delay_for_calendar.patch
+    - debian/patches/31_no-audio-inline.patch
+    - debian/patches/55_fi-translation-fix.patch
+    - debian/patches/70_build-experimental-plugins.patch
+  * Drop patches applied upstream:
+    - debian/patches/06_fix_inline_pgp_breaking_charset.patch
+    - debian/patches/11_window_settings_stored.patch
+    - debian/patches/12_fix_icon_metaphors_bug_339626.patch
+    - debian/patches/40_disposition-notification.patch
+    - debian/patches/60_exchange-operations-create-addressbook.patch
+  * plugin for ipod-sync works again:
+    - debian/patches/30_no-ipod-sync.patch: dropped
+    - debian/patches/30_ipod-sync_missing-files.patch: added
+    - debian/control: bring back build-deps on hal >= 0.5.4
+    - debian/evolution-plugins.install: add ipod-sync to experimental line
+  * debian/control: Change dep on Source-Version from = to >= to have it
+    binNMU-able
+  * debian/control: add dep on libhal-dev to evolution-dev
+  * debian/rules: Fix Version\: in dpkg-parsechangelog
+  * debian/rules: Don't overwrite DEB_SHLIBDEPS_INCLUDE &
+    DEB_DH_MAKESHLIBS_ARGS_?
+  * debian/evolution-dev.install: bring back *.la until we get broken 
+    rpath in some libs fixed
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Sun, 11 Jun 2006 20:18:06 +0200
+
+evolution (2.6.1-3) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/control: Move -dbg pkg to section gnome
+  * debian/control: Claim compliance with Debian Policy 3.7.2
+  * debian/patches/60_new_addressbook_set_relative_url.patch: (Closes: #361995)
+  * debian/evolution-dev.install: drop installation of *.la
+  * Add manpages csv2vcard.1 and evolution-addressbook-export.1
+  * debian/evolution.install: drop installation of
+    evolution-addressbook-clean (closes: #346088)
+  * debian/patches/65_null-camel-exception.patch: stop using NULL in
+    place of Camel exceptions
+  * debian/patches/70_build-experimental-plugins.patch: Build
+    experimental plugins. Thanks to Michel Dänzer. (Closes: #312288)
+  * debian/patches/evolution{,-plugins}.install: Move base plugins to
+    evolution package
+
+  [ Heikki Henriksen ]
+  * patches pulled from ubuntu:
+    - debian/patches/06_fix_inline_pgp_breaking_charset.patch
+    - debian/patches/11_window_settings_stored.patch: (closes: #363259)
+    - debian/patches/12_fix_icon_metaphors_bug_339626.patch
+    - debian/patches/17_fix_alarm_delay_for_calendar.patch
+    - debian/patches/18_fix_label_typo.patch
+    - debian/patches/20_correct_gettext_domain.patch
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Thu, 25 May 2006 08:09:47 +0200
+
+evolution (2.6.1-2) unstable; urgency=low
+
+  [ Oystein Gisnas ]
+  * debian/patches/60_exchange-operations-create-addressbook.patch:
+    Fix create addressbook breakage caused by exchange-operations plugin
+  * debian/control: Add dep dbus (closes: #365797)
+
+  [ Heikki Henriksen ]
+  * debian/control: add dep on libnm-glib-dev & libgtkhtml3.8-dev for
+    evolution-dev
+  * debian/evolution-plugins.install: not install *.la
+  * debian/patches/60_alarm-list-dialog-peek.patch: fix segfault on certain
+    cases/archs. Thanks to Dann Frazier (closes: #365923)
+
+ -- Oystein Gisnas <oystein@gisnas.net>  Thu,  4 May 2006 12:25:51 +0200
+
+evolution (2.6.1-1) unstable; urgency=low
+
+  [ Heikki Henriksen ]
+  * Upload to unstable
+  * New upstream release (2.6.1)
+  * debian/control: add recommends notification-daemon to evolution-plugins
+  * debian/control: bump debhelper build-dep to >= 5.0.0
+  * debian/control: added recommends: yelp (closes: #277707)
+  * debian/control: removed old unecessary conflicts/replaces
+  * debian/control: add suggests on evolution-dbg
+  * evolution-wombat has been removed some time ago
+    (closes: #236852, #265568, #160049, #211656, #218075, #196426)
+  * debian/evolution-mail.desktop: pull from ubuntu (and add norwegian
+    translations :) ) (closes: #257322)
+  * debian/rules: clean up clean::
+  * debian/control: add build-dep libnm-glib-dev and suggest network-manager.
+    Provides NetworkManager-magic if available.
+  * Upstream fix for addressbook data-loss (uid vs relative_uri)
+    (closes: #361995)
+  * debian/watch: added
+  * debian/patches/40_disposition-notification.patch:
+    Fix crash on disposition-notification (upstream bug: 324327)
+  * debian/patches/31_no-audio-inline.patch & debian/control:
+    Remove build-dep on gstreamer0.8 and audio-inline-plugin until its' fixed
+  * Upstream fix for new-mail-plugin (closes: #341085)
+
+  [ Oystein Gisnas ]
+  * Upstream fixes for mbox import (closes: #292810)
+  * Upstream fixes for yelp user guide category and title++
+    (closes: #360860, #339500)
+  * Upstream support for contact groups (closes: #297236)
+  * Upstream LDAP fixes (closes: #187821, #190750, #251060, #139947)
+  * Remove obsolete README.SSL since SSL/TLS is builtin
+  * Upstream fix for creation of task from mail message (closes: #327406)
+  * debian/evolution.links: Fix link filename for evolution-2.6 manpage
+  * debian/rules: Add dh_shlibdeps flag to aviod unnecessary runs of ldconfig
+  * debian/evolution.menu: Remove obsolete tag in menu file (see #129131)
+
+  [ Jordi Mallach ]
+  * debian/rules:
+    - don't overwrite CFLAGS, or we get unusable -dbg packages
+      (thanks seb128).
+    - likewise for DEB_CONFIGURE_EXTRA_FLAGS.
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Fri, 28 Apr 2006 17:12:48 +0200
+
+evolution (2.6.0-2) experimental; urgency=medium
+
+  * Now updates count for drafts folder (closes: #284095)
+  * Build --without-krb4 (closes: #278242)
+  * Move spamassassin recommends to evolution-plugins (closes: #343987)
+  * Upstream fixes in ldif-import (closes: #357845)
+  * Bump debhelper compat to 5
+  * remove camel-providers from evolution.install:
+    moved to e-d-s once upon a time
+  * remove evolution-importers from evolution.install:
+    goes under *so
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Mon,  3 Apr 2006 20:02:52 +0200
+
+evolution (2.6.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Added -dbg package with Priority: extra
+  * debian/patches/50_de-translation-typo.patch:
+    Removed - string is no longer valid
+  * debian/patches/55_fi-translation-fix.patch:
+    Updated
+  * debian/patches/80_default_mailer_free-fix.patch:
+    Removed - fixed upstream
+  * Enable experimental plugins and update plugin-list
+    (closes: #349163, #312288)
+  * debian/patches/07_default_shell_only_with_no_uris.patch:
+    Added from ubuntu's packages
+  * debian/patches/30_no-ipod-sync.patch:
+    Don't build ipod-sync-plugin (at least not until it wants to build)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Thu, 30 Mar 2006 17:56:35 +0200
+
+evolution (2.4.2.1-2) unstable; urgency=medium
+
+  * Acknowledge NMU (closes: #358432)
+  * Add myself to Uploaders
+  * Tighten dependency on libgtkhtml3.8-dev >= 3.8.1-1.1
+  * Tighten dependency on e-d-s >= 1.4.2.1-1.1
+  * 80_default_mailer_free-fix.patch:
+    fix crash on startup (closes: #358071)
+  * debian/patches/15_x-face-support.patch:
+    broken and not accepted upstream, so removed (closes: #347702)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Sun, 26 Mar 2006 17:26:15 +0100
+
+evolution (2.4.2.1-1.1) unstable; urgency=low
+
+  * NMU to fix crasher in startup (closes: #358071)
+
+ -- Heikki Henriksen <heikkih@gmail.com>  Wed, 22 Mar 2006 13:59:44 +0000
+
+evolution (2.4.2.1-1) unstable; urgency=low
+
+  [ Jordi Mallach ]
+  * New upstream release (closes: #336968).
+    - can introduce tasks (closes: #334026).
+    - won't crash when adding contacts (closes: #342725).
+    - won't crash on libsoup2.2 bugs (closes: #340488).
+    - should not loop, eating all memory (closes: #341694).
+  * Upload to unstable.
+  * Don't build-depend on automake1.7 [debian/control].
+
+  [ Loic Minier ]
+  * Add missing build-dep on gtkhtml3.8 (>= 3.7.0). (Closes: #340184)
+    [debian/control]
+
+ -- Jordi Mallach <jordi@debian.org>  Mon,  9 Jan 2006 14:13:13 +0100
+
+evolution (2.4.1-3) experimental; urgency=low
+
+  * Merge changes done in SVN by marga as "2.4.0-3", which were overriden in
+    experimental in kitame's "2.4.0-3".
+    - Re-add the updated translations patches (german and finish).
+    - Rename bugbuddy Suggests in bug-buddy.
+  * Update and rename patches to apply cleanly and in a defined order.
+  * Update X-Face support patch to cover Makefile.am too.
+  * Update pixmap PATH to 2.4. [debian/evolution.menu]
+  * Update description to not list the Evolution version. [debian/control]
+  * Update list of evolution-dev files. [debian/evolution-dev.install]
+
+ -- Loic Minier <lool@dooz.org>  Fri, 11 Nov 2005 15:58:25 +0100
+
+evolution (2.4.1-2) experimental; urgency=low
+
+  * Rebuild against evolution-data-server >= 1.4.1.1-1 and bump build-dep.
+    [debian/control]
+  * Remove anything related to gal, now merged in evolution-data-server.
+    [debian/control]
+  * Switch to experimental dbus by replacing dbus-1-dev and dbus-glib-1-dev
+    with libdbus-1-dev and libdbus-glib-1-dev.
+    [debian/control]
+  * Update copyright information, upstream URL, authors...
+    [debian/copyright]
+  * Add myself to Uploaders.
+    [debian/control]
+  * Remove all files from the Debian diff.gz not below debian/.
+  * Add CDBS' utils. [debian/rules]
+
+ -- Loic Minier <lool@dooz.org>  Mon,  7 Nov 2005 17:53:06 +0100
+
+evolution (2.4.1-1) experimental; urgency=low
+
+  * New upstream release
+  * Build againsta gtkhtml3.8 instead of gtkhtml
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 10 Oct 2005 05:50:53 +0900
+
+evolution (2.4.0-3) experimental; urgency=low
+
+  * Depends on untagged libgal-common and gtkhtml.
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 16 Sep 2005 15:19:14 +0900
+
+evolution (2.4.0-2) experimental; urgency=low
+
+  * fix libgal2.5-common dependency.
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 13 Sep 2005 12:23:37 +0900
+
+evolution (2.4.0-1) experimental; urgency=low
+
+  * New upstream release
+  * Depends on e-d-s 1.4.0, gal 2.5, gtkhtml3.8
+  * remove translation fix patch at once.
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 12 Sep 2005 11:33:24 +0900
+
+evolution (2.2.3-4) unstable; urgency=low
+
+  * Erased unnecesary files from the debian/ directory, including 
+    02_help_is_not_included.patch which wasn't being applied anyway.
+  * Fix de.po translation, with the patch provided by Jens Seidel
+    (Closes: #314119).
+  * Add a suggestion for the evolution-exchange package (Closes: #304827).
+  * Fixed an "implicitly converted pointer" bug with the patch provided by
+    David Mosberger (Closes: #304708, #320892)
+  * Re-included the changelog entries that had been dropped during
+    experimental phase.
+  * Fixed build-dependencies (libpam-dev -> libpam0g-dev).
+  * Updated all libgal2.4 dependencies to > 2.4.3
+  * Updated copyright file.
+
+ -- Margarita Manterola <debian@marga.com.ar>  Tue,  6 Sep 2005 16:32:25 -0300
+
+evolution (2.2.3-3) unstable; urgency=high
+
+   * security fix. (closes: Bug#32253)
+     - Multiple exploitable format string vulnerabilities
+       Applied unofficial security fix patch from
+       http://www.sitic.se/dokument/evolution.formatstring.patch
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 25 Aug 2005 14:58:34 +0900
+
+evolution (2.2.3-2) unstable; urgency=low
+
+  * Added "Evolution Team" in the Maintainer field, and listed the members of
+    the team as the Uploaders.
+  * Added a manpage provided by Lars Wirzenius (Closes: #239643).
+  * Added a symlink in /usr/bin for evolution-addressbook-export and
+    csv2vcard (Closes: #285174).
+  * Fixed finnish translations, as suggested by Lars Wirzenius,
+    by adding the corresponding patch (Closes: #279977, #288674)
+  * Build-depend on libkrb5-dev, since it's being used. (Closes: #318981)
+  * Update the libgal2.4-0 dependency, to prevent being installed with the
+    buggy version.
+  * Fixed the menu file (Closes: #307840, #318163)
+
+ -- Margarita Manterola <debian@marga.com.ar>  Mon,  1 Aug 2005 10:24:13 -0300
+
+evolution (2.2.3-1) unstable; urgency=low
+
+  * New upstream release
+  * change dependency to e-d-s instead of e-d-s1.2
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 13 Jul 2005 15:13:40 +0900
+
+evolution (2.2.2-4) unstable; urgency=low
+
+  * remove unnecessary diffs from diff.gz (config.sub, config.guss, *.desktop)
+  * remove libdb4.2-dev from Build-Depends.
+  * Build-Depends on evolution-data-server1.2-dev (>= 1.2.2-4)
+  * build against latest e-d-s.
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 10 May 2005 12:29:37 +0900
+
+evolution (2.2.2-3) unstable; urgency=low
+
+  * added build-depends: dbus-glib-1-dev (closes: #305001)
+
+ -- Takuo KITAME <kitame@debian.org>  Sat, 30 Apr 2005 03:32:27 +0900
+
+evolution (2.2.2-2) unstable; urgency=low
+
+  * Oops. Previous release forgot to include plugins directory.
+  * Added build-depends for plugins. (libgstreamer0.8-dev, dbus-1-dev)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 14 Apr 2005 11:42:22 +0900
+
+evolution (2.2.2-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix debian menu (closes: #303657)
+  * --enable-plugins=all (closes: #304324)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 13 Apr 2005 22:22:59 +0900
+
+evolution (2.2.1.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 30 Mar 2005 12:06:30 +0900
+
+evolution (2.2.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Upload to unstable/main
+  * Change package name to 'evolution'
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 22 Mar 2005 18:17:12 +0900
+
+evolution2.2 (2.1.6-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 22 Mar 2005 15:39:39 +0900
+
+evolution2.2 (2.1.5-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 22 Feb 2005 11:18:58 +0900
+
+evolution2.2 (2.1.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Fri,  4 Feb 2005 14:57:30 +0900
+
+evolution2.2 (2.1.3.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 13 Jan 2005 14:49:22 +0900
+
+evolution2.2 (2.1.2-1) experimental; urgency=low
+
+  * New upstream release
+  * fix build-depends (closes: #288572)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu,  6 Jan 2005 15:05:08 +0900
+
+evolution2.2 (2.1.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 17 Dec 2004 16:51:15 +0900
+
+evolution2.2 (2.1.0-1) experimental; urgency=low
+
+  * New upstream release
+  * experimental, tagged package name.
+
+ -- Takuo KITAME <kitame@debian.org>  Fri,  5 Nov 2004 14:37:51 +0900
+
+evolution (2.0.4-2) testing-proposed-updates; urgency=high
+
+  * remove broken patch: decode-rfc2047-invalid-encoded-word.patch
+    (closes: #280303)
+  * applied security fix patch.
+    - CAN-2005-0806: Remote denial of service in evolution 2.0.3 
+     (closes: #300815)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 28 Apr 2005 12:35:33 +0900
+
+evolution (2.0.4-1) unstable; urgency=low
+
+  * Maintainer upload (closes: #285908)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 16 Mar 2005 19:23:19 +0900
+
+evolution (2.0.4-0.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * New upstream release.
+  * debian/patches/CAN-2005-0102.patch,
+    debian/patches/mail-preserve-auth-conf.patch: removed, applied upstream.
+  * debian/control:
+    - Build-Conflict on kerberos4kth-dev (closes: #285908).
+    - update Build-Depends for new requirements.
+
+ -- Jordi Mallach <jordi@debian.org>  Tue,  1 Mar 2005 18:42:43 +0100
+
+evolution (2.0.3-1.2) unstable; urgency=HIGH
+
+  * Non-maintainer upload to fix SECURITY issues.
+  * debian/patches/CAN-2005-0102.patch:
+    - camel/camel-lock-helper.c: malloc()'ing supplied path length + 1 allowed
+      an integer overflow and malloc()ation of a 0-byte buffer, which was then
+      filled by an arbitrary amount of user-supplied data. Now restrict
+      the length of the supplied path to at most 0xFFFF characters (patch
+      taken from Ubuntu USN-69-1, thanks pitti!).
+  * debian/patches/mail-preserve-auth-conf.patch: patch from Ximian Bugzilla
+    to fix the skipping of the needauth setting (closes: #290291).
+  * debian/rules: add DEB_FIXPERMS_EXCLUDE for camel-lock-helper.
+  * debian/evolution.postinst: removed, chmod/chgrp handled by make install
+    (this changes camel-lock-help from suid root to sgid mail).
+
+ -- Jordi Mallach <jordi@debian.org>  Tue, 25 Jan 2005 17:49:41 +0100
+
+evolution (2.0.3-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control: bump several build dependencies to the versions
+    required by configure.in (closes: #285226).
+
+ -- Jordi Mallach <jordi@debian.org>  Tue, 14 Dec 2004 20:30:06 +0100
+
+evolution (2.0.3-1) unstable; urgency=low
+
+  * New upstream release
+  * remove camel-charset-map-patch. 
+  * upstream fix:
+    - failed to migrate 1.4 data to 2.0 (closes: #276162)
+  * build-depends on debhelper >= 4.2.21 (closes: #282038)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu,  9 Dec 2004 17:36:28 +0900
+evolution (2.0.2-3) unstable; urgency=low
+
+  * upload to unstable/main
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 15 Oct 2004 14:20:05 +0900
+
+evolution (2.0.2-2) experimental; urgency=low
+
+  * install help files, evolution-addressbook-export (closes: #274976, #275709)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 13 Oct 2004 16:26:33 +0900
+
+evolution (2.0.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 13 Oct 2004 12:52:30 +0900
+
+evolution (2.0.1-1) experimental; urgency=low
+
+  * New upstream release
+  * include help files.
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 29 Sep 2004 16:03:30 +0900
+
+evolution (2.0.0-1) experimental; urgency=low
+
+  * New upstream release, RC package for uploading into main.
+  * usr/share/idl is -dev files.
+  * chmod u+s /usr/lib/evolution/2.0/camel/camel-lock-helper
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 15 Sep 2004 13:51:07 +0900
+
+evolution1.5 (1.5.94.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 31 Aug 2004 14:54:54 +0900
+
+evolution1.5 (1.5.93-1) experimental; urgency=low
+
+  * New upstream release
+  * try to decode rfc2047 invalid (non-lwsp separated e-word) mime subject.
+  * decode rfc2047 e-word in comment of User-Agent/X-Mailer (upstream patch)
+  * --enable-nntp (closes: #264280)
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 16 Aug 2004 12:59:41 +0900
+
+evolution1.5 (1.5.92.1-1) experimental; urgency=low
+
+  * New upstream release
+  * apply patch to decode encoded-word which is not space-separated.
+
+ -- Takuo KITAME <kitame@debian.org>  Thu,  5 Aug 2004 18:07:56 +0900
+
+evolution1.5 (1.5.91-2) experimental; urgency=low
+
+  * Applied http://primates.ximian.com/~fejj/camel-charset-map.patch
+    fix  multibyte charset header encoding.
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 21 Jul 2004 18:42:49 +0900
+
+evolution1.5 (1.5.91-1) experimental; urgency=low
+
+  * New upstream release
+    some bugs were fixed by upstream (closes: #242014, #256707, #256830, #236333, #241003, #244703)
+  * Depends on gnome-icon-theme (closes: #259594)
+  * Recommends spamassasin (closes: #249822)
+  * clean up doc files (closes: #257404)
+  * --enable-ipv6
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 16 Jul 2004 09:25:48 +0900
+
+evolution1.5 (1.5.90-2) experimental; urgency=low
+
+  * fix for local mailbox access (closes: #256988)
+  chgrp mail /usr/lib/evolution/1.5/camel/camel-lock-helper
+  chmod g+s /usr/lib/evolution/1.5/camel/camel-lock-helper
+
+ -- Takuo KITAME <kitame@debian.org>  Sun, 11 Jul 2004 23:35:33 +0900
+
+evolution1.5 (1.5.90-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Thu,  8 Jul 2004 18:59:48 +0900
+
+evolution1.5 (1.5.9.2-2) experimental; urgency=low
+
+  * link againsta libcompface (closes: #257064)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu,  1 Jul 2004 21:42:23 +0900
+
+evolution1.5 (1.5.9.2-1) experimental; urgency=low
+
+  * New upstream release (closes: #256476, #250840)
+  * use cdbs instead of dbs
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 28 Jun 2004 12:00:04 +0900
+
+evolution1.5 (1.5.9.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Mon,  7 Jun 2004 12:14:39 +0900
+
+evolution1.5 (1.5.8-2) experimental; urgency=low
+
+  * update Dependency.
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 27 May 2004 08:57:51 +0900
+
+evolution1.5 (1.5.8-1) experimental; urgency=low
+
+  * New upstream release
+  * Applied X-Face header display support.
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 21 Apr 2004 15:13:24 +0900
+
+evolution1.5 (1.5.7-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 20 Apr 2004 17:16:04 +0900
+
+evolution1.5 (1.5.6.2-2) experimental; urgency=low
+
+  * Build-Depends on libgail-dev (closes: #241157)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 16 Apr 2004 23:20:40 +0900
+
+evolution1.5 (1.5.6.2-1) experimental; urgency=low
+
+  * New upstream release
+  libgtkhtml3.1-7 is still in incoming... :<
+  * Depends on e-d-s (>= 0.0.91) (closes: #236260, #236328)
+  * use tar.gz upstream source (closes: #241157)
+  * comment out #include <sys/debugreg.h> (closes: #243390)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 16 Apr 2004 13:48:42 +0900
+
+evolution1.5 (1.5.6-1) experimental; urgency=low
+
+  * New upstream release
+  * NOTE:
+    libgtkhtml3.1-7 package had been uploaded already.
+    But it marked as NEW package and waiting for ACCEPTED.
+    So please wait for installing into archive by ftp-maintainer.
+
+ -- Takuo KITAME <kitame@debian.org>  Wed,  7 Apr 2004 14:14:13 +0900
+
+evolution1.5 (1.5.5-1) experimental; urgency=low
+
+  * New upstream release
+  * NOTE:
+    libsoup2.2-3 and libgtkhtml3.1-6 package had been uploaded already.
+    But it marked as NEW package and waiting for ACCEPTED.
+    So please wait for installing into archive by ftp-maintainer.
+
+ -- Takuo KITAME <kitame@debian.org>  Tue,  9 Mar 2004 13:13:05 +0900
+
+evolution1.5 (1.5.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 19 Feb 2004 15:02:12 +0900
+
+evolution1.5 (1.5.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue,  3 Feb 2004 14:34:58 +0900
+
+evolution1.5 (1.5.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 20 Jan 2004 17:03:35 +0900
+
+evolution1.5 (1.5.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Fri,  9 Jan 2004 14:35:23 +0900
+
+evolution1.5 (1.5-1) experimental; urgency=low
+
+  * New upstream release
+  * remove db3 source
+  * Depends: on evolution-data-server
+  * experimental release, package name is evolution1.5
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 15 Dec 2003 16:45:13 +0900
+
+evolution (1.4.5-3) unstable; urgency=low
+
+  * build against G2.4 (closes: #217681)
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 28 Oct 2003 17:22:55 +0900
+
+evolution (1.4.5-2) unstable; urgency=low
+
+  * applied patch imap-reduce-max-command-length (closes: #169209)
+  * Build-Depends on libgnomecanvas2-0 (>= 2.2.0.2) (closes: #211613)
+  * applied patch to handle +1300 time zone (closes: #214533)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 17 Oct 2003 15:05:56 +0900
+
+evolution (1.4.5-1) unstable; urgency=low
+
+  * New upstream release (closes: #210976)
+  * Maintainer upload (closes: #211158, #210917)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 24 Sep 2003 12:44:55 +0900
+
+evolution (1.4.4-2.1) unstable; urgency=medium
+
+  * NMU
+  * [debian/control] Added Build-Depends: libheimdal-dev; added evolution-dev
+    Depends: libsoup2.0-dev, libgal2.0-dev. (Closes: #211158)
+  * New build (using pbuilder), resulting in installable packages.
+    (Closes: #210917)
+
+ -- J.H.M. Dassen (Ray) <jdassen@debian.org>  Sun, 21 Sep 2003 14:58:32 +0200
+
+evolution (1.4.4-2) unstable; urgency=low
+
+  * applied patch to use default encoding when message has no CT: charset= header.
+  * applied patch to fix invalid convert to UTF-8 via IMAP (closes: #207476)
+  * Build-Depends on latest autotools-dev (closes: #201421)
+  * fix debian/script/lib (closes: #158664)
+  * Recommends: gnome-desktop-data (closes: #198917)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed,  3 Sep 2003 12:45:22 +0900
+
+evolution (1.4.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue,  5 Aug 2003 14:43:40 +0900
+
+evolution (1.4.3-2) unstable; urgency=low
+
+  * Update build-depends (closes: 201320, 200958, 200942)
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 15 Jul 2003 11:15:15 +0900
+
+evolution (1.4.3-1) unstable; urgency=low
+
+  * New upstream release (closes: 200826)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 11 Jul 2003 15:41:15 +0900
+
+evolution (1.4.0-4) unstable; urgency=low
+
+  * camel-pop3-store.c: don't send CAPA after login like evo1.2 (closes: #196141)
+  * fix Makefile of conduits (closes: #197682)
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 17 Jun 2003 16:27:47 +0900
+
+evolution (1.4.0-3) unstable; urgency=low
+
+  * Depends on scrollkeeper (${misc:Depends})(closes: #197380)
+  * Fix mozilla depenedency (closes: #197314)
+  * Build with -fPIC (closes: #197561)
+  * regenerate evolution.desktop (closes: #197213, #197248)
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 16 Jun 2003 12:18:36 +0900
+
+evolution (1.4.0-2) unstable; urgency=low
+
+  * Fix debian menu entry (closes: #197209, #192760)
+  * Fix GNOME menu entry  (closes: #197213, #197248)
+  * Build-Depends: on libgnome-pilot2-dev (>= 2.0.9-2) (closes: 196629)
+  * use dh_scrollkeeper (closes: #197111)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 13 Jun 2003 11:54:58 +0900
+
+evolution (1.4.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #196977)
+  * fix build-depends. referred to configure script to know which version is really needed. (closes: #196542)
+  * fix description (closes: #197033)
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 12 Jun 2003 12:12:00 +0900
+
+evolution (1.3.92-2) unstable; urgency=low
+
+  * Remove unnecessary debconf configs (closes: #196229)
+  * debian/evolution.menu: fix entry (closes: #162898,#196299)
+  * debian/rules: Recommends: gnome-pilot-conduits (closes: #161242)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri,  6 Jun 2003 11:37:46 +0900
+
+evolution (1.3.92-1) unstable; urgency=low
+
+  * Upload into unstable/main
+  * fix crash on startup (closes: #195536, #195137, #195133, #195142, #196031, #195986, #195400)
+  * enable pilot support (closes: #195400, #185107)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed,  4 Jun 2003 11:34:52 +0900
+
+evolution1.3 (1.3.92-1) experimental; urgency=low
+
+  * New upstream release
+  * Depends on libgal2.0-common (closes: #194301)
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 28 May 2003 11:41:18 +0900
+
+evolution1.3 (1.3.3-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Wed,  7 May 2003 14:01:04 +0900
+
+evolution1.3 (1.3.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 24 Apr 2003 11:30:33 +0900
+
+evolution1.3 (1.3.1-2) experimental; urgency=low
+
+  * disable broken IPv6 support.
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 31 Mar 2003 17:01:54 +0900
+
+evolution1.3 (1.3.1-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 19 Mar 2003 18:27:07 +0900
+
+evolution (1.2.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Mon, 10 Feb 2003 14:14:21 +0900
+
+evolution (1.2.1-3) unstable; urgency=low
+
+  * Build Depends on psmisc (closes: #169181, #176672, #178642)
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 28 Jan 2003 14:23:56 +0900
+
+evolution (1.2.1-2) unstable; urgency=low
+
+  * Build-Depends on pilot-link (>= 0.11.7),libncurses5-dev (closes: #175308, #175037)
+  * update ja.po
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 27 Dec 2002 15:04:29 +0900
+
+evolution (1.2.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Takuo KITAME <kitame@debian.org>  Tue, 24 Dec 2002 17:28:09 +0900
+
+evolution (1.2.0-4) unstable; urgency=low
+
+  * Build against mozilla 1.2.1, update dependency.
+
+ -- Takuo KITAME <kitame@debian.org>  Wed,  4 Dec 2002 23:02:33 +0900
+
+evolution (1.2.0-3) unstable; urgency=low
+
+  * Build against mozilla 1.2
+  * Fix build-depends (closes: #169414, #170326)
+  * Fix postinst, don't call twice ldconfig (closes: #157893)
+
+ -- Takuo KITAME <kitame@debian.org>  Fri, 29 Nov 2002 10:21:55 +0900
+
+evolution (1.2.0-2) unstable; urgency=low
+
+  * fix evolution-mail-upgrade location (closes: #169088)
+  * recommends gnome-spell (>= 0.5) (closes: #169506)
+  
+ -- Takuo KITAME <kitame@debian.org>  Wed, 20 Nov 2002 08:18:42 +0900
+
+evolution (1.2.0-1) unstable; urgency=low
+
+  * New upstream release (closes: #168702)
+  * Change Maintainer address to @debian.org
+
+ -- Takuo KITAME <kitame@debian.org>  Wed, 13 Nov 2002 12:46:22 +0900
+
+evolution (1.0.8-5) unstable; urgency=low
+
+  * Build against gdk-imlib1
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri, 30 Aug 2002 17:01:56 +0900
+
+evolution (1.0.8-4) unstable; urgency=low
+
+  * Build against libpng2 (closes: #157329)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 20 Aug 2002 16:01:06 +0900
+
+evolution (1.0.8-3) unstable; urgency=low
+
+  * UTF8 Fix omf file. (closes: #152000)
+  * update .desktop file for G2 (closes: #148746)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 19 Aug 2002 05:08:28 +0900
+
+evolution (1.0.8-2) unstable; urgency=low
+
+  * Build against libpisock-dev (>= 0.11.3-2)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 12 Aug 2002 15:38:03 +0900
+
+evolution (1.0.8-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 12 Aug 2002 14:24:43 +0900
+
+evolution (1.0.7-3) unstable; urgency=low
+
+  * Build depends libpisock-dev (>= 0.10.99-3) (closes: 152713)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat, 13 Jul 2002 16:53:09 +0900
+
+evolution (1.0.7-2) unstable; urgency=low
+
+  * libcamel0: Depends on libnss3 (>> 1.0.0)
+  * evolution: Reccomends mozilla-psm (>> 1.0.0).
+    added README.SSL (closes: #151446)
+  * Build against libpisock5 (closes: #151677)
+
+ -- Takuo KITAME <kitame@northeye.org>  Wed,  3 Jul 2002 12:39:20 +0900
+
+evolution (1.0.7-1) unstable; urgency=low
+
+  * New upstream release.
+  * build against gtkhtml 1.0.4
+  * debian/rules: mozilla include path is /usr/include/mozilla-1.0.0/{nspr,nss}
+    (closes: #147149)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 17 Jun 2002 12:45:46 +0900
+
+evolution (1.0.5-1) unstable; urgency=low
+
+  * New upstream release.
+  * move some executables into /usr/lib/evolution/ (closes: #126044)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 14 May 2002 10:11:12 +0900
+
+evolution (1.0.3-3) unstable; urgency=critical
+
+  * debian/patches/24140.patch
+    - fix Possible DoS attack through message headers (closes: #145903)
+  * remove evolution-dev package from control. It is useless. (closes: #144269)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 28 Apr 2002 00:26:42 +0900
+
+evolution (1.0.3-2) unstable; urgency=low
+
+  * fix menu entry (closes: #142418)
+  * fix Description (closes: #141328)
+  * applied patch to changes a default charset for Japanese (closes: #142365)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat, 13 Apr 2002 04:05:48 +0900
+
+evolution (1.0.3-1) unstable; urgency=low
+
+  * New upstrem release.
+  * removed upstream merged patches
+    - debian/patches/fix-mail-crash
+    - debian/patches/pgpfix
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 26 Mar 2002 17:10:49 +0900
+
+evolution (1.0.2-3) unstable; urgency=low
+
+  * move to main from non-US
+  * menu category is Apps/Net (closes: #137976)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 24 Mar 2002 04:19:58 +0900
+
+evolution (1.0.2-2) unstable; urgency=low
+
+  * debian/patches/pgpfix:
+    - added to fix verifying pgp signed message (closes: #137045)
+  * debian/patches/fix-mail-crash:
+    - added to fix crashing mail (patch from bugzilla.ximian.com #19564) (closes: #132433)
+  * fix conduits icon path (closes: #131115)
+  * debian/control:
+    - evolution suggests gnome-spell (closes: #119518, #123760)
+
+ -- Takuo KITAME <kitame@northeye.org>  Wed,  6 Mar 2002 18:08:40 +0900
+
+evolution (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/evolution.menu:
+    - fix package name (closes: #129436)
+  * debian/control:
+    - evolution suggests bugbuddy (closes: #131790)
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri,  1 Feb 2002 16:32:59 +0900
+
+evolution (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against libgal19
+  * debian/patches/{calendar-import-from-korganizer-fix,addressbook-conduit-backport-1.0.1}:
+    - removed (fixed by upstream)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 13 Jan 2002 23:16:23 +0900
+
+evolution (1.0-5) unstable; urgency=high
+
+  * Build fix (krb4 related)for powerpc. (closes: #127457)
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri,  4 Jan 2002 00:31:00 +0900
+
+evolution (1.0-4) unstable; urgency=high
+
+  * debian/patches/addressbook-conduit-backport-1.0.1:
+    - Backport from EVOLUTION_1_0_1. It includes conduit bug fix. (closes: #123892)
+  * debian/patches/calendar-import-from-korganizer-fix
+    - added to fix import from korganizer (closes: #122327)
+  * debian/patches/libical-char-signed-char:
+    - fix for arch which's char is unsigned char. (closes: #126997)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 31 Dec 2001 05:45:33 +0900
+
+evolution (1.0-3) unstable; urgency=low
+
+  * debian/rules,debian/control:
+    - support SSL/Kerberos45, move to non-us, evolution-ssl is obsolete. (closes: #116665)
+    - Replaces,Provides with evolution-ssl
+   * It's time for remove evolution-ssl from ftp archive.
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 23 Dec 2001 07:26:42 +0900
+
+evolution (1.0-2) unstable; urgency=low
+
+  * Applied fPIC patch of Bug#124141 (closes: #124141)
+  * Applied correcthelosmtp.diff of Bug#123922 (closes: #123922)
+  * debian/control:
+    - remove beta notice from Description.
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 17 Dec 2001 07:19:43 +0000
+
+evolution (1.0-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build against libgtkhtml20
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue,  4 Dec 2001 06:20:56 +0000
+
+evolution (0.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Provides mail-reader and imap-client.
+
+  * some bugs were fixed by upstream
+   - undefined symbol in pilot conduits (closes: #119153, #119677)
+   - Crashing while starting the program. (closes: #112519)
+   - some crashing evolution-mail (closes: #115073, #100120)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 20 Nov 2001 03:49:50 +0000
+
+evolution (0.99.0-2) unstable; urgency=low
+
+  * fix build fail with creating KDE_APPLNK_DIR (closes: #118918)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat, 10 Nov 2001 09:27:27 +0000
+
+evolution (0.99.0-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed Calendar/Task componet crash (closes: #117208, #117209)
+  * Build-depends: libgal-dev (>= 0.18), libgtkhtml-dev (>= 0.16.0)
+
+ -- Takuo KITAME <kitame@northeye.org>  Thu,  8 Nov 2001 03:43:00 +0000
+
+evolution (0.16-1) unstable; urgency=low
+
+  * New upstream release
+  * Task/Calendar is still broken!! wait for next upstream.
+  * build against latest libraries, update Build-Depends.
+  * fixed splash (closes: #117211)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun,  4 Nov 2001 06:48:57 +0000
+
+evolution (0.15-6) unstable; urgency=low
+
+  * rebuild with libgconf11 1.0.6-3 (closes: #115944)
+  * fixed build-dep (closes: #116663)
+  * Suggests: gnupg
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 23 Oct 2001 02:24:14 +0900
+
+evolution (0.15-5) unstable; urgency=low
+
+  * build against libgtkhtml18 (>= 0.15.0-3) which is without GConf
+    (closes: #116077, #115944)
+  * build against libgal15
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat, 20 Oct 2001 19:43:35 +0900
+
+evolution (0.15-4) unstable; urgency=low
+
+  * build-depends libgal-dev (>= 0.14), gtkhtml (>= 0.14) (closes: #114026)
+    + libgnome-pilot1-dev, gnome-pilot (>= 0.1.62)
+  * --enable-pilot-conduits (closes: #90290)
+  * remove --enable-nntp (closes: #115755)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 16 Oct 2001 19:24:02 +0900
+
+evolution (0.15-3) unstable; urgency=low
+
+  * build against GAL 0.14
+
+ -- Takuo KITAME <kitame@northeye.org>  Thu, 11 Oct 2001 15:38:14 +0900
+
+evolution (0.15-2) unstable; urgency=low
+
+  * build against libgtkhtml17
+  * --disable-gtk-doc
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue,  9 Oct 2001 09:17:46 +0900
+
+evolution (0.15-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/rules: based on evolution-ssl package.
+  * remove rdf encoding patch, it was merged into upstream.
+    http://bugzilla.ximian.com/show_bug.cgi?id=11160
+  * build against gtkhtml 0.13.0 but it is wrong.
+    I'll rebuild after installed 0.14.0
+  * fix bug about GPG clear signed mail
+    http://bugzilla.ximian.com/show_bug.cgi?id=11548
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri,  5 Oct 2001 16:58:29 +0900
+
+evolution (0.14-2) unstable; urgency=low
+
+  * Added DebianPlanet and Slashdot Japan into ExectiveSummary NewsFeed.
+  * take RDF encoding property in ExectiveSummary NewsFeed.
+  * close old bug about dependency. (closes: #99963)
+  * about
+    #112519 (Configuration database not found. on 0.13),
+    #107852 (Segfault on startup with evolution-shell-WARNING **: CORBA exception ... on 0.12),
+    #86405 (another crash with querying "bigfoot" for address data. on 0.8cvs),
+    #94254 (Mail component crash after sending mail. on 0.9),
+    #97487 (None of evolution's oaf objects are being embedded. on 0.10),
+    #99434 (takes for eva to load. on 0.10),
+    #106412 (doesn't load contact list. on 0.11 with old gtkhtml),
+    #107911 (evolution crashes when trying to empty trash. on 0.12.1),
+    #112401, #112656 (Error: Could not create composer window. on 0.13, I think it is gtkhtml problem),
+    I've checked and checked with evolution 0.14. and couldn't reproduce.
+    I think they were fixed by upstream. close it.
+    and feel free to reopen them if it wasn't fixed.
+    (closes: #112519,#107852,#86405,#94254,#97487,#99434,#106412,#107911,#112401,#112656)  
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 30 Sep 2001 15:03:51 +0900
+
+evolution (0.14-1) unstable; urgency=low
+
+  * New upstream release.
+  * it fixes gnome-vfs build problem (closes: #113292)
+
+ -- Takuo KITAME <kitame@northeye.org>  Wed, 26 Sep 2001 22:45:45 +0900
+
+evolution (0.13-2) unstable; urgency=low
+
+  * fix description. (closes: #111632)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat,  8 Sep 2001 07:35:25 +0900
+
+evolution (0.13-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix description (closes: #111363)
+  * Fix #107626: Cannot read mbox files in /var/mail/ 
+        #107881: evolution: lock problem and permission in /var/spool/mail
+    (closes: #107626, #107881)
+    Thanks, Dominik 'Aeneas' Schnitzer <dominik@schnitzer.at>
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri,  7 Sep 2001 19:02:45 +0900
+
+evolution (0.12+cvs0903-2) unstable; urgency=low
+
+  * Fix build-depends (closes: #111079, #111159)
+
+ -- Takuo KITAME <kitame@northeye.org>  Wed,  5 Sep 2001 19:42:07 +0900
+
+evolution (0.12+cvs0903-1) unstable; urgency=low
+
+  * CVS update -r evolution-0-13-branch
+  * Build with libgtkhtml15
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon,  3 Sep 2001 19:33:39 +0900
+
+evolution (0.12+cvs0831-1) unstable; urgency=low
+
+  * New upstream release. (CVS version for GAL update)
+  * build with latest gal (closes: Bug#110765, Bug#110749)
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri, 31 Aug 2001 19:02:14 +0900
+
+evolution (0.12-1) unstable; urgency=low
+
+  * New upstream release.
+  * Fix build problem when /bin/sh -> ash (closes: Bug#98205)
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri,  3 Aug 2001 21:55:42 +0900
+
+evolution (0.11.0-1) unstable; urgency=low
+
+  * bump upstream version, orig.tar.gz changes.
+    source includes db3-3.1.17
+  * link with db3 3.1.17 staticaly (closes: Bug#106303)
+  * Fix debian/docs (closes: Bug#106718)
+  * --with-openldap (closes: Bug#106478)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sat, 28 Jul 2001 10:53:22 +0900
+
+evolution (0.11-1) unstable; urgency=low
+
+  * New upstream release. (closes: Bug#98319)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 23 Jul 2001 21:20:38 +0900
+
+evolution (0.10-2) unstable; urgency=low
+
+  * Fix camel patch (closes: #97617)
+  * debian/control: evolution-dev replaces evolution << 0.10 (closes: Bug#97460)
+
+ -- Takuo KITAME <kitame@northeye.org>  Fri, 18 May 2001 13:54:45 +0900
+
+evolution (0.10-1) unstable; urgency=low
+
+  * New upstream release (cvs update -r EVOLUTION_0_10)
+  * use dbs_make for build package.
+  * closes: Bug#89763 Evolution help documentation is missing.
+  * closes: Bug#92507 evolution: Evolution's help menus dont work because /usr/share/gnome/help/evolution/C is empty
+  * build with libgal6 (closes: Bug#95708)
+  * build with libgtkhtml9 (closes: Bug#97316)
+
+ -- Takuo KITAME <kitame@northeye.org>  Sun, 13 May 2001 23:03:06 +0900
+
+evolution (0.9-2) unstable; urgency=low
+
+  * Build-Depends: libgnome-vfs-dev (closes: Bug#90917)
+
+ -- Takuo KITAME <kitame@northeye.org>  Mon, 26 Mar 2001 23:34:30 +0900
+
+evolution (0.9-1) unstable; urgency=low
+
+  * New upstream release
+  * rebuild with gal-0.5 (closes: Bug#89645)
+
+ -- Takuo KITAME <kitame@northeye.org>  Thu, 15 Mar 2001 11:21:59 +0900
+
+evolution (0.8.0.cvs20010311-1) unstable; urgency=low
+
+  * New upstream release (CVS snapshot)
+  * libcamel0: include camel-providers/*/*.so (closes: Bug#87032,Bug#86403,Bug#88927,Bug#88181)
+  * hopefully fix #87796: could not create composer window (closes: Bug#87796)
+  * evolution-dev: remove ical development files (closes: Bug#86402)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 13 Mar 2001 11:29:37 +0900
+
+evolution (0.8.0.cvs20010214-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: libical install to /usr/lib/libical (closes: Bug#86398)
+    note that does libical exists in main? I couldn't find the package.
+  * debian/contorol: fix Build-Depends (closes: Bug#86344)
+  * versioned depends on bonobo (closes: Bug#86562)
+
+ -- Takuo KITAME <kitame@northeye.org>  Wed, 28 Feb 2001 17:41:19 +0900
+
+evolution (0.8.0.cvs20010212-1) unstable; urgency=low
+
+  * New upstream release
+  * use CVS version because for GAL 0.5, Bonobo 0.36 (latest Debian package)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 13 Feb 2001 23:44:24 +0900
+
+evolution (0.8-1) unstable; urgency=low
+
+  * Initial Release, referenced from Akira TAGOH's diff.gz (0.8.cvs20010212-2)
+
+ -- Takuo KITAME <kitame@northeye.org>  Tue, 13 Feb 2001 21:30:43 +0900
+
+
--- evolution-2.28.3.orig/debian/README.Debian
+++ evolution-2.28.3/debian/README.Debian
@@ -0,0 +1,27 @@
+Evolution for Debian
+====================
+
+IMAP
+----
+
+In versions prior to 2.8, two different IMAP providers (backend modules) were installed. "IMAP" was considered more stable and "IMAP4rev1" had a few experimental features. Starting with version 2.8, IMAP4rev1 has been removed. All accounts with IMAP4rev1 set as server type for incoming email must be switched to IMAP.
+
+Mailbox corruption
+------------------
+
+Mailbox summary corruption is an issue that is known to appear in exceptional cases as reported in http://bugs.debian.org/295270 and http://bugs.debian.org/347703. A typical symptom is the error message: "Error while Refreshing folder: Summary and folder mismatch, even after a sync." No data is lost, but one or more summary files are corrupted.
+
+Before fixing the problem, backup your ~/.evolution folder just in case. Delete ~/.evolution/mail/local/MAILBOX.ev-summary where MAILBOX is your mailboxes. For example, the inbox summary file is Inbox.ev-summary. To rebuild the summaries, restart evolution and evolution-data-server.
+
+Common console error messages
+---------------------
+libnm_glib_nm_state_cb: dbus returned an error.
+  (org.freedesktop.DBus.Error.ServiceUnknown) The name org.freedesktop.NetworkManager was not provided by any .service files
+
+Evolution cannot contact network-manager, most likely because it is not installed. The error message only indicates that network-manager will not be used, and automatic offline mode is disabled.
+
+
+libnm_glib_nm_state_cb: dbus returned an error.
+  (org.freedesktop.DBus.Error.AccessDenied) A security policy in place prevents this sender from sending this message to this recipient, see message bus configuration file (rejected message had interface "org.freedesktop.NetworkManager" member "state" error name "(unset)" destination "org.freedesktop.NetworkManager")
+
+Access is denied to the network-manager service. The required permissions can be configured in /etc/dbus-1/system.d/NetworkManager.conf. A typical way to acquire permission is to add the current user to the 'netdev' group. As with missing network-manager, the default fallback if access is denied is to toggle offline operation manually.
--- evolution-2.28.3.orig/debian/copyright
+++ evolution-2.28.3/debian/copyright
@@ -0,0 +1,117 @@
+This package was debianized by Takuo KITAME <takuo@northeye.org> on
+Tue, 13 Feb 2001 21:33:43 +0900.
+
+It was downloaded from <http://ftp.gnome.org/pub/GNOME/sources/evolution/>.
+
+ Copyright 2003 Ximian, Inc. (www.ximian.com)
+
+ Authors:
+
+Addressbook
+        Arturo Esponosa <arturo@nuclecu.unam.mx> (Original Gnomecard author)
+        Nat Friedman <nat@ximian.com>
+        Chris Lahey <clahey@ximian.com>
+        Chris Toshok <toshok@ximian.com>
+        Jon Trowbridge <trow@ximian.com>
+
+Artwork
+        Tuomas Kuosmanen <tigert@ximian.com>
+        Jakub Steiner <jimmac@ximian.com>
+
+Calendar
+        Seth Alves <seth@ximian.com>
+        Eric Busboom <eric@softwarestudio.org> (libical author)
+        Arturo Esponosa <arturo@nuclecu.unam.mx> (Gnomecal contributor)
+        Damon Chaplin <damon@ximian.com>
+        Federico Mena-Quintero <federico@ximian.com>
+        Rodrigo Moya <rodrigo@ximian.com>
+        Jesse Pavel <jesse@ximian.com>
+        JP Rosevear <jpr@ximian.com>
+        Russell Steinthal <rms39@columbia.edu> (Gnomecal maintainer)
+
+Documentation
+        Kevin Breit <mrproper@ximian.com>
+        Aaron Weber <aaron@ximian.com>
+
+Mailer
+        Radek Doulik <rodo@ximian.com>
+        Larry Ewing <lewing@ximian.com>
+        Bertrand Guiheneuf <bertrand@ximian.com>
+        Jason Leach <jleach@ximian.com>
+        Matt Loper <matt@ximian.com>
+        Ettore Perazzoli <ettore@ximian.com>
+        Jeffrey Stedfast <fejj@ximian.com>
+        Jon Trowbridge <trow@ximian.com>
+        Peter Williams <peterw@ximian.com>
+        Dan Winship <danw@ximian.com>
+        Michael Zucchi <notzed@ximian.com>
+
+Notes
+        Anders Carlsson <andersca@gnu.org>
+
+Pilot
+        JP Rosevear <jpr@ximian.com>
+
+Shell
+        Miguel de Icaza <miguel@ximian.com>
+        Jason Leach <jleach@ximian.com>
+        Ettore Perazzoli <ettore@ximian.com>
+
+Translations
+        Akira TAGOH <tagoh@gnome.gr.jp>
+        Andraz Tori <andraz.tori1@guest.arnes.si>
+        Andreas Hyden <a.hyden@cyberpoint.se>
+        Arjan Scherpenisse <acscherp@wins.uva.nl>
+        Clara Tattoni <clara.tattoni@libero.it>
+        Fatih Demir <kabalak@gmx.net>
+        Gediminas Paulauskas <menesis@delfi.lt>
+        GNOME PL Team <translators@gnome.pl>
+        Gustavo Maciel Dias Vieira <gdvieira@zaz.com.br>
+        Héctor García Alvarez <hector@scouts-es.org>
+        Jesús Bravo Álvarez <jba@pobox.com>
+        Keld Simonsen <keld@dkuug.dk>
+        Kjartan Maraas <kmaraas@gnome.org>
+        Matthias Warkus <mawa@iname.com>
+        Spiros Papadimitriou <spapadim+@cs.cmu.edu>
+        Sung-Hyun Nam <namsh@kldp.org>
+        Szabolcs BAN <shooby@gnome.hu>
+        Tiago Antão <tiagoantao@bigfoot.com>
+        Duarte Loreto <happyguy_pt@hotmail.com>
+        Valek Filippov <frob@df.ru>
+        Vincent Renardias <vincent@redhat.com>
+        Yuri Syrota <rasta@renome.rovno.ua>
+
+UI
+        Anna Dirks <anna@ximian.com>
+
+Widgets
+        Damon Chaplin <damon@ximian.com>
+        Miguel de Icaza <miguel@ximian.com>
+        Chris Lahey <clahey@ximian.com>
+        Federico Mena-Quintero <federico@ximian.com>
+        Chris Toshok <toshok@ximian.com>
+
+ (The full list is in the /usr/share/doc/evolution/AUTHORS file.)
+
+ The documentation material is placed under the GNU Free Documentation License
+ and hence can not be included in Debian.
+
+Program License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
--- evolution-2.28.3.orig/debian/compat
+++ evolution-2.28.3/debian/compat
@@ -0,0 +1 @@
+5
--- evolution-2.28.3.orig/debian/NEWS.Debian
+++ evolution-2.28.3/debian/NEWS.Debian
@@ -0,0 +1,21 @@
+evolution (2.24.5-2) unstable; urgency=low
+
+  * Evolution 2.24 now uses an sqlite database to store the messages
+    summaries, so at first restart it'll generate the database. That could
+    take some time for large messages folders.
+  * Evolution 2.24 is a large upgrade, and touches many things, so, just in
+    case, you should make sure:
+    - to make a backup of current setup, either by using the integrated
+      plugin or by backing up your $HOME/.evolution folders.
+    - to shutdown Evolution completely before upgrading, using:
+      evolution --force-shutdown
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Wed, 11 Mar 2009 23:41:01 +0100
+
+evolution (2.2.2-2) unstable; urgency=low
+
+  * Plugin package is available now.
+    Please install 'evolution-plugins' package if you want to use it.
+
+ -- Takuo KITAME <kitame@debian.org>  Thu, 14 Apr 2005 12:12:38 +0900
+
--- evolution-2.28.3.orig/debian/evolution-common.docs
+++ evolution-2.28.3/debian/evolution-common.docs
@@ -0,0 +1,6 @@
+NEWS
+README
+AUTHORS
+HACKING
+MAINTAINERS
+debian/NEWS.Debian
--- evolution-2.28.3.orig/debian/patches/79_relayout_preferences.patch
+++ evolution-2.28.3/debian/patches/79_relayout_preferences.patch
@@ -0,0 +1,560 @@
+=== modified file 'mail/mail-config.glade'
+--- mail/mail-config.glade	2009-09-08 10:58:55 +0000
++++ mail/mail-config.glade	2009-09-23 12:02:53 +0000
+@@ -549,8 +549,8 @@
+ 			      <property name="invisible_char">*</property>
+ 			      <property name="activates_default">False</property>
+ 			      <accessibility>
++				<atkrelation target="label464" type="labelled-by"/>
+ 				<atkrelation target="identity_address_label" type="labelled-by"/>
+-				<atkrelation target="label464" type="labelled-by"/>
+ 			      </accessibility>
+ 			    </widget>
+ 			    <packing>
+@@ -632,8 +632,8 @@
+ 			      <property name="invisible_char">*</property>
+ 			      <property name="activates_default">False</property>
+ 			      <accessibility>
+-				<atkrelation target="label464" type="labelled-by"/>
+ 				<atkrelation target="identity_full_name_label" type="labelled-by"/>
++				<atkrelation target="label464" type="labelled-by"/>
+ 			      </accessibility>
+ 			    </widget>
+ 			    <packing>
+@@ -835,8 +835,8 @@
+ 			  <property name="invisible_char">*</property>
+ 			  <property name="activates_default">False</property>
+ 			  <accessibility>
++			    <atkrelation target="label466" type="labelled-by"/>
+ 			    <atkrelation target="identity_organization_label" type="labelled-by"/>
+-			    <atkrelation target="label466" type="labelled-by"/>
+ 			  </accessibility>
+ 			</widget>
+ 			<packing>
+@@ -889,8 +889,8 @@
+ 			  <property name="invisible_char">*</property>
+ 			  <property name="activates_default">False</property>
+ 			  <accessibility>
+-			    <atkrelation target="label466" type="labelled-by"/>
+ 			    <atkrelation target="reply_to_label" type="labelled-by"/>
++			    <atkrelation target="label466" type="labelled-by"/>
+ 			  </accessibility>
+ 			</widget>
+ 			<packing>
+@@ -4732,249 +4732,6 @@
+ 	  <property name="spacing">12</property>
+ 
+ 	  <child>
+-	    <widget class="GtkVBox" id="FontsFrame">
+-	      <property name="visible">True</property>
+-	      <property name="homogeneous">False</property>
+-	      <property name="spacing">6</property>
+-
+-	      <child>
+-		<widget class="GtkLabel" id="label492">
+-		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Message Fonts&lt;/span&gt;</property>
+-		  <property name="use_underline">False</property>
+-		  <property name="use_markup">True</property>
+-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		  <property name="wrap">False</property>
+-		  <property name="selectable">False</property>
+-		  <property name="xalign">0</property>
+-		  <property name="yalign">0.5</property>
+-		  <property name="xpad">0</property>
+-		  <property name="ypad">0</property>
+-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		  <property name="width_chars">-1</property>
+-		  <property name="single_line_mode">False</property>
+-		  <property name="angle">0</property>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">False</property>
+-		  <property name="fill">False</property>
+-		</packing>
+-	      </child>
+-
+-	      <child>
+-		<widget class="GtkHBox" id="hbox182">
+-		  <property name="visible">True</property>
+-		  <property name="homogeneous">False</property>
+-		  <property name="spacing">12</property>
+-
+-		  <child>
+-		    <widget class="GtkLabel" id="label540">
+-		      <property name="visible">True</property>
+-		      <property name="label" translatable="yes"></property>
+-		      <property name="use_underline">False</property>
+-		      <property name="use_markup">False</property>
+-		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+-		      <property name="wrap">False</property>
+-		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
+-		      <property name="yalign">0.5</property>
+-		      <property name="xpad">0</property>
+-		      <property name="ypad">0</property>
+-		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-		      <property name="width_chars">-1</property>
+-		      <property name="single_line_mode">False</property>
+-		      <property name="angle">0</property>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">False</property>
+-		      <property name="fill">False</property>
+-		    </packing>
+-		  </child>
+-
+-		  <child>
+-		    <widget class="GtkTable" id="table22">
+-		      <property name="visible">True</property>
+-		      <property name="n_rows">1</property>
+-		      <property name="n_columns">1</property>
+-		      <property name="homogeneous">False</property>
+-		      <property name="row_spacing">2</property>
+-		      <property name="column_spacing">6</property>
+-
+-		      <child>
+-			<widget class="GtkVBox" id="vboxMessageFonts">
+-			  <property name="visible">True</property>
+-			  <property name="homogeneous">False</property>
+-			  <property name="spacing">6</property>
+-
+-			  <child>
+-			    <widget class="GtkCheckButton" id="radFontUseSame">
+-			      <property name="visible">True</property>
+-			      <property name="can_focus">True</property>
+-			      <property name="label" translatable="yes">_Use the same fonts as other applications</property>
+-			      <property name="use_underline">True</property>
+-			      <property name="relief">GTK_RELIEF_NORMAL</property>
+-			      <property name="focus_on_click">True</property>
+-			      <property name="active">False</property>
+-			      <property name="inconsistent">False</property>
+-			      <property name="draw_indicator">True</property>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">False</property>
+-			      <property name="fill">False</property>
+-			    </packing>
+-			  </child>
+-
+-			  <child>
+-			    <widget class="GtkTable" id="tblScreen">
+-			      <property name="visible">True</property>
+-			      <property name="n_rows">2</property>
+-			      <property name="n_columns">2</property>
+-			      <property name="homogeneous">False</property>
+-			      <property name="row_spacing">6</property>
+-			      <property name="column_spacing">6</property>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="lblScreenVariable">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">S_tandard Font:</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="mnemonic_widget">FontVariable</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="left_attach">0</property>
+-				  <property name="right_attach">1</property>
+-				  <property name="top_attach">0</property>
+-				  <property name="bottom_attach">1</property>
+-				  <property name="x_options">fill</property>
+-				  <property name="y_options"></property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkFontButton" id="FontFixed">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="title" translatable="yes">Select HTML fixed width font</property>
+-				  <property name="show_style">True</property>
+-				  <property name="show_size">True</property>
+-				  <property name="use_font">False</property>
+-				  <property name="use_size">False</property>
+-				  <property name="focus_on_click">True</property>
+-				  <signal name="font_set" handler="changed"/>
+-				</widget>
+-				<packing>
+-				  <property name="left_attach">1</property>
+-				  <property name="right_attach">2</property>
+-				  <property name="top_attach">1</property>
+-				  <property name="bottom_attach">2</property>
+-				  <property name="x_options">fill</property>
+-				  <property name="y_options"></property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkFontButton" id="FontVariable">
+-				  <property name="visible">True</property>
+-				  <property name="can_focus">True</property>
+-				  <property name="title" translatable="yes">Select HTML variable width font</property>
+-				  <property name="show_style">True</property>
+-				  <property name="show_size">True</property>
+-				  <property name="use_font">False</property>
+-				  <property name="use_size">False</property>
+-				  <property name="focus_on_click">True</property>
+-				  <signal name="font_set" handler="changed"/>
+-				</widget>
+-				<packing>
+-				  <property name="left_attach">1</property>
+-				  <property name="right_attach">2</property>
+-				  <property name="top_attach">0</property>
+-				  <property name="bottom_attach">1</property>
+-				  <property name="x_options">fill</property>
+-				  <property name="y_options"></property>
+-				</packing>
+-			      </child>
+-
+-			      <child>
+-				<widget class="GtkLabel" id="label444">
+-				  <property name="visible">True</property>
+-				  <property name="label" translatable="yes">Fix_ed width Font:</property>
+-				  <property name="use_underline">True</property>
+-				  <property name="use_markup">False</property>
+-				  <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-				  <property name="wrap">False</property>
+-				  <property name="selectable">False</property>
+-				  <property name="xalign">0</property>
+-				  <property name="yalign">0.5</property>
+-				  <property name="xpad">0</property>
+-				  <property name="ypad">0</property>
+-				  <property name="mnemonic_widget">FontFixed</property>
+-				  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+-				  <property name="width_chars">-1</property>
+-				  <property name="single_line_mode">False</property>
+-				  <property name="angle">0</property>
+-				</widget>
+-				<packing>
+-				  <property name="left_attach">0</property>
+-				  <property name="right_attach">1</property>
+-				  <property name="top_attach">1</property>
+-				  <property name="bottom_attach">2</property>
+-				  <property name="x_options">fill</property>
+-				  <property name="y_options"></property>
+-				</packing>
+-			      </child>
+-			    </widget>
+-			    <packing>
+-			      <property name="padding">0</property>
+-			      <property name="expand">True</property>
+-			      <property name="fill">True</property>
+-			    </packing>
+-			  </child>
+-			</widget>
+-			<packing>
+-			  <property name="left_attach">0</property>
+-			  <property name="right_attach">1</property>
+-			  <property name="top_attach">0</property>
+-			  <property name="bottom_attach">1</property>
+-			</packing>
+-		      </child>
+-		    </widget>
+-		    <packing>
+-		      <property name="padding">0</property>
+-		      <property name="expand">True</property>
+-		      <property name="fill">True</property>
+-		    </packing>
+-		  </child>
+-		</widget>
+-		<packing>
+-		  <property name="padding">0</property>
+-		  <property name="expand">True</property>
+-		  <property name="fill">True</property>
+-		</packing>
+-	      </child>
+-	    </widget>
+-	    <packing>
+-	      <property name="padding">0</property>
+-	      <property name="expand">False</property>
+-	      <property name="fill">False</property>
+-	    </packing>
+-	  </child>
+-
+-	  <child>
+ 	    <widget class="GtkVBox" id="MessageDisplayFrame">
+ 	      <property name="visible">True</property>
+ 	      <property name="homogeneous">False</property>
+@@ -4983,7 +4740,7 @@
+ 	      <child>
+ 		<widget class="GtkLabel" id="label494">
+ 		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Message Display&lt;/span&gt;</property>
++		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;When displaying messages:&lt;/span&gt;</property>
+ 		  <property name="use_underline">False</property>
+ 		  <property name="use_markup">True</property>
+ 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+@@ -5052,6 +4809,156 @@
+ 			  <property name="spacing">6</property>
+ 
+ 			  <child>
++			    <widget class="GtkVBox" id="vboxMessageFonts">
++			      <property name="visible">True</property>
++			      <property name="homogeneous">False</property>
++			      <property name="spacing">6</property>
++
++			      <child>
++				<widget class="GtkCheckButton" id="radFontUseSame">
++				  <property name="visible">True</property>
++				  <property name="can_focus">True</property>
++				  <property name="label" translatable="yes">_Use the same fonts as other applications</property>
++				  <property name="use_underline">True</property>
++				  <property name="relief">GTK_RELIEF_NORMAL</property>
++				  <property name="focus_on_click">True</property>
++				  <property name="active">False</property>
++				  <property name="inconsistent">False</property>
++				  <property name="draw_indicator">True</property>
++				</widget>
++				<packing>
++				  <property name="padding">0</property>
++				  <property name="expand">False</property>
++				  <property name="fill">False</property>
++				</packing>
++			      </child>
++
++			      <child>
++				<widget class="GtkTable" id="tblScreen">
++				  <property name="visible">True</property>
++				  <property name="n_rows">2</property>
++				  <property name="n_columns">2</property>
++				  <property name="homogeneous">False</property>
++				  <property name="row_spacing">6</property>
++				  <property name="column_spacing">6</property>
++
++				  <child>
++				    <widget class="GtkLabel" id="lblScreenVariable">
++				      <property name="visible">True</property>
++				      <property name="label" translatable="yes">S_tandard Font:</property>
++				      <property name="use_underline">True</property>
++				      <property name="use_markup">False</property>
++				      <property name="justify">GTK_JUSTIFY_RIGHT</property>
++				      <property name="wrap">False</property>
++				      <property name="selectable">False</property>
++				      <property name="xalign">0</property>
++				      <property name="yalign">0.5</property>
++				      <property name="xpad">0</property>
++				      <property name="ypad">0</property>
++				      <property name="mnemonic_widget">FontVariable</property>
++				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++				      <property name="width_chars">-1</property>
++				      <property name="single_line_mode">False</property>
++				      <property name="angle">0</property>
++				    </widget>
++				    <packing>
++				      <property name="left_attach">0</property>
++				      <property name="right_attach">1</property>
++				      <property name="top_attach">0</property>
++				      <property name="bottom_attach">1</property>
++				      <property name="x_options">fill</property>
++				      <property name="y_options"></property>
++				    </packing>
++				  </child>
++
++				  <child>
++				    <widget class="GtkFontButton" id="FontFixed">
++				      <property name="visible">True</property>
++				      <property name="can_focus">True</property>
++				      <property name="title" translatable="yes">Select HTML fixed width font</property>
++				      <property name="show_style">True</property>
++				      <property name="show_size">True</property>
++				      <property name="use_font">False</property>
++				      <property name="use_size">False</property>
++				      <property name="focus_on_click">True</property>
++				      <signal name="font_set" handler="changed"/>
++				    </widget>
++				    <packing>
++				      <property name="left_attach">1</property>
++				      <property name="right_attach">2</property>
++				      <property name="top_attach">1</property>
++				      <property name="bottom_attach">2</property>
++				      <property name="x_options">fill</property>
++				      <property name="y_options"></property>
++				    </packing>
++				  </child>
++
++				  <child>
++				    <widget class="GtkFontButton" id="FontVariable">
++				      <property name="visible">True</property>
++				      <property name="can_focus">True</property>
++				      <property name="title" translatable="yes">Select HTML variable width font</property>
++				      <property name="show_style">True</property>
++				      <property name="show_size">True</property>
++				      <property name="use_font">False</property>
++				      <property name="use_size">False</property>
++				      <property name="focus_on_click">True</property>
++				      <signal name="font_set" handler="changed"/>
++				    </widget>
++				    <packing>
++				      <property name="left_attach">1</property>
++				      <property name="right_attach">2</property>
++				      <property name="top_attach">0</property>
++				      <property name="bottom_attach">1</property>
++				      <property name="x_options">fill</property>
++				      <property name="y_options"></property>
++				    </packing>
++				  </child>
++
++				  <child>
++				    <widget class="GtkLabel" id="label444">
++				      <property name="visible">True</property>
++				      <property name="label" translatable="yes">Fix_ed width Font:</property>
++				      <property name="use_underline">True</property>
++				      <property name="use_markup">False</property>
++				      <property name="justify">GTK_JUSTIFY_RIGHT</property>
++				      <property name="wrap">False</property>
++				      <property name="selectable">False</property>
++				      <property name="xalign">0</property>
++				      <property name="yalign">0.5</property>
++				      <property name="xpad">0</property>
++				      <property name="ypad">0</property>
++				      <property name="mnemonic_widget">FontFixed</property>
++				      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
++				      <property name="width_chars">-1</property>
++				      <property name="single_line_mode">False</property>
++				      <property name="angle">0</property>
++				    </widget>
++				    <packing>
++				      <property name="left_attach">0</property>
++				      <property name="right_attach">1</property>
++				      <property name="top_attach">1</property>
++				      <property name="bottom_attach">2</property>
++				      <property name="x_options">fill</property>
++				      <property name="y_options"></property>
++				    </packing>
++				  </child>
++				</widget>
++				<packing>
++				  <property name="padding">0</property>
++				  <property name="expand">True</property>
++				  <property name="fill">True</property>
++				</packing>
++			      </child>
++			    </widget>
++			    <packing>
++			      <property name="padding">0</property>
++			      <property name="expand">True</property>
++			      <property name="fill">True</property>
++			    </packing>
++			  </child>
++
++			  <child>
+ 			    <widget class="GtkHBox" id="hboxReadTimeout">
+ 			      <property name="visible">True</property>
+ 			      <property name="homogeneous">False</property>
+@@ -5205,7 +5112,8 @@
+ 
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hbox233">
+-			      <property name="visible">True</property>
++            <property name="no_show_all">True</property>
++			      <property name="sensitive">False</property>
+ 			      <property name="homogeneous">False</property>
+ 			      <property name="spacing">0</property>
+ 
+@@ -5446,7 +5354,8 @@
+ 
+ 			  <child>
+ 			    <widget class="GtkHBox" id="hboxEnableSearchFolders">
+-			      <property name="visible">True</property>
++            <property name="no_show_all">True</property>
++			      <property name="sensitive">False</property>
+ 			      <property name="homogeneous">False</property>
+ 			      <property name="spacing">6</property>
+ 
+@@ -5539,7 +5448,7 @@
+ 	      <child>
+ 		<widget class="GtkLabel" id="label496">
+ 		  <property name="visible">True</property>
+-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Delete Mail&lt;/span&gt;</property>
++		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;For deleted mail:&lt;/span&gt;</property>
+ 		  <property name="use_underline">False</property>
+ 		  <property name="use_markup">True</property>
+ 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+
+=== modified file 'shell/e-shell-settings-dialog.c'
+--- shell/e-shell-settings-dialog.c	2009-09-08 10:58:55 +0000
++++ shell/e-shell-settings-dialog.c	2009-09-10 14:59:12 +0000
+@@ -294,9 +294,52 @@
+ }
+ 
+ static void
++show_help (GtkWidget *button, GtkWindow *dialog)
++{
++  e_display_help (dialog, "config-prefs");
++}
++
++static void
++setup_help_button (EShellSettingsDialog *dialog, GtkWidget *content_area)
++{
++  GList *children;
++  GtkWidget *hbox, *scroll;
++  GtkWidget *vbox, *help;
++
++  children = gtk_container_get_children (GTK_CONTAINER (content_area));
++  if (!children || !children->data)
++    return;
++  hbox = children->data;
++  g_list_free (children);
++
++  children = gtk_container_get_children (GTK_CONTAINER (hbox));
++  if (!children || !children->data)
++    return;
++  scroll = children->data;
++  g_list_free (children);
++
++  vbox = gtk_vbox_new (FALSE, 8);
++  gtk_widget_show (vbox);
++  
++  gtk_widget_reparent (scroll, vbox);
++  gtk_box_set_child_packing (GTK_BOX (vbox), scroll, TRUE, TRUE, 0,
++                             GTK_PACK_START);
++  
++  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
++  gtk_box_reorder_child (GTK_BOX (hbox), vbox, 0);
++
++  help = gtk_button_new_from_stock (GTK_STOCK_HELP);
++  gtk_box_pack_start (GTK_BOX (vbox), help, FALSE, FALSE, 0);
++  gtk_widget_show (help);
++  g_signal_connect (help, "clicked", G_CALLBACK (show_help), dialog);
++}
++
++static void
+ e_shell_settings_dialog_init (EShellSettingsDialog *dialog)
+ {
+ 	EShellSettingsDialogPrivate *priv;
++  GtkWidget *action_area;
++  GtkWidget *content_area;
+ 
+ 	priv = g_new (EShellSettingsDialogPrivate, 1);
+ 	priv->types = g_hash_table_new_full (
+@@ -311,6 +354,13 @@
+ 
+ 	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Preferences"));
+ 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
++
++  action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
++  gtk_widget_set_no_show_all (action_area, TRUE);
++  gtk_widget_hide (action_area);
++
++  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
++  setup_help_button (dialog, content_area);   
+ }
+ 
+ 
+
--- evolution-2.28.3.orig/debian/patches/93_allow_setting_alarms_on_any_meeting_3.patch
+++ evolution-2.28.3/debian/patches/93_allow_setting_alarms_on_any_meeting_3.patch
@@ -0,0 +1,50 @@
+From 22e540a225da939e9de02912d638402d2353b129 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Wed, 28 Apr 2010 14:46:15 +0000
+Subject: Bug 594153 (3/3) - Allow setting alarms on any meeting
+
+By tying the attachment view "editable" action group to comp-editor
+"individual" group, these add/remove actions are marked sensitive /
+insensitive in sync with the existing "Insert" menu items which are
+already in the "individual" group.
+
+Though not introduced with the other symptoms of this bug
+(0597b877c5bf4d21ac4048742ddf6b11e24877ba), the descreptency fixed
+here is integrally related.
+---
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 7d27474..10390e6 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -36,6 +36,7 @@
+ #include <glib/gstdio.h>
+ #include <gdk/gdkkeysyms.h>
+ #include <e-util/e-util.h>
++#include <e-util/e-binding.h>
+ #include <e-util/e-dialog-utils.h>
+ #include <e-util/e-util-private.h>
+ #include <e-util/gconf-bridge.h>
+@@ -1553,6 +1554,7 @@ comp_editor_init (CompEditor *editor)
+ 	GtkTargetList *target_list;
+ 	GtkTargetEntry *targets;
+ 	GtkActionGroup *action_group;
++	GtkActionGroup *action_group_2;
+ 	GtkAction *action;
+ 	GtkWidget *container;
+ 	GtkWidget *widget;
+@@ -1746,6 +1748,13 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_window_set_type_hint (
+ 		GTK_WINDOW (editor), GDK_WINDOW_TYPE_HINT_NORMAL);
+ 
++	action_group = comp_editor_get_action_group (editor, "individual");
++	action_group_2 = e_attachment_view_get_action_group (view, "editable");
++
++	e_binding_new (
++		action_group, "sensitive",
++		action_group_2, "sensitive");
++
+ 	/* Listen for attachment store changes. */
+ 
+ 	store = e_attachment_view_get_store (view);
+--
+cgit v0.8.3.1
--- evolution-2.28.3.orig/debian/patches/74_1024x600_e-sidebar.c.patch
+++ evolution-2.28.3/debian/patches/74_1024x600_e-sidebar.c.patch
@@ -0,0 +1,32 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/shell/e-sidebar.c evolution-2.24.1.new/shell/e-sidebar.c
+--- evolution-2.24.1/shell/e-sidebar.c	2009-02-02 18:49:03.199060000 +0800
++++ evolution-2.24.1.new/shell/e-sidebar.c	2009-02-02 21:30:25.291061522 +0800
+@@ -66,8 +66,8 @@
+ G_DEFINE_TYPE (ESidebar, e_sidebar, GTK_TYPE_CONTAINER)
+ 
+ #define INTERNAL_MODE(sidebar)  (sidebar->priv->mode == E_SIDEBAR_MODE_TOOLBAR ? sidebar->priv->toolbar_mode : sidebar->priv->mode)
+-#define H_PADDING 6
+-#define V_PADDING 6
++#define H_PADDING ( (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) ? 3 : 6 )
++#define V_PADDING ( (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) ? 0 : 6 )
+ 
+ /* Utility functions.  */
+ 
+@@ -563,11 +563,15 @@
+  			  G_CALLBACK (button_pressed_callback), sidebar);
+ 
+ 	hbox = gtk_hbox_new (FALSE, 3);
+-	gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  gtk_container_set_border_width (GTK_CONTAINER (hbox), 0);
++	} else {
++	  gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
++	}
+ 	gtk_widget_show (hbox);
+ 
+ 	icon_widget = gtk_image_new_from_icon_name (
+-		icon_name, GTK_ICON_SIZE_BUTTON);
++	     icon_name, GTK_ICON_SIZE_BUTTON);
+ 	gtk_widget_show (icon_widget);
+ 
+ 	label_widget = gtk_label_new (label);
--- evolution-2.28.3.orig/debian/patches/70_1024x600_contact-editor.c.patch
+++ evolution-2.28.3/debian/patches/70_1024x600_contact-editor.c.patch
@@ -0,0 +1,84 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.25.92/addressbook/gui/contact-editor/e-contact-editor.c evolution-2.25.92.new/addressbook/gui/contact-editor/e-contact-editor.c
+--- evolution-2.25.92/addressbook/gui/contact-editor/e-contact-editor.c	2008-12-09 22:45:00.000000000 +0800
++++ evolution-2.25.92.new/addressbook/gui/contact-editor/e-contact-editor.c	2009-03-04 01:14:32.172084700 +0800
+@@ -3333,6 +3333,80 @@
+ 	gui = glade_xml_new (gladefile, NULL, NULL);
+ 	g_free (gladefile);
+ 
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  GtkWidget *scrolledWindow1024x600,*viewport;
++	  GtkWidget *dialogWindow=NULL;
++	  GtkWidget *child,*mother,*childtablabel,*childmenulabel;
++	  gchar* childlabeltext;
++	  int pagenum;
++
++	  /* add scrolledbar to vbox33 */
++	  child = glade_xml_get_widget(gui,"vbox33");
++	  if (child != NULL) {
++	    mother = gtk_widget_get_parent(child);
++	    pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(mother),child);
++	    childtablabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mother),child);
++	    childmenulabel = gtk_notebook_get_menu_label(GTK_NOTEBOOK(mother),child);
++	    childlabeltext = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(child)));
++	    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	    if (scrolledWindow1024x600 != NULL) {
++	      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	    }
++	    viewport = gtk_viewport_new(NULL,NULL);
++	    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++	    gtk_widget_show(scrolledWindow1024x600);
++	    gtk_widget_show(viewport);
++	    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++	    gtk_notebook_insert_page_menu(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),NULL,childmenulabel,pagenum);
++	    gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),childlabeltext);
++	  }
++	  /* add scrolledbar to vbox35 */
++	  child = glade_xml_get_widget(gui,"vbox35");
++	  if (child != NULL) {
++	    mother = gtk_widget_get_parent(child);
++	    pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(mother),child);
++	    childtablabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mother),child);
++	    childmenulabel = gtk_notebook_get_menu_label(GTK_NOTEBOOK(mother),child);
++	    childlabeltext = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(child)));
++	    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	    if (scrolledWindow1024x600 != NULL) {
++	      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	    }
++	    viewport = gtk_viewport_new(NULL,NULL);
++	    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++	    gtk_widget_show(scrolledWindow1024x600);
++	    gtk_widget_show(viewport);
++	    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++	    gtk_notebook_insert_page_menu(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),NULL,childmenulabel,pagenum);
++	    gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),childlabeltext);
++	  }
++	  /* add scrolledbar to vbox39 */
++	  child = glade_xml_get_widget(gui,"vbox39");
++	  if (child != NULL) {
++	    mother = gtk_widget_get_parent(child);
++	    pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(mother),child);
++	    childtablabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mother),child);
++	    childmenulabel = gtk_notebook_get_menu_label(GTK_NOTEBOOK(mother),child);
++	    childlabeltext = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(child)));
++	    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++	    if (scrolledWindow1024x600 != NULL) {
++	      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++	    }
++	    viewport = gtk_viewport_new(NULL,NULL);
++	    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++	    gtk_widget_show(scrolledWindow1024x600);
++	    gtk_widget_show(viewport);
++	    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++	    gtk_notebook_insert_page_menu(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),NULL,childmenulabel,pagenum);
++	    gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),childlabeltext);
++	  }
++	  /* set default size of dialog smaller */
++	  dialogWindow = glade_xml_get_widget(gui,"contact editor");
++	  if (dialogWindow != NULL) {
++	    gtk_window_set_default_size(GTK_WINDOW(dialogWindow),600,448);
++	  }
++	}
++	  
+ 	e_contact_editor->gui = gui;
+ 
+ 	setup_tab_order(gui);
--- evolution-2.28.3.orig/debian/patches/71_1024x600_em-account-editor.c.patch
+++ evolution-2.28.3/debian/patches/71_1024x600_em-account-editor.c.patch
@@ -0,0 +1,38 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/mail/em-account-editor.c evolution-2.24.1.new/mail/em-account-editor.c
+--- evolution-2.24.1/mail/em-account-editor.c	2008-10-13 16:37:24.000000000 +0800
++++ evolution-2.24.1.new/mail/em-account-editor.c	2009-02-02 17:57:17.099066684 +0800
+@@ -2126,6 +2126,34 @@
+ 	/* We have to add the automatic mail check item with the rest of the receive options */
+ 	row = ((GtkTable *)parent)->nrows;
+ 
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  GtkWidget *the_one,*the_mother;
++	  GtkScrolledWindow *scrolledWindow;
++	  GtkViewport *viewport;
++	  gchar* old_tab_label_text=NULL;
++	  the_one = gtk_widget_get_parent(gtk_widget_get_parent(gtk_widget_get_parent(parent)));
++	  the_mother = gtk_widget_get_parent(the_one);
++	  if (!(the_mother
++		&& gtk_widget_get_parent(the_mother)
++		&& GTK_IS_SCROLLED_WINDOW(gtk_widget_get_parent(the_mother)))) {
++	    scrolledWindow = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new(NULL,NULL));
++	    gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow),GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC);
++	    viewport = GTK_VIEWPORT(gtk_viewport_new(NULL,NULL));
++	    gtk_container_add(GTK_CONTAINER(scrolledWindow),GTK_WIDGET(viewport));
++	    gtk_widget_show(GTK_WIDGET(scrolledWindow));
++	    gtk_widget_show(GTK_WIDGET(viewport));
++	    if (GTK_IS_NOTEBOOK(the_mother)) {
++	      old_tab_label_text = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(the_mother),GTK_WIDGET(the_one)));
++	    }
++	    gtk_widget_reparent(GTK_WIDGET(the_one),GTK_WIDGET(viewport));
++	    gtk_container_add(GTK_CONTAINER(the_mother),GTK_WIDGET(scrolledWindow));
++	    if (GTK_IS_NOTEBOOK(the_mother)) {
++	      gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(the_mother),GTK_WIDGET(scrolledWindow),old_tab_label_text);
++	      g_free(old_tab_label_text);
++	    }
++	  }
++	}
++
+ 	box = gtk_hbox_new (FALSE, 4);
+ 	w = gtk_check_button_new_with_mnemonic (_("Check for _new messages every"));
+ 	emae_account_toggle_widget (emae, (GtkToggleButton *)w, E_ACCOUNT_SOURCE_AUTO_CHECK);
--- evolution-2.28.3.orig/debian/patches/64_translate_autostart_strings.patch
+++ evolution-2.28.3/debian/patches/64_translate_autostart_strings.patch
@@ -0,0 +1,9 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.25.92/po/POTFILES.in evolution-2.25.92.new/po/POTFILES.in
+--- evolution-2.25.92/po/POTFILES.in	2009-03-04 15:05:14.000000000 +0100
++++ evolution-2.25.92.new/po/POTFILES.in	2009-03-04 15:05:38.000000000 +0100
+@@ -538,3 +538,5 @@
+ widgets/table/e-tree-selection-model.c
+ widgets/table/e-tree.c
+ widgets/text/e-text.c
++debian/evolution-alarm-notify.desktop.in
++
--- evolution-2.28.3.orig/debian/patches/10_desktop_shortcuts.patch
+++ evolution-2.28.3/debian/patches/10_desktop_shortcuts.patch
@@ -0,0 +1,20 @@
+=== modified file 'data/evolution.desktop.in.in'
+--- old/data/evolution.desktop.in.in	2009-12-16 22:45:56 +0000
++++ new/data/evolution.desktop.in.in	2010-03-04 05:43:59 +0000
+@@ -15,3 +15,15 @@
+ X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
+ X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-@DATASERVER_EXEC_VERSION@;evolution-exchange-storage;evolution-alarm-notify;
+ 
++X-Ayatana-Desktop-Shortcuts=Compose;Contacts
++
++[Compose Shortcut Group]
++_Name=Compose New Message
++Exec=evolution mailto:
++OnlyShowIn=Messaging Menu
++
++[Contacts Shortcut Group]
++_Name=Contacts
++Exec=evolution -c contacts
++OnlyShowIn=Messaging Menu
++
+
--- evolution-2.28.3.orig/debian/patches/78_1024x600_startup-wizard.c.patch
+++ evolution-2.28.3/debian/patches/78_1024x600_startup-wizard.c.patch
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/plugins/startup-wizard/startup-wizard.c evolution-2.24.1.new/plugins/startup-wizard/startup-wizard.c
+--- evolution-2.24.1/plugins/startup-wizard/startup-wizard.c	2008-10-13 16:37:00.000000000 +0800
++++ evolution-2.24.1.new/plugins/startup-wizard/startup-wizard.c	2009-02-02 19:47:59.591060899 +0800
+@@ -84,6 +84,11 @@
+ 
+ 	gtk_window_set_title (GTK_WINDOW (emae->editor), _("Evolution Setup Assistant"));
+ 
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  gtk_widget_set_size_request(GTK_WIDGET(emae->editor),900,500);
++	  gtk_window_resize(GTK_WINDOW (emae->editor),900,500);
++	}
++
+ 	start_page = GNOME_DRUID_PAGE_EDGE (e_config_page_get ((EConfig *) emae->config, "0.start"));
+ 	gnome_druid_page_edge_set_title (start_page, _("Welcome"));
+ 	gnome_druid_page_edge_set_text (start_page, _(""
--- evolution-2.28.3.orig/debian/patches/80_git_rtl_bar.patch
+++ evolution-2.28.3/debian/patches/80_git_rtl_bar.patch
@@ -0,0 +1,28 @@
+From ff2553440bd1f7d76667e71479d50efa1a537e96 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Mon, 29 Mar 2010 15:22:23 +0000
+Subject: Bug 614049 - Attachment bar causes drawing issues in RTL locales
+
+---
+diff --git a/widgets/misc/e-attachment-paned.c b/widgets/misc/e-attachment-paned.c
+index 8e25098..aefd9fa 100644
+--- a/widgets/misc/e-attachment-paned.c
++++ b/widgets/misc/e-attachment-paned.c
+@@ -614,10 +614,15 @@ attachment_paned_init (EAttachmentPaned *paned)
+ 
+ 	/* Request the width to be as large as possible, and let the
+ 	 * GtkExpander allocate what space there is.  This effectively
+-	 * packs the widget to expand. */
++	 * packs the widget to expand.
++	 *
++	 * XXX This hack causes nasty side-effects in RTL locales,
++	 *     so check the reading direction before applying it.
++	 *     See GNOME bug #614049 for details + screenshot. */
+ 	widget = gtk_hbox_new (FALSE, 6);
+ 	gtk_size_group_add_widget (size_group, widget);
+-	gtk_widget_set_size_request (widget, G_MAXINT, -1);
++	if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
++		gtk_widget_set_size_request (widget, G_MAXINT, -1);
+ 	gtk_expander_set_label_widget (GTK_EXPANDER (container), widget);
+ 	gtk_widget_show (widget);
+
--- evolution-2.28.3.orig/debian/patches/62_no_upstream_email_notification_by_default.patch
+++ evolution-2.28.3/debian/patches/62_no_upstream_email_notification_by_default.patch
@@ -0,0 +1,59 @@
+# Description: not enable the notification icon by default since the message indicator is running
+# Ubuntu: https://bugs.launchpad.net/bugs/331571
+#
+diff -r ba95b993f2ba plugins/mail-notification/mail-notification.c
+--- a/plugins/mail-notification/mail-notification.c	Fri Feb 27 15:11:25 2009 -0500
++++ b/plugins/mail-notification/mail-notification.c	Mon Mar 02 09:45:38 2009 -0500
+@@ -81,6 +81,17 @@
+ /*                       Helper functions                               */
+ /* -------------------------------------------------------------------  */
+ 
++/* check if we are running the stracciatella session */
++static gboolean 
++is_stracciatella(void) {
++	if (g_strcmp0(g_getenv("GDMSESSION"), "gnome-stracciatella") == 0) {
++        	g_debug("Running stracciatella GNOME session");
++		return TRUE;
++	} else {
++		return FALSE;
++	}
++}
++
+ static gboolean
+ is_part_enabled (const gchar *gconf_key)
+ {
+@@ -838,9 +850,12 @@
+ 	if (cfg)
+ 		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
+ #endif
+-	cfg = get_config_widget_status ();
+-	if (cfg)
+-		gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
++
++	if (is_stracciatella()) {
++		cfg = get_config_widget_status ();
++		if (cfg)
++			gtk_box_pack_start (GTK_BOX (vbox), cfg, FALSE, FALSE, 0);
++	}
+ 
+ 	cfg = get_config_widget_sound ();
+ 	if (cfg)
+@@ -872,7 +887,7 @@
+ 	if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
+ 		new_notify_dbus (t);
+ #endif
+-	if (is_part_enabled (GCONF_KEY_ENABLED_STATUS))
++	if ((is_stracciatella()) &&  (is_part_enabled (GCONF_KEY_ENABLED_STATUS)))
+ 		new_notify_status (t);
+ 
+ 	if (is_part_enabled (GCONF_KEY_ENABLED_SOUND))
+@@ -912,7 +927,7 @@
+ 		if (is_part_enabled (GCONF_KEY_ENABLED_DBUS))
+ 			enable_dbus (enable);
+ #endif
+-		if (is_part_enabled (GCONF_KEY_ENABLED_STATUS))
++		if ((is_stracciatella()) && (is_part_enabled (GCONF_KEY_ENABLED_STATUS)))
+ 			enable_status (enable);
+ 
+ 		if (is_part_enabled (GCONF_KEY_ENABLED_SOUND))
+
--- evolution-2.28.3.orig/debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch
+++ evolution-2.28.3/debian/patches/91_allow_setting_alarms_on_any_meeting_1.patch
@@ -0,0 +1,162 @@
+From 63fb1857b99f53fbd2506799049b645fce1c1f0c Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Tue, 18 May 2010 20:39:47 +0000
+Subject: Bug 594153 (1/3) - Allow setting alarms on any meeting
+
+This introduces a new action_group called "editable" in the comp-editor
+that can be used by other components to assign actions that should be
+sensitized separately from the existing "individual" group, such as the
+"Alarms" and "Show Time as Busy" event actions.
+
+This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
+where these two actions were accidentally grouped with other actions that
+should legitimately be in the "individual" group.
+---
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 6fc01ca..46e340f 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
+ 	  G_CALLBACK (action_attach_cb) }
+ };
+ 
+-static GtkToggleActionEntry individual_toggle_entries[] = {
++static GtkToggleActionEntry personal_toggle_entries[] = {
+ 
+ 	{ "view-categories",
+ 	  NULL,
+@@ -1603,9 +1603,6 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_action_group_add_actions (
+ 		action_group, individual_entries,
+ 		G_N_ELEMENTS (individual_entries), editor);
+-	gtk_action_group_add_toggle_actions (
+-		action_group, individual_toggle_entries,
+-		G_N_ELEMENTS (individual_toggle_entries), editor);
+ 	gtk_action_group_add_radio_actions (
+ 		action_group, classification_radio_entries,
+ 		G_N_ELEMENTS (classification_radio_entries),
+@@ -1615,6 +1612,16 @@ comp_editor_init (CompEditor *editor)
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+ 
++	action_group = gtk_action_group_new ("editable");
++	gtk_action_group_set_translation_domain (
++		action_group, GETTEXT_PACKAGE);
++	gtk_action_group_add_toggle_actions (
++		action_group, personal_toggle_entries,
++		G_N_ELEMENTS (personal_toggle_entries), editor);
++	gtk_ui_manager_insert_action_group (
++		priv->ui_manager, action_group, 0);
++	g_object_unref (action_group);
++
+ 	action_group = gtk_action_group_new ("coordinated");
+ 	gtk_action_group_set_translation_domain (
+ 		action_group, GETTEXT_PACKAGE);
+diff --git a/calendar/gui/dialogs/event-editor.c b/calendar/gui/dialogs/event-editor.c
+index 7251123..3b9a8d0 100644
+--- a/calendar/gui/dialogs/event-editor.c
++++ b/calendar/gui/dialogs/event-editor.c
+@@ -195,7 +195,7 @@ action_show_time_busy_cb (GtkToggleAction *action,
+ 	event_page_set_show_time_busy (editor->priv->event_page, active);
+ }
+ 
+-static GtkActionEntry event_entries[] = {
++static GtkActionEntry editable_entries[] = {
+ 
+ 	{ "alarms",
+ 	  "appointment-soon",
+@@ -203,6 +203,20 @@ static GtkActionEntry event_entries[] = {
+ 	  NULL,
+ 	  N_("Click here to set or unset alarms for this event"),
+ 	  G_CALLBACK (action_alarms_cb) },
++};
++
++static GtkToggleActionEntry editable_toggle_entries[] = {
++
++	{ "show-time-busy",
++	  GTK_STOCK_DIALOG_ERROR,
++	  N_("Show Time as _Busy"),
++	  NULL,
++	  N_("Toggles whether to show time as busy"),
++	  G_CALLBACK (action_show_time_busy_cb),
++	  FALSE }
++};
++
++static GtkActionEntry event_entries[] = {
+ 
+ 	{ "recurrence",
+ 	  "stock_task-recurring",
+@@ -228,14 +242,6 @@ static GtkToggleActionEntry event_toggle_entries[] = {
+ 	  N_("Toggles whether to have All Day Event"),
+ 	  G_CALLBACK (action_all_day_event_cb),
+ 	  FALSE },
+-
+-	{ "show-time-busy",
+-	  GTK_STOCK_DIALOG_ERROR,
+-	  N_("Show Time as _Busy"),
+-	  NULL,
+-	  N_("Toggles whether to show time as busy"),
+-	  G_CALLBACK (action_show_time_busy_cb),
+-	  FALSE }
+ };
+ 
+ static GtkActionEntry meeting_entries[] = {
+@@ -481,6 +487,14 @@ event_editor_init (EventEditor *ee)
+ 		action_group, event_toggle_entries,
+ 		G_N_ELEMENTS (event_toggle_entries), ee);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_add_actions (
++		action_group, editable_entries,
++		G_N_ELEMENTS (editable_entries), ee);
++	gtk_action_group_add_toggle_actions (
++		action_group, editable_toggle_entries,
++		G_N_ELEMENTS (editable_toggle_entries), ee);
++
+ 	action_group = comp_editor_get_action_group (editor, "coordinated");
+ 	gtk_action_group_add_actions (
+ 		action_group, meeting_entries,
+diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
+index eb95245..fcc1ea9 100644
+--- a/calendar/gui/dialogs/event-page.c
++++ b/calendar/gui/dialogs/event-page.c
+@@ -806,6 +806,9 @@ sensitize_widgets (EventPage *epage)
+ 	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens) || delegate);
+ 	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ 
+diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
+index 83cd00a..511f483 100644
+--- a/calendar/gui/dialogs/memo-page.c
++++ b/calendar/gui/dialogs/memo-page.c
+@@ -373,6 +373,9 @@ sensitize_widgets (MemoPage *mpage)
+ 		}
+ 	}
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ }
+diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
+index 8b5c028..175e218 100644
+--- a/calendar/gui/dialogs/task-page.c
++++ b/calendar/gui/dialogs/task-page.c
+@@ -365,6 +365,9 @@ sensitize_widgets (TaskPage *tpage)
+ 	gtk_widget_set_sensitive (priv->invite, (!read_only &&  sens));
+ 	gtk_widget_set_sensitive (GTK_WIDGET (priv->list_view), !read_only);
+ 
++	action_group = comp_editor_get_action_group (editor, "editable");
++	gtk_action_group_set_sensitive (action_group, !read_only);
++
+ 	action_group = comp_editor_get_action_group (editor, "individual");
+ 	gtk_action_group_set_sensitive (action_group, sensitize);
+ 
+--
+cgit v0.8.3.1
--- evolution-2.28.3.orig/debian/patches/76_1024x600_e-timezone-dialog-1024x600.glade.patch
+++ evolution-2.28.3/debian/patches/76_1024x600_e-timezone-dialog-1024x600.glade.patch
@@ -0,0 +1,359 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/widgets/e-timezone-dialog/e-timezone-dialog-1024x600.glade evolution-2.24.1.new/widgets/e-timezone-dialog/e-timezone-dialog-1024x600.glade
+--- evolution-2.24.1/widgets/e-timezone-dialog/e-timezone-dialog-1024x600.glade	1970-01-01 08:00:00.000000000 +0800
++++ evolution-2.24.1.new/widgets/e-timezone-dialog/e-timezone-dialog-1024x600.glade	2009-02-02 19:59:02.939063631 +0800
+@@ -0,0 +1,335 @@
++<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
++<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
++
++<glade-interface>
++<requires lib="gnome"/>
++
++<widget class="GtkDialog" id="timezone-dialog">
++  <property name="title" translatable="yes">Select a Time Zone</property>
++  <property name="type">GTK_WINDOW_TOPLEVEL</property>
++  <property name="window_position">GTK_WIN_POS_NONE</property>
++  <property name="modal">False</property>
++  <property name="default_width">500</property>
++  <property name="default_height">400</property>
++  <property name="resizable">True</property>
++  <property name="destroy_with_parent">False</property>
++  <property name="decorated">True</property>
++  <property name="skip_taskbar_hint">False</property>
++  <property name="skip_pager_hint">False</property>
++  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
++  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
++  <property name="has_separator">False</property>
++
++  <child internal-child="vbox">
++    <widget class="GtkVBox" id="dialog-vbox1">
++      <property name="visible">True</property>
++      <property name="homogeneous">False</property>
++      <property name="spacing">6</property>
++
++      <child internal-child="action_area">
++	<widget class="GtkHButtonBox" id="dialog-action_area1">
++	  <property name="visible">True</property>
++	  <property name="layout_style">GTK_BUTTONBOX_END</property>
++
++	  <child>
++	    <widget class="GtkButton" id="cancel-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-cancel</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-2</property>
++	    </widget>
++	  </child>
++
++	  <child>
++	    <widget class="GtkButton" id="ok-button">
++	      <property name="visible">True</property>
++	      <property name="can_default">True</property>
++	      <property name="has_default">True</property>
++	      <property name="can_focus">True</property>
++	      <property name="label">gtk-ok</property>
++	      <property name="use_stock">True</property>
++	      <property name="relief">GTK_RELIEF_NORMAL</property>
++	      <property name="focus_on_click">True</property>
++	      <property name="response_id">-3</property>
++	    </widget>
++	  </child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">False</property>
++	  <property name="fill">True</property>
++	  <property name="pack_type">GTK_PACK_END</property>
++	</packing>
++      </child>
++
++      <child>
++	<widget class="GtkVBox" id="timezone-table">
++	  <property name="border_width">12</property>
++	  <property name="visible">True</property>
++	  <property name="homogeneous">False</property>
++	  <property name="spacing">12</property>
++
++	  <child>
++	    <widget class="GtkHBox" id="hbox3">
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">12</property>
++
++	      <child>
++		<widget class="GtkImage" id="image1">
++		  <property name="visible">True</property>
++		  <property name="stock">gtk-dialog-info</property>
++		  <property name="icon_size">6</property>
++		  <property name="xalign">0.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkLabel" id="label1">
++		  <property name="visible">True</property>
++		  <property name="label" translatable="yes">Use the left mouse button to zoom in on an area of the map and select a time zone.
++Use the right mouse button to zoom out.</property>
++		  <property name="use_underline">False</property>
++		  <property name="use_markup">False</property>
++		  <property name="justify">GTK_JUSTIFY_LEFT</property>
++		  <property name="wrap">False</property>
++		  <property name="selectable">False</property>
++		  <property name="xalign">0</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">False</property>
++	      <property name="fill">False</property>
++	    </packing>
++	  </child>
++
++	  <child>
++           <widget class="GtkHBox" id="hbox1024x600_1">
++           <property name="visible">True</property>
++           <property name="homogeneous">False</property>
++           <child>
++           <widget class="GtkVBox" id="vbox1024x600_1">
++           <property name="visible">True</property>
++           <property name="homogeneous">False</property>
++           <property name="spacing">0</property>
++           <child>
++	    <widget class="GtkLabel" id="label4">
++	      <property name="visible">True</property>
++	      <property name="label" translatable="yes">&lt;b&gt;Time Zones&lt;/b&gt;</property>
++	      <property name="use_underline">False</property>
++	      <property name="use_markup">True</property>
++	      <property name="justify">GTK_JUSTIFY_LEFT</property>
++	      <property name="wrap">False</property>
++	      <property name="selectable">False</property>
++	      <property name="xalign">0</property>
++	      <property name="yalign">0.5</property>
++	      <property name="xpad">0</property>
++	      <property name="ypad">0</property>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">False</property>
++	      <property name="fill">False</property>
++	    </packing>
++	  </child>
++
++	  <child>
++	    <widget class="GtkHBox" id="hbox2">
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">12</property>
++
++	      <child>
++		<widget class="GtkLabel" id="label5">
++		  <property name="visible">True</property>
++		  <property name="label" translatable="yes"></property>
++		  <property name="use_underline">False</property>
++		  <property name="use_markup">False</property>
++		  <property name="justify">GTK_JUSTIFY_LEFT</property>
++		  <property name="wrap">False</property>
++		  <property name="selectable">False</property>
++		  <property name="xalign">0.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkVBox" id="vbox1">
++		  <property name="visible">True</property>
++		  <property name="homogeneous">False</property>
++		  <property name="spacing">6</property>
++
++		  <child>
++		    <widget class="GtkScrolledWindow" id="map-window">
++		      <property name="visible">True</property>
++		      <property name="can_focus">True</property>
++		      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
++		      <property name="shadow_type">GTK_SHADOW_IN</property>
++		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
++
++		      <child>
++			<placeholder/>
++		      </child>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">True</property>
++		      <property name="fill">True</property>
++		    </packing>
++		  </child>
++
++		  <child>
++		    <widget class="GtkLabel" id="preview-label">
++		      <property name="visible">True</property>
++		      <property name="label" translatable="yes">America/New_York</property>
++		      <property name="use_underline">False</property>
++		      <property name="use_markup">False</property>
++		      <property name="justify">GTK_JUSTIFY_LEFT</property>
++		      <property name="wrap">False</property>
++		      <property name="selectable">False</property>
++		      <property name="xalign">0</property>
++		      <property name="yalign">0.5</property>
++		      <property name="xpad">0</property>
++		      <property name="ypad">0</property>
++		    </widget>
++		    <packing>
++		      <property name="padding">0</property>
++		      <property name="expand">False</property>
++		      <property name="fill">False</property>
++		    </packing>
++		  </child>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">True</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">True</property>
++	      <property name="fill">True</property>
++	    </packing>
++	  </child>
++         </widget></child>
++
++	  <child>
++           <widget class="GtkVBox" id="vbox1024x600_2">
++           <property name="visible">True</property>
++           <property name="homogeneous">False</property>
++           <property name="spacing">0</property>
++           <child>
++	    <widget class="GtkLabel" id="label3">
++	      <property name="visible">True</property>
++	      <property name="label" translatable="yes">&lt;b&gt;_Selection&lt;/b&gt;</property>
++	      <property name="use_underline">True</property>
++	      <property name="use_markup">True</property>
++	      <property name="justify">GTK_JUSTIFY_CENTER</property>
++	      <property name="wrap">False</property>
++	      <property name="selectable">False</property>
++	      <property name="xalign">0</property>
++	      <property name="yalign">0.5</property>
++	      <property name="xpad">0</property>
++	      <property name="ypad">0</property>
++	      <property name="mnemonic_widget">timezone-combo</property>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">False</property>
++	      <property name="fill">False</property>
++	    </packing>
++	  </child>
++
++	  <child>
++	    <widget class="GtkHBox" id="hbox1">
++	      <property name="visible">True</property>
++	      <property name="homogeneous">False</property>
++	      <property name="spacing">12</property>
++
++	      <child>
++		<widget class="GtkLabel" id="label6">
++		  <property name="visible">True</property>
++		  <property name="label" translatable="yes"></property>
++		  <property name="use_underline">False</property>
++		  <property name="use_markup">False</property>
++		  <property name="justify">GTK_JUSTIFY_LEFT</property>
++		  <property name="wrap">False</property>
++		  <property name="selectable">False</property>
++		  <property name="xalign">0.5</property>
++		  <property name="yalign">0.5</property>
++		  <property name="xpad">0</property>
++		  <property name="ypad">0</property>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">False</property>
++		  <property name="fill">False</property>
++		</packing>
++	      </child>
++
++	      <child>
++		<widget class="GtkComboBox" id="timezone-combo">
++		  <property name="visible">True</property>
++		  <property name="add_tearoffs">False</property>
++		  <property name="focus_on_click">True</property>
++		  <accessibility>
++		    <atkproperty name="AtkObject::accessible_name" translatable="yes">Timezone drop-down combination box</atkproperty>
++		  </accessibility>
++		</widget>
++		<packing>
++		  <property name="padding">0</property>
++		  <property name="expand">True</property>
++		  <property name="fill">True</property>
++		</packing>
++	      </child>
++	    </widget>
++	    <packing>
++	      <property name="padding">0</property>
++	      <property name="expand">False</property>
++	      <property name="fill">False</property>
++	    </packing>
++	  </child>
++         </widget></child></widget></child>
++	</widget>
++	<packing>
++	  <property name="padding">0</property>
++	  <property name="expand">True</property>
++	  <property name="fill">True</property>
++	</packing>
++      </child>
++    </widget>
++  </child>
++</widget>
++
++</glade-interface>
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/widgets/e-timezone-dialog/e-timezone-dialog.c evolution-2.24.1.new/widgets/e-timezone-dialog/e-timezone-dialog.c
+--- evolution-2.24.1/widgets/e-timezone-dialog/e-timezone-dialog.c	2008-10-13 16:43:29.000000000 +0800
++++ evolution-2.24.1.new/widgets/e-timezone-dialog/e-timezone-dialog.c	2009-02-02 20:00:33.299066410 +0800
+@@ -278,9 +278,15 @@
+ 
+ 	/* Load the content widgets */
+ 
+-	filename = g_build_filename (EVOLUTION_GLADEDIR,
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  filename = g_build_filename (EVOLUTION_GLADEDIR,
++				     "e-timezone-dialog-1024x600.glade",
++				     NULL);
++	} else {
++	  filename = g_build_filename (EVOLUTION_GLADEDIR,
+ 				     "e-timezone-dialog.glade",
+ 				     NULL);
++	}
+ 	priv->xml = glade_xml_new (filename, NULL, NULL);
+ 	g_free (filename);
+ 
--- evolution-2.28.3.orig/debian/patches/92_allow_setting_alarms_on_any_meeting_2.patch
+++ evolution-2.28.3/debian/patches/92_allow_setting_alarms_on_any_meeting_2.patch
@@ -0,0 +1,50 @@
+From ff323fa4ae85fb293e0f419a5364823b90562216 Mon Sep 17 00:00:00 2001
+From: Jim Ramsay <i.am@jimramsay.com>
+Date: Tue, 18 May 2010 20:50:20 +0000
+Subject: Bug 594153 (2/3) - Allow setting alarms on any meeting
+
+The "view-time-zone" and "view-categories" actions should not have
+been grouped with the "individual" action group but rather the "core"
+action group, as they should always be available regardless of whether
+or not the element being edited is read-only/owned, as they simply
+affect visibility of various widgets.
+
+This fixes a bug introduced in 0597b877c5bf4d21ac4048742ddf6b11e24877ba
+where these two actions were accidentally grouped with other actions
+that should legitimately be in the "individual" group.
+---
+diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
+index 46e340f..7d27474 100644
+--- a/calendar/gui/dialogs/comp-editor.c
++++ b/calendar/gui/dialogs/comp-editor.c
+@@ -1091,7 +1091,7 @@ static GtkActionEntry individual_entries[] = {
+ 	  G_CALLBACK (action_attach_cb) }
+ };
+ 
+-static GtkToggleActionEntry personal_toggle_entries[] = {
++static GtkToggleActionEntry core_toggle_entries[] = {
+ 
+ 	{ "view-categories",
+ 	  NULL,
+@@ -1593,6 +1593,9 @@ comp_editor_init (CompEditor *editor)
+ 	gtk_action_group_add_actions (
+ 		action_group, core_entries,
+ 		G_N_ELEMENTS (core_entries), editor);
++	gtk_action_group_add_toggle_actions (
++		action_group, core_toggle_entries,
++		G_N_ELEMENTS (core_toggle_entries), editor);
+ 	gtk_ui_manager_insert_action_group (
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+@@ -1615,9 +1618,6 @@ comp_editor_init (CompEditor *editor)
+ 	action_group = gtk_action_group_new ("editable");
+ 	gtk_action_group_set_translation_domain (
+ 		action_group, GETTEXT_PACKAGE);
+-	gtk_action_group_add_toggle_actions (
+-		action_group, personal_toggle_entries,
+-		G_N_ELEMENTS (personal_toggle_entries), editor);
+ 	gtk_ui_manager_insert_action_group (
+ 		priv->ui_manager, action_group, 0);
+ 	g_object_unref (action_group);
+--
+cgit v0.8.3.1
--- evolution-2.28.3.orig/debian/patches/75_1024x600_e-task-bar.c.patch
+++ evolution-2.28.3/debian/patches/75_1024x600_e-task-bar.c.patch
@@ -0,0 +1,28 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/widgets/misc/e-task-bar.c evolution-2.24.1.new/widgets/misc/e-task-bar.c
+--- evolution-2.24.1/widgets/misc/e-task-bar.c	2008-10-13 16:43:34.000000000 +0800
++++ evolution-2.24.1.new/widgets/misc/e-task-bar.c	2009-02-02 19:38:38.547064997 +0800
+@@ -101,7 +101,11 @@
+ 
+ 	task_bar->priv = g_new (ETaskBarPrivate, 1);
+ 
+-	gtk_box_set_spacing (GTK_BOX (task_bar), 10);
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  gtk_box_set_spacing (GTK_BOX (task_bar), 0);
++	} else {
++	  gtk_box_set_spacing (GTK_BOX (task_bar), 10);
++	}
+ 
+ 	label = gtk_label_new (NULL);
+ 	gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
+@@ -117,7 +121,10 @@
+ 	 * XXX The "* 2" is a fudge factor to allow for some padding.
+ 	 *     The true value is probably buried in a style property. */
+ 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &height);
+-	gtk_widget_set_size_request (GTK_WIDGET (task_bar), -1, height * 2);
++	
++	if (gdk_screen_get_default() == NULL || gdk_screen_get_height(gdk_screen_get_default()) > 600) {
++	  gtk_widget_set_size_request (GTK_WIDGET (task_bar), -1, height * 2);
++	}
+ }
+ 
+ static void
--- evolution-2.28.3.orig/debian/patches/73_1024x600_e-shell-window.c.patch
+++ evolution-2.28.3/debian/patches/73_1024x600_e-shell-window.c.patch
@@ -0,0 +1,15 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/shell/e-shell-window.c evolution-2.24.1.new/shell/e-shell-window.c
+--- evolution-2.24.1/shell/e-shell-window.c	2008-10-13 16:32:56.000000000 +0800
++++ evolution-2.24.1.new/shell/e-shell-window.c	2009-02-02 18:38:05.103063666 +0800
+@@ -594,8 +594,9 @@
+ 
+ 	/* Make the status bar as large as the task bar. */
+ 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &height);
+-	gtk_widget_set_size_request (GTK_WIDGET (priv->status_bar), -1, height * 2);
+-
++	if (gdk_screen_get_default() == NULL || gdk_screen_get_height(gdk_screen_get_default()) > 600) {
++	  gtk_widget_set_size_request (GTK_WIDGET (priv->status_bar), -1, height * 2);
++	}
+ 	gconf_client = gconf_client_get_default ();
+ 	if(gconf_client_get_bool (gconf_client,"/apps/evolution/shell/view_defaults/statusbar_visible",NULL))
+ 		gtk_widget_show (priv->status_bar);
--- evolution-2.28.3.orig/debian/patches/72_1024x600_e-shell-settings-dialog.c.patch
+++ evolution-2.28.3/debian/patches/72_1024x600_e-shell-settings-dialog.c.patch
@@ -0,0 +1,18 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.24.1/shell/e-shell-settings-dialog.c evolution-2.24.1.new/shell/e-shell-settings-dialog.c
+--- evolution-2.24.1/shell/e-shell-settings-dialog.c	2008-10-13 16:32:56.000000000 +0800
++++ evolution-2.24.1.new/shell/e-shell-settings-dialog.c	2009-02-02 18:31:08.008225899 +0800
+@@ -311,6 +311,14 @@
+ 	set_dialog_size (dialog);
+ 
+ 	gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Preferences"));
++
++	if (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600) {
++	  gint oldw,oldh;
++	  gtk_widget_set_size_request(GTK_WIDGET(dialog),-1,448);
++	  gtk_window_get_size(GTK_WINDOW(dialog),&oldw,&oldh);
++	  gtk_window_resize(GTK_WINDOW (dialog),oldw,448);
++	}
++
+ 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+ }
+ 
--- evolution-2.28.3.orig/debian/patches/77_1024x600_mail-config.c.patch
+++ evolution-2.28.3/debian/patches/77_1024x600_mail-config.c.patch
@@ -0,0 +1,246 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/em-account-editor.c evolution-2.27.4.new/mail/em-account-editor.c
+--- evolution-2.27.4/mail/em-account-editor.c	2009-07-13 16:04:51.000000000 +0200
++++ evolution-2.27.4.new/mail/em-account-editor.c	2009-07-13 16:04:55.000000000 +0200
+@@ -1807,6 +1807,7 @@
+ 				      NULL);
+ 	xml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(xml);
+ 
+ 	/* Management & Identity fields, in the druid the management frame is relocated to the last page later on */
+ 	for (i=0;i<sizeof (emae_identity_entries)/sizeof (emae_identity_entries[0]);i++)
+@@ -1843,6 +1844,7 @@
+ 					      NULL);
+ 		druidxml = glade_xml_new (gladefile, "identity_page", NULL);
+ 		g_free (gladefile);
++		mail_config_1024x600(druidxml);
+ 
+ 		page = glade_xml_get_widget (druidxml, "identity_page");
+ 
+@@ -1878,6 +1880,7 @@
+ 				      NULL);
+ 	xml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(xml);
+ 
+ 	gui->source.type = CAMEL_PROVIDER_STORE;
+ 	emae_setup_service (emae, &gui->source, xml);
+@@ -1894,6 +1897,7 @@
+ 					      NULL);
+ 		druidxml = glade_xml_new (gladefile, "source_page", NULL);
+ 		g_free (gladefile);
++		mail_config_1024x600(xml);
+ 
+ 		page = glade_xml_get_widget (druidxml, "source_page");
+ 
+@@ -2375,6 +2379,7 @@
+ 				      NULL);
+ 	xml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(xml);
+ 
+ 	/* Transport */
+ 	gui->transport.type = CAMEL_PROVIDER_TRANSPORT;
+@@ -2392,6 +2397,7 @@
+ 					      NULL);
+ 		druidxml = glade_xml_new (gladefile, "transport_page", NULL);
+ 		g_free (gladefile);
++		mail_config_1024x600(druidxml);
+ 
+ 		page = glade_xml_get_widget (druidxml, "transport_page");
+ 
+@@ -2427,6 +2433,7 @@
+ 				      NULL);
+ 	xml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(xml);
+ 
+ 	/* Special folders */
+ 	gui->drafts_folder_button = (GtkButton *)emae_account_folder (emae, "drafts_button", E_ACCOUNT_DRAFTS_FOLDER_URI, MAIL_COMPONENT_FOLDER_DRAFTS, xml);
+@@ -2487,6 +2494,7 @@
+ 				      NULL);
+ 	xml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(xml);
+ 
+ 	/* Security */
+ 	emae_account_entry (emae, "pgp_key", E_ACCOUNT_PGP_KEY, xml);
+@@ -2601,6 +2609,7 @@
+ 					      NULL);
+ 		druidxml = glade_xml_new (gladefile, "management_page", NULL);
+ 		g_free (gladefile);
++		mail_config_1024x600(druidxml);
+ 
+ 		page = glade_xml_get_widget (druidxml, "management_page");
+ 
+@@ -2629,6 +2638,7 @@
+ 				      NULL);
+ 	druidxml = glade_xml_new (gladefile, item->label, NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(druidxml);
+ 
+ 	w = glade_xml_get_widget (druidxml, item->label);
+ 	/* i think the glade file has issues, we need to show all on at least the end page */
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/em-account-prefs.c evolution-2.27.4.new/mail/em-account-prefs.c
+--- evolution-2.27.4/mail/em-account-prefs.c	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/em-account-prefs.c	2009-07-13 16:04:55.000000000 +0200
+@@ -516,6 +516,7 @@
+ 				      NULL);
+ 	gui = glade_xml_new (gladefile, "accounts_tab", NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(gui);
+ 
+ 	prefs->gui = gui;
+ 
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/em-composer-prefs.c evolution-2.27.4.new/mail/em-composer-prefs.c
+--- evolution-2.27.4/mail/em-composer-prefs.c	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/em-composer-prefs.c	2009-07-13 16:04:55.000000000 +0200
+@@ -837,6 +837,7 @@
+ 				      "mail-config.glade",
+ 				      NULL);
+ 	gui = glade_xml_new (gladefile, "composer_toplevel", NULL);
++	mail_config_1024x600(gui);
+ 	prefs->gui = gui;
+ 	prefs->sig_script_gui = glade_xml_new (gladefile, "vbox_add_script_signature", NULL);
+ 	g_free (gladefile);
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/em-mailer-prefs.c evolution-2.27.4.new/mail/em-mailer-prefs.c
+--- evolution-2.27.4/mail/em-mailer-prefs.c	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/em-mailer-prefs.c	2009-07-13 16:04:55.000000000 +0200
+@@ -1165,6 +1165,7 @@
+ 				      NULL);
+ 	gui = glade_xml_new (gladefile, "preferences_toplevel", NULL);
+ 	g_free (gladefile);
++	mail_config_1024x600(gui);
+ 
+ 	prefs->gui = gui;
+ 
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/em-network-prefs.c evolution-2.27.4.new/mail/em-network-prefs.c
+--- evolution-2.27.4/mail/em-network-prefs.c	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/em-network-prefs.c	2009-07-13 16:04:55.000000000 +0200
+@@ -312,6 +312,7 @@
+ 				      "mail-config.glade",
+ 				      NULL);
+ 	gui = glade_xml_new (gladefile, "network_preferences_toplevel", NULL);
++	mail_config_1024x600(gui);
+ 	prefs->gui = gui;
+ 	g_free (gladefile);
+ 
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/mail-config.c evolution-2.27.4.new/mail/mail-config.c
+--- evolution-2.27.4/mail/mail-config.c	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/mail-config.c	2009-07-13 16:04:55.000000000 +0200
+@@ -1,4 +1,4 @@
+-/*
++ /*
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU Lesser General Public
+  * License as published by the Free Software Foundation; either
+@@ -1356,3 +1356,97 @@
+ 	return NULL;
+ #endif
+ }
++
++void mail_config_1024x600(void *xmlo) {
++  GtkWidget *scrolledWindow1024x600,*viewport;
++  GtkWidget *dialogWindow=NULL;
++  GtkWidget *child,*mother,*childtablabel,*childmenulabel;
++  GladeXML *xml;
++  gchar* childlabeltext;
++  int pagenum;
++
++  xml = (GladeXML*)xmlo;
++
++  if (!xml) {
++    return;
++  }
++
++  if ( ! (gdk_screen_get_default() != NULL && gdk_screen_get_height(gdk_screen_get_default()) <= 600)) {
++    return;
++  }
++
++  /* add scrolledbar to source_vbox */
++  child = glade_xml_get_widget(xml,"source_vbox");
++  if (child != NULL) {
++    mother = gtk_widget_get_parent(child);
++    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++    if (scrolledWindow1024x600 != NULL) {
++      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++    }
++    viewport = gtk_viewport_new(NULL,NULL);
++    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++    gtk_widget_show(scrolledWindow1024x600);
++    gtk_widget_show(viewport);
++    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++    gtk_container_add(GTK_CONTAINER(mother),GTK_WIDGET(scrolledWindow1024x600));
++  }
++  /* add scrolledbar to transport_vbox */
++  child = glade_xml_get_widget(xml,"transport_vbox");
++  if (child != NULL) {
++    mother = gtk_widget_get_parent(child);
++    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++    if (scrolledWindow1024x600 != NULL) {
++      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++    }
++    viewport = gtk_viewport_new(NULL,NULL);
++    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++    gtk_widget_show(scrolledWindow1024x600);
++    gtk_widget_show(viewport);
++    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++    gtk_container_add(GTK_CONTAINER(mother),GTK_WIDGET(scrolledWindow1024x600));
++  }
++  /* add scrolledbar to preferences_toplevel's child */
++  mother = glade_xml_get_widget(xml,"preferences_toplevel");
++  if (mother != NULL) {
++    GList *childrens=NULL;
++    childrens = gtk_container_get_children(GTK_CONTAINER(mother));
++    if (childrens != NULL && g_list_length(childrens)==1) {
++      child = GTK_WIDGET((GtkWidget*)g_list_nth_data(childrens,0));
++      pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(mother),child);
++      childtablabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mother),child);
++      childmenulabel = gtk_notebook_get_menu_label(GTK_NOTEBOOK(mother),child);
++      childlabeltext = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(child)));
++      scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++      if (scrolledWindow1024x600 != NULL) {
++	gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++      }
++      viewport = gtk_viewport_new(NULL,NULL);
++      gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++      gtk_widget_show(scrolledWindow1024x600);
++      gtk_widget_show(viewport);
++      gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++      gtk_notebook_insert_page_menu(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),NULL,childmenulabel,pagenum);
++      gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),childlabeltext);
++    }
++  }
++  /* add scrolledbar to transport_vbox */
++  child = glade_xml_get_widget(xml,"vbox161");
++  if (child != NULL) {
++    mother = gtk_widget_get_parent(child);
++    pagenum = gtk_notebook_page_num(GTK_NOTEBOOK(mother),child);
++    childtablabel = gtk_notebook_get_tab_label(GTK_NOTEBOOK(mother),child);
++    childmenulabel = gtk_notebook_get_menu_label(GTK_NOTEBOOK(mother),child);
++    childlabeltext = g_strdup(gtk_notebook_get_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(child)));
++    scrolledWindow1024x600 = gtk_scrolled_window_new(NULL,NULL);
++    if (scrolledWindow1024x600 != NULL) {
++      gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolledWindow1024x600),GTK_POLICY_NEVER,GTK_POLICY_AUTOMATIC);
++    }
++    viewport = gtk_viewport_new(NULL,NULL);
++    gtk_container_add(GTK_CONTAINER(scrolledWindow1024x600),GTK_WIDGET(viewport));
++    gtk_widget_show(scrolledWindow1024x600);
++    gtk_widget_show(viewport);
++    gtk_widget_reparent(GTK_WIDGET(child),GTK_WIDGET(viewport));
++    gtk_notebook_insert_page_menu(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),NULL,childmenulabel,pagenum);
++    gtk_notebook_set_tab_label_text(GTK_NOTEBOOK(mother),GTK_WIDGET(scrolledWindow1024x600),childlabeltext);
++  }
++}
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4/mail/mail-config.h evolution-2.27.4.new/mail/mail-config.h
+--- evolution-2.27.4/mail/mail-config.h	2009-07-13 09:45:13.000000000 +0200
++++ evolution-2.27.4.new/mail/mail-config.h	2009-07-13 16:05:24.000000000 +0200
+@@ -152,6 +152,8 @@
+ 
+ gboolean evolution_mail_config_factory_init (void);
+ 
++void mail_config_1024x600(void *);
++
+ G_END_DECLS
+ 
+ #endif /* MAIL_CONFIG_H */
--- evolution-2.28.3.orig/debian/patches/03_lpi.patch
+++ evolution-2.28.3/debian/patches/03_lpi.patch
@@ -0,0 +1,47 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4.1/configure.ac evolution-2.27.4.1.new/configure.ac
+--- evolution-2.27.4.1/configure.ac	2009-07-15 11:25:24.000000000 +0200
++++ evolution-2.27.4.1.new/configure.ac	2009-07-17 00:24:28.000000000 +0200
+@@ -1515,7 +1515,7 @@
+ AC_SUBST(LIBFILTER_LIBS)
+ 
+ dnl --- evolution (shell) flags
+-EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE)
++EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE)
+ 
+ AC_SUBST(SHELL_CFLAGS)
+ AC_SUBST(SHELL_LIBS)
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4.1/shell/e-shell-window-commands.c evolution-2.27.4.1.new/shell/e-shell-window-commands.c
+--- evolution-2.27.4.1/shell/e-shell-window-commands.c	2009-07-13 09:45:14.000000000 +0200
++++ evolution-2.27.4.1.new/shell/e-shell-window-commands.c	2009-07-17 00:24:06.000000000 +0200
+@@ -56,6 +56,8 @@
+ #define EVOLUTION_WEBSITE \
+ 	"http://www.gnome.org/projects/evolution/"
+ 
++#include <lpint-bonobo.h>
++
+ /* Utility functions.  */
+ 
+ static void
+@@ -1379,6 +1381,8 @@
+ 					  (BonoboUIListenerFn)view_sidebar_item_toggled_handler,
+ 					  (gpointer)shell_window);
+ 
++	launchpad_integration_add_bonobo_ui (uic, "/menu/Help/LaunchpadItems");
++
+ 	e_pixmaps_update (uic, pixmaps);
+ 
+ 	/* Set up the work online / work offline menu item.  */
+diff -Nur -x '*.orig' -x '*~' evolution-2.27.4.1/ui/evolution.xml evolution-2.27.4.1.new/ui/evolution.xml
+--- evolution-2.27.4.1/ui/evolution.xml	2009-07-13 09:45:14.000000000 +0200
++++ evolution-2.27.4.1.new/ui/evolution.xml	2009-07-17 00:24:06.000000000 +0200
+@@ -172,6 +172,10 @@
+ 
+       <separator f="" name="eshell4"/>
+ 
++      <placeholder name="LaunchpadItems"/>
++      
++      <separator/>
++      
+       <menuitem name="HelpAbout" verb=""
+ 	_label="_About"/>
+ 
--- evolution-2.28.3.orig/debian/patches/90_autoconf.patch
+++ evolution-2.28.3/debian/patches/90_autoconf.patch
@@ -0,0 +1,24788 @@
+diff -Nur -x '*.orig' -x '*~' evolution-2.28.3/configure evolution-2.28.3.new/configure
+--- evolution-2.28.3/configure	2010-03-01 12:50:15.000000000 +0100
++++ evolution-2.28.3.new/configure	2010-03-01 23:48:00.000000000 +0100
+@@ -1,20 +1,24 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for evolution 2.28.3.
++# Generated by GNU Autoconf 2.65 for evolution 2.28.3.
+ #
+ # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution>.
+ #
++#
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
++# Inc.
++#
++#
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+ 
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+@@ -22,23 +26,15 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
+ esac
+-
+ fi
+ 
+ 
+-
+-
+-# PATH needs CR
+-# 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
+-
+ as_nl='
+ '
+ export as_nl
+@@ -46,7 +42,13 @@
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+@@ -57,7 +59,7 @@
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+-      case $arg in
++      case $arg in #(
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -80,13 +82,6 @@
+   }
+ fi
+ 
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
+-
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.  Quoting is
+@@ -96,15 +91,15 @@
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+-case $0 in
++case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
+ IFS=$as_save_IFS
+ 
+      ;;
+@@ -116,12 +111,16 @@
+ fi
+ if test ! -f "$as_myself"; then
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  { (exit 1); exit 1; }
++  exit 1
+ fi
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-for as_var in ENV MAIL MAILPATH
+-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ done
+ PS1='$ '
+ PS2='> '
+@@ -133,330 +132,301 @@
+ LANGUAGE=C
+ export LANGUAGE
+ 
+-# Required to use basename.
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+-
+-if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+-  as_basename=basename
+-else
+-  as_basename=false
+-fi
+-
+-
+-# Name of the executable.
+-as_me=`$as_basename -- "$0" ||
+-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+-	 X"$0" : 'X\(//\)$' \| \
+-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+-$as_echo X/"$0" |
+-    sed '/^.*\/\([^/][^/]*\)\/*$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\/\(\/\/\)$/{
+-	    s//\1/
+-	    q
+-	  }
+-	  /^X\/\(\/\).*/{
+-	    s//\1/
+-	    q
+-	  }
+-	  s/.*/./; q'`
+-
+ # CDPATH.
+-$as_unset CDPATH
+-
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test "x$CONFIG_SHELL" = x; then
+-  if (eval ":") 2>/dev/null; then
+-  as_have_required=yes
++  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
++  emulate sh
++  NULLCMD=:
++  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
+ else
+-  as_have_required=no
++  case \`(set -o) 2>/dev/null\` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
++esac
+ fi
+-
+-  if test $as_have_required = yes &&	 (eval ":
+-(as_func_return () {
+-  (exit \$1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
+-}
++"
++  as_required="as_fn_return () { (exit \$1); }
++as_fn_success () { as_fn_return 0; }
++as_fn_failure () { as_fn_return 1; }
++as_fn_ret_success () { return 0; }
++as_fn_ret_failure () { return 1; }
+ 
+ exitcode=0
+-if as_func_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+-  :
++as_fn_success || { exitcode=1; echo as_fn_success failed.; }
++as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
++as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
++as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
++if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
++
++else
++  exitcode=1; echo positional parameters were not saved.
++fi
++test x\$exitcode = x0 || exit 1"
++  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
++  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
++  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
++  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
++test \$(( 1 + 1 )) = 2 || exit 1"
++  if (eval "$as_required") 2>/dev/null; then :
++  as_have_required=yes
+ else
+-  exitcode=1
+-  echo positional parameters were not saved.
++  as_have_required=no
+ fi
++  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+ 
+-test \$exitcode = 0) || { (exit 1); exit 1; }
+-
+-(
+-  as_lineno_1=\$LINENO
+-  as_lineno_2=\$LINENO
+-  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
+-  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
+-") 2> /dev/null; then
+-  :
+ else
+-  as_candidate_shells=
+-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++as_found=false
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  case $as_dir in
++  as_found=:
++  case $as_dir in #(
+ 	 /*)
+ 	   for as_base in sh bash ksh sh5; do
+-	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
++	     # Try only shells that exist, to save several forks.
++	     as_shell=$as_dir/$as_base
++	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
++		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  CONFIG_SHELL=$as_shell as_have_required=yes
++		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
++  break 2
++fi
++fi
+ 	   done;;
+        esac
++  as_found=false
+ done
++$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
++	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
++  CONFIG_SHELL=$SHELL as_have_required=yes
++fi; }
+ IFS=$as_save_IFS
+ 
+ 
+-      for as_shell in $as_candidate_shells $SHELL; do
+-	 # Try only shells that exist, to save several forks.
+-	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
+-		{ ("$as_shell") 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
+-esac
+-
+-fi
+-
+-
+-:
+-_ASEOF
+-}; then
+-  CONFIG_SHELL=$as_shell
+-	       as_have_required=yes
+-	       if { "$as_shell" 2> /dev/null <<\_ASEOF
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+-  emulate sh
+-  NULLCMD=:
+-  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+-  # is contrary to our usage.  Disable this feature.
+-  alias -g '${1+"$@"}'='"$@"'
+-  setopt NO_GLOB_SUBST
+-else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
+-esac
+-
+-fi
+-
+-
+-:
+-(as_func_return () {
+-  (exit $1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
+-}
+-
+-exitcode=0
+-if as_func_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
+-
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+-
+-if as_func_ret_success; then
+-  :
+-else
+-  exitcode=1
+-  echo as_func_ret_success failed.
+-fi
+-
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
+-fi
+-
+-if ( set x; as_func_ret_success y && test x = "$1" ); then
+-  :
+-else
+-  exitcode=1
+-  echo positional parameters were not saved.
+-fi
+-
+-test $exitcode = 0) || { (exit 1); exit 1; }
+-
+-(
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
+-
+-_ASEOF
+-}; then
+-  break
+-fi
+-
+-fi
+-
+-      done
+-
+-      if test "x$CONFIG_SHELL" != x; then
+-  for as_var in BASH_ENV ENV
+-	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+-	done
++      if test "x$CONFIG_SHELL" != x; then :
++  # We cannot yet assume a decent shell, so we have to provide a
++	# neutralization value for shells without unset; and this also
++	# works around shells that cannot unset nonexistent variables.
++	BASH_ENV=/dev/null
++	ENV=/dev/null
++	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+ 	export CONFIG_SHELL
+ 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ fi
+ 
+-
+-    if test $as_have_required = no; then
+-  echo This script requires a shell more modern than all the
+-      echo shells that I found on your system.  Please install a
+-      echo modern shell, or manually run the script under such a
+-      echo shell if you do have one.
+-      { (exit 1); exit 1; }
++    if test x$as_have_required = xno; then :
++  $as_echo "$0: This script requires a shell more modern than all"
++  $as_echo "$0: the shells that I found on your system."
++  if test x${ZSH_VERSION+set} = xset ; then
++    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
++    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
++  else
++    $as_echo "$0: Please tell bug-autoconf@gnu.org and
++$0: http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution
++$0: about your system, including any error possibly output
++$0: before this message. Then install a modern shell, or
++$0: manually run the script under such a shell if you do
++$0: have one."
++  fi
++  exit 1
+ fi
+-
+-
+ fi
+-
+ fi
++SHELL=${CONFIG_SHELL-/bin/sh}
++export SHELL
++# Unset more variables known to interfere with behavior of common tools.
++CLICOLOR_FORCE= GREP_OPTIONS=
++unset CLICOLOR_FORCE GREP_OPTIONS
+ 
++## --------------------- ##
++## M4sh Shell Functions. ##
++## --------------------- ##
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_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 ||
++$as_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" || as_fn_error "cannot create directory $as_dir"
+ 
+ 
+-(eval "as_func_return () {
+-  (exit \$1)
+-}
+-as_func_success () {
+-  as_func_return 0
+-}
+-as_func_failure () {
+-  as_func_return 1
+-}
+-as_func_ret_success () {
+-  return 0
+-}
+-as_func_ret_failure () {
+-  return 1
+-}
++} # as_fn_mkdir_p
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
+ 
+-exitcode=0
+-if as_func_success; then
+-  :
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
+ else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
+ 
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+ 
+-if as_func_ret_success; then
+-  :
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
++if expr a : '\(a\)' >/dev/null 2>&1 &&
++   test "X`expr 00001 : '.*\(...\)'`" = X001; then
++  as_expr=expr
+ else
+-  exitcode=1
+-  echo as_func_ret_success failed.
++  as_expr=false
+ fi
+ 
+-if as_func_ret_failure; then
+-  exitcode=1
+-  echo as_func_ret_failure succeeded.
++if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
++  as_basename=basename
++else
++  as_basename=false
+ fi
+ 
+-if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
+-  :
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
+ else
+-  exitcode=1
+-  echo positional parameters were not saved.
++  as_dirname=false
+ fi
+ 
+-test \$exitcode = 0") || {
+-  echo No shell found that supports shell functions.
+-  echo Please tell bug-autoconf@gnu.org about your system,
+-  echo including any error possibly output before this message.
+-  echo This can help us improve future autoconf versions.
+-  echo Configuration will now proceed without shell functions.
+-}
++as_me=`$as_basename -- "$0" ||
++$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
++	 X"$0" : 'X\(//\)$' \| \
++	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
++$as_echo X/"$0" |
++    sed '/^.*\/\([^/][^/]*\)\/*$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\/\)$/{
++	    s//\1/
++	    q
++	  }
++	  /^X\/\(\/\).*/{
++	    s//\1/
++	    q
++	  }
++	  s/.*/./; q'`
+ 
++# 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
+ 
+ 
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+-
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line after each line using $LINENO; the second 'sed'
+-  # does the real work.  The second script uses 'N' to pair each
+-  # line-number line with the line containing $LINENO, and appends
+-  # trailing '-' during substitution so that $LINENO is not a special
+-  # case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+-  # E. McMahon (1931-1989) for sed's syntax.  :-)
++  as_lineno_1=$LINENO as_lineno_1a=$LINENO
++  as_lineno_2=$LINENO as_lineno_2a=$LINENO
++  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
++  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
++  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
+   sed -n '
+     p
+     /[$]LINENO/=
+@@ -473,8 +443,7 @@
+       s/-\n.*//
+     ' >$as_me.lineno &&
+   chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
++    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ 
+   # Don't try to exec as it changes $[0], causing all sort of problems
+   # (the dirname of $[0] is not the place where we might find the
+@@ -484,29 +453,18 @@
+   exit
+ }
+ 
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
+-
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
++case `echo -n x` in #(((((
+ -n*)
+-  case `echo 'x\c'` in
++  case `echo 'xy\c'` in
+   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+-  *)   ECHO_C='\c';;
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
+   esac;;
+ *)
+   ECHO_N='-n';;
+ esac
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+@@ -536,7 +494,7 @@
+ rmdir conf$$.dir 2>/dev/null
+ 
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+@@ -555,10 +513,10 @@
+       if test -d "$1"; then
+ 	test -d "$1/.";
+       else
+-	case $1 in
++	case $1 in #(
+ 	-*)set "./$1";;
+ 	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ 	???[sx]*):;;*)false;;esac;fi
+     '\'' sh
+   '
+@@ -573,7 +531,6 @@
+ 
+ 
+ 
+-
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+@@ -722,7 +679,8 @@
+ 
+ 
+ 
+-exec 7<&0 </dev/null 6>&1
++test -n "$DJDIR" || exec 7<&0 </dev/null
++exec 6>&1
+ 
+ # Name of the host.
+ # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
+@@ -740,7 +698,6 @@
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='evolution'
+@@ -748,6 +705,7 @@
+ PACKAGE_VERSION='2.28.3'
+ PACKAGE_STRING='evolution 2.28.3'
+ PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution'
++PACKAGE_URL=''
+ 
+ ac_unique_file="README"
+ # Factoring default headers for most tests.
+@@ -1144,6 +1102,7 @@
+ program_transform_name
+ prefix
+ exec_prefix
++PACKAGE_URL
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+@@ -1407,8 +1366,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+-   { (exit 1); exit 1; }; }
++      as_fn_error "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1434,8 +1392,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+-   { (exit 1); exit 1; }; }
++      as_fn_error "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1639,8 +1596,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+-   { (exit 1); exit 1; }; }
++      as_fn_error "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1656,8 +1612,7 @@
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+-   { (exit 1); exit 1; }; }
++      as_fn_error "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1687,17 +1642,17 @@
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; }
++  -*) as_fn_error "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information."
+     ;;
+ 
+   *=*)
+     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
+-      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+-   { (exit 1); exit 1; }; }
++    case $ac_envvar in #(
++      '' | [0-9]* | *[!_$as_cr_alnum]* )
++      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++    esac
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+@@ -1714,15 +1669,13 @@
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "missing argument to $ac_option"
+ fi
+ 
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+-   { (exit 1); exit 1; }; } ;;
++    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+@@ -1745,8 +1698,7 @@
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1776,11 +1728,9 @@
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  { $as_echo "$as_me: error: working directory cannot be determined" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "pwd does not report name of working directory"
+ 
+ 
+ # Find the source files, if location was not specified.
+@@ -1819,13 +1769,11 @@
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
+-   { (exit 1); exit 1; }; }
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -2024,7 +1972,7 @@
+   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+               nonstandard directory <lib dir>
+   LIBS        libraries to pass to the linker, e.g. -l<library>
+-  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
++  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   YACC        The `Yet Another C Compiler' implementation to use. Defaults to
+@@ -2230,21 +2178,378 @@
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ evolution configure 2.28.3
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.65
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+   exit
+ fi
++
++## ------------------------ ##
++## Autoconf initialization. ##
++## ------------------------ ##
++
++# ac_fn_c_try_compile LINENO
++# --------------------------
++# Try to compile conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext
++  if { { ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compile") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_compile
++
++# ac_fn_c_try_cpp LINENO
++# ----------------------
++# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_cpp ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_cpp conftest.$ac_ext"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++    ac_retval=1
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_cpp
++
++# ac_fn_c_try_link LINENO
++# -----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded.
++ac_fn_c_try_link ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  rm -f conftest.$ac_objext conftest$ac_exeext
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>conftest.err
++  ac_status=$?
++  if test -s conftest.err; then
++    grep -v '^ *+' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++    mv -f conftest.er1 conftest.err
++  fi
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext && {
++	 test "$cross_compiling" = yes ||
++	 $as_test_x conftest$ac_exeext
++       }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_retval=1
++fi
++  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
++  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
++  # interfere with the next link command; also delete a directory that is
++  # left behind by Apple's compiler.  We do this before executing the actions.
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_link
++
++# ac_fn_c_check_func LINENO FUNC VAR
++# ----------------------------------
++# Tests whether FUNC exists, setting the cache variable VAR accordingly
++ac_fn_c_check_func ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
++   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
++#define $2 innocuous_$2
++
++/* System header to define __stub macros and hopefully few prototypes,
++    which can conflict with char $2 (); below.
++    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
++    <limits.h> exists even on freestanding compilers.  */
++
++#ifdef __STDC__
++# include <limits.h>
++#else
++# include <assert.h>
++#endif
++
++#undef $2
++
++/* Override any GCC internal prototype to avoid an error.
++   Use char because int might match the return type of a GCC
++   builtin and then its argument prototype would still apply.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++char $2 ();
++/* The GNU C library defines this for functions which it implements
++    to always fail with ENOSYS.  Some functions are actually named
++    something starting with __ and the normal name is an alias.  */
++#if defined __stub_$2 || defined __stub___$2
++choke me
++#endif
++
++int
++main ()
++{
++return $2 ();
++  ;
++  return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_func
++
++# ac_fn_c_try_run LINENO
++# ----------------------
++# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
++# that executables *can* be run.
++ac_fn_c_try_run ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then :
++  ac_retval=0
++else
++  $as_echo "$as_me: program exited with status $ac_status" >&5
++       $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++       ac_retval=$ac_status
++fi
++  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++  as_fn_set_status $ac_retval
++
++} # ac_fn_c_try_run
++
++# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists, giving a warning if it cannot be compiled using
++# the include files in INCLUDES and setting the cache variable VAR
++# accordingly.
++ac_fn_c_check_header_mongrel ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++else
++  # Is the header compilable?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
++$as_echo_n "checking $2 usability... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  ac_header_compiler=yes
++else
++  ac_header_compiler=no
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
++$as_echo "$ac_header_compiler" >&6; }
++
++# Is the header present?
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
++$as_echo_n "checking $2 presence... " >&6; }
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <$2>
++_ACEOF
++if ac_fn_c_try_cpp "$LINENO"; then :
++  ac_header_preproc=yes
++else
++  ac_header_preproc=no
++fi
++rm -f conftest.err conftest.$ac_ext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
++$as_echo "$ac_header_preproc" >&6; }
++
++# So?  What about this header?
++case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
++  yes:no: )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
++$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++    ;;
++  no:yes:* )
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
++$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
++$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
++$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
++$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
++$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
++( cat <<\_ASBOX
++## ------------------------------------------------------------------------ ##
++## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
++## ------------------------------------------------------------------------ ##
++_ASBOX
++     ) | sed "s/^/$as_me: WARNING:     /" >&2
++    ;;
++esac
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  eval "$3=\$ac_header_compiler"
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++fi
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_mongrel
++
++# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
++# -------------------------------------------------------
++# Tests whether HEADER exists and can be compiled using the include files in
++# INCLUDES, setting the cache variable VAR accordingly.
++ac_fn_c_check_header_compile ()
++{
++  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
++$as_echo_n "checking for $2... " >&6; }
++if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  $as_echo_n "(cached) " >&6
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++$4
++#include <$2>
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++  eval "$3=yes"
++else
++  eval "$3=no"
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++eval ac_res=\$$3
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
++
++} # ac_fn_c_check_header_compile
+ cat >config.log <<_ACEOF
+ This file contains any messages produced by compilers while
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by evolution $as_me 2.28.3, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2280,8 +2585,8 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  $as_echo "PATH: $as_dir"
+-done
++    $as_echo "PATH: $as_dir"
++  done
+ IFS=$as_save_IFS
+ 
+ } >&5
+@@ -2318,9 +2623,9 @@
+       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+     case $ac_pass in
+-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
++    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
+     2)
+-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
++      as_fn_append ac_configure_args1 " '$ac_arg'"
+       if test $ac_must_keep_next = true; then
+ 	ac_must_keep_next=false # Got value, back to normal.
+       else
+@@ -2336,13 +2641,13 @@
+ 	  -* ) ac_must_keep_next=true ;;
+ 	esac
+       fi
+-      ac_configure_args="$ac_configure_args '$ac_arg'"
++      as_fn_append ac_configure_args " '$ac_arg'"
+       ;;
+     esac
+   done
+ done
+-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
+-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
++{ ac_configure_args0=; unset ac_configure_args0;}
++{ ac_configure_args1=; unset ac_configure_args1;}
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+@@ -2367,13 +2672,13 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) $as_unset $ac_var ;;
++      *) { eval $ac_var=; unset $ac_var;} ;;
+       esac ;;
+     esac
+   done
+@@ -2445,39 +2750,41 @@
+     exit $exit_status
+ ' 0
+ for ac_signal in 1 2 13 15; do
+-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
++  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
+ done
+ ac_signal=0
+ 
+ # confdefs.h avoids OS command line length limits that DEFS can exceed.
+ rm -f -r conftest* confdefs.h
+ 
++$as_echo "/* confdefs.h */" > confdefs.h
++
+ # Predefined preprocessor variables.
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_NAME "$PACKAGE_NAME"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_VERSION "$PACKAGE_VERSION"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_STRING "$PACKAGE_STRING"
+ _ACEOF
+ 
+-
+ cat >>confdefs.h <<_ACEOF
+ #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
+ _ACEOF
+ 
++cat >>confdefs.h <<_ACEOF
++#define PACKAGE_URL "$PACKAGE_URL"
++_ACEOF
++
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer an explicitly selected file to automatically selected ones.
+@@ -2495,8 +2802,8 @@
+ for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+ do
+   test "x$ac_site_file" = xNONE && continue
+-  if test -r "$ac_site_file"; then
+-    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
++  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+     . "$ac_site_file"
+@@ -2504,10 +2811,10 @@
+ done
+ 
+ if test -r "$cache_file"; then
+-  # Some versions of bash will fail to source /dev/null (special
+-  # files actually), so we avoid doing that.
+-  if test -f "$cache_file"; then
+-    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
++  # Some versions of bash will fail to source /dev/null (special files
++  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
++  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
++    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . "$cache_file";;
+@@ -2515,7 +2822,7 @@
+     esac
+   fi
+ else
+-  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+ $as_echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -2530,11 +2837,11 @@
+   eval ac_new_val=\$ac_env_${ac_var}_value
+   case $ac_old_set,$ac_new_set in
+     set,)
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,set)
+-      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
+ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+@@ -2544,17 +2851,17 @@
+ 	ac_old_val_w=`echo x $ac_old_val`
+ 	ac_new_val_w=`echo x $ac_new_val`
+ 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
+-	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
+ $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ 	  ac_cache_corrupted=:
+ 	else
+-	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+ $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ 	  eval $ac_var=\$ac_old_val
+ 	fi
+-	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
+ $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
+-	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
+ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       fi;;
+   esac
+@@ -2566,43 +2873,20 @@
+     esac
+     case " $ac_configure_args " in
+       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
++      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
+     esac
+   fi
+ done
+ if $ac_cache_corrupted; then
+-  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+-$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
+-
++## -------------------- ##
++## Main body of script. ##
++## -------------------- ##
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -2615,24 +2899,16 @@
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-  if test -f "$ac_dir/install-sh"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install-sh -c"
+-    break
+-  elif test -f "$ac_dir/install.sh"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/install.sh -c"
+-    break
+-  elif test -f "$ac_dir/shtool"; then
+-    ac_aux_dir=$ac_dir
+-    ac_install_sh="$ac_aux_dir/shtool install -c"
+-    break
+-  fi
++  for ac_t in install-sh install.sh shtool; do
++    if test -f "$ac_dir/$ac_t"; then
++      ac_aux_dir=$ac_dir
++      ac_install_sh="$ac_aux_dir/$ac_t -c"
++      break 2
++    fi
++  done
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2658,10 +2934,10 @@
+ # OS/2's system install, which has a completely different semantic
+ # ./install, which can be erroneously created by make from ./install.sh.
+ # Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+ $as_echo_n "checking for a BSD-compatible install... " >&6; }
+ if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
++if test "${ac_cv_path_install+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2669,11 +2945,11 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+-  ./ | .// | /cC/* | \
++    # Account for people who put trailing slashes in PATH elements.
++case $as_dir/ in #((
++  ./ | .// | /[cC]/* | \
+   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
++  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+   /usr/ucb/* ) ;;
+   *)
+     # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -2710,7 +2986,7 @@
+     ;;
+ esac
+ 
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ rm -rf conftest.one conftest.two conftest.dir
+@@ -2726,7 +3002,7 @@
+     INSTALL=$ac_install_sh
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+ $as_echo "$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2737,7 +3013,7 @@
+ 
+ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+@@ -2748,15 +3024,11 @@
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+-    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
+-$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
+-   { (exit 1); exit 1; }; };;
++    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
+-$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
+-   { (exit 1); exit 1; }; };;
++    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+ esac
+ 
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2778,11 +3050,8 @@
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" >&5
+-$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment" >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
++alias in your environment" "$LINENO" 5
+    fi
+ 
+    test "$2" = conftest.file
+@@ -2791,13 +3060,10 @@
+    # Ok.
+    :
+ else
+-   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
+-Check your system clock" >&5
+-$as_echo "$as_me: error: newly created file is older than distributed files!
+-Check your system clock" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error "newly created file is older than distributed files!
++Check your system clock" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+@@ -2825,7 +3091,7 @@
+   am_missing_run="$MISSING --run "
+ else
+   am_missing_run=
+-  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
+ $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+@@ -2846,9 +3112,9 @@
+   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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -2859,24 +3125,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2886,9 +3152,9 @@
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -2899,24 +3165,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2925,7 +3191,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2938,10 +3204,10 @@
+ fi
+ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
+ 
+-{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+ $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+ if test -z "$MKDIR_P"; then
+-  if test "${ac_cv_path_mkdir+set}" = set; then
++  if test "${ac_cv_path_mkdir+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2949,7 +3215,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in mkdir gmkdir; do
++    for ac_prog in mkdir gmkdir; do
+ 	 for ac_exec_ext in '' $ac_executable_extensions; do
+ 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+@@ -2961,11 +3227,12 @@
+ 	   esac
+ 	 done
+        done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ 
++  test -d ./--version && rmdir ./--version
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2973,11 +3240,10 @@
+     # value for MKDIR_P within a source directory, because that will
+     # break other packages using the cache if that directory is
+     # removed, or if the value is a relative name.
+-    test -d ./--version && rmdir ./--version
+     MKDIR_P="$ac_install_sh -d"
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+ $as_echo "$MKDIR_P" >&6; }
+ 
+ mkdir_p="$MKDIR_P"
+@@ -2990,9 +3256,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then
++if test "${ac_cv_prog_AWK+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -3003,24 +3269,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3028,11 +3294,11 @@
+   test -n "$AWK" && break
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -3050,11 +3316,11 @@
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   SET_MAKE=
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -3074,9 +3340,7 @@
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+-$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -3145,7 +3409,7 @@
+ 
+ 
+ # Check whether --enable-silent-rules was given.
+-if test "${enable_silent_rules+set}" = set; then
++if test "${enable_silent_rules+set}" = set; then :
+   enableval=$enable_silent_rules;
+ fi
+ 
+@@ -3157,14 +3421,14 @@
+ AM_BACKSLASH='\'
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+ $as_echo_n "checking whether ln -s works... " >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+ $as_echo "no, using $LN_S" >&6; }
+ fi
+ 
+@@ -3174,9 +3438,9 @@
+ 	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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -3189,14 +3453,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -3204,10 +3468,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3217,9 +3481,9 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -3232,14 +3496,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -3247,10 +3511,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3259,7 +3523,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -3272,13 +3536,13 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ 	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+@@ -3287,35 +3551,33 @@
+ 
+ gdu_cv_version_required=0.3.2
+ 
+-{ $as_echo "$as_me:$LINENO: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gnome-doc-utils >= $gdu_cv_version_required" >&5
+ $as_echo_n "checking gnome-doc-utils >= $gdu_cv_version_required... " >&6; }
+ if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   gdu_cv_have_gdu=yes
+ else
+   gdu_cv_have_gdu=no
+ fi
+ 
+ if test "$gdu_cv_have_gdu" = "yes"; then
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ else
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	{ { $as_echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+-$as_echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5
+ fi
+ 
+ 
+ 
+ # Check whether --with-help-dir was given.
+-if test "${with_help_dir+set}" = set; then
++if test "${with_help_dir+set}" = set; then :
+   withval=$with_help_dir;
+ else
+   with_help_dir='${datadir}/gnome/help'
+@@ -3326,7 +3588,7 @@
+ 
+ 
+ # Check whether --with-omf-dir was given.
+-if test "${with_omf_dir+set}" = set; then
++if test "${with_omf_dir+set}" = set; then :
+   withval=$with_omf_dir;
+ else
+   with_omf_dir='${datadir}/omf'
+@@ -3337,7 +3599,7 @@
+ 
+ 
+ # Check whether --with-help-formats was given.
+-if test "${with_help_formats+set}" = set; then
++if test "${with_help_formats+set}" = set; then :
+   withval=$with_help_formats;
+ else
+   with_help_formats=''
+@@ -3347,7 +3609,7 @@
+ 
+ 
+ # Check whether --enable-scrollkeeper was given.
+-if test "${enable_scrollkeeper+set}" = set; then
++if test "${enable_scrollkeeper+set}" = set; then :
+   enableval=$enable_scrollkeeper;
+ else
+   enable_scrollkeeper=yes
+@@ -3411,7 +3673,7 @@
+ .PHONY: am__doit
+ END
+ # If we don't find an include directive, just comment out the code.
+-{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
+ $as_echo_n "checking for style of include used by $am_make... " >&6; }
+ am__include="#"
+ am__quote=
+@@ -3439,12 +3701,12 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+ $as_echo "$_am_result" >&6; }
+ rm -f confinc confmf
+ 
+ # Check whether --enable-dependency-tracking was given.
+-if test "${enable_dependency_tracking+set}" = set; then
++if test "${enable_dependency_tracking+set}" = set; then :
+   enableval=$enable_dependency_tracking;
+ fi
+ 
+@@ -3469,9 +3731,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3482,24 +3744,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3509,9 +3771,9 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3522,24 +3784,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3548,7 +3810,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -3562,9 +3824,9 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3575,24 +3837,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3602,9 +3864,9 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3616,18 +3878,18 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -3646,10 +3908,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3661,9 +3923,9 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -3674,24 +3936,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3705,9 +3967,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -3718,24 +3980,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3748,7 +4010,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -3759,57 +4021,37 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3825,8 +4067,8 @@
+ # 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.
+-{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+-$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
++$as_echo_n "checking whether the C compiler works... " >&6; }
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3842,17 +4084,17 @@
+ done
+ rm -f $ac_rmfiles
+ 
+-if { (ac_try="$ac_link_default"
++if { { ac_try="$ac_link_default"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link_default") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
+ # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ # in a Makefile.  We should not override ac_cv_exeext if it was cached,
+@@ -3869,7 +4111,7 @@
+ 	# certainly right.
+ 	break;;
+     *.* )
+-        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
++	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+ 	then :; else
+ 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	fi
+@@ -3888,84 +4130,42 @@
+ else
+   ac_file=''
+ fi
+-
+-{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+-$as_echo "$ac_file" >&6; }
+-if test -z "$ac_file"; then
+-  $as_echo "$as_me: failed program was:" >&5
++if test -z "$ac_file"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++$as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C compiler cannot create executables
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++{ as_fn_set_status 77
++as_fn_error "C compiler cannot create executables
++See \`config.log' for more details." "$LINENO" 5; }; }
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
++$as_echo_n "checking for C compiler default output file name... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
++$as_echo "$ac_file" >&6; }
+ ac_exeext=$ac_cv_exeext
+ 
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+-$as_echo_n "checking whether the C compiler works... " >&6; }
+-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
+-# If not cross compiling, check that we can run a simple program.
+-if test "$cross_compiling" != yes; then
+-  if { ac_try='./$ac_file'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-    cross_compiling=no
+-  else
+-    if test "$cross_compiling" = maybe; then
+-	cross_compiling=yes
+-    else
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot run C compiled programs.
+-If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
+-    fi
+-  fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: yes" >&5
+-$as_echo "yes" >&6; }
+-
+ rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
+ ac_clean_files=$ac_clean_files_save
+-# Check that the compiler produces executables we can run.  If not, either
+-# the compiler is broken, or we cross compile.
+-{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+-$as_echo_n "checking whether we are cross compiling... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+-$as_echo "$cross_compiling" >&6; }
+-
+-{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+ $as_echo_n "checking for suffix of executables... " >&6; }
+-if { (ac_try="$ac_link"
++if { { ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_link") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   # If both `conftest.exe' and `conftest' are `present' (well, observable)
+ # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
+ # work properly (i.e., refer to `conftest.exe'), while it won't with
+@@ -3980,32 +4180,83 @@
+   esac
+ done
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+-rm -f conftest$ac_cv_exeext
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
++rm -f conftest conftest$ac_cv_exeext
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+ $as_echo "$ac_cv_exeext" >&6; }
+ 
+ rm -f conftest.$ac_ext
+ EXEEXT=$ac_cv_exeext
+ ac_exeext=$EXEEXT
+-{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
++#include <stdio.h>
++int
++main ()
++{
++FILE *f = fopen ("conftest.out", "w");
++ return ferror (f) || fclose (f) != 0;
++
++  ;
++  return 0;
++}
++_ACEOF
++ac_clean_files="$ac_clean_files conftest.out"
++# Check that the compiler produces executables we can run.  If not, either
++# the compiler is broken, or we cross compile.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
++$as_echo_n "checking whether we are cross compiling... " >&6; }
++if test "$cross_compiling" != yes; then
++  { { ac_try="$ac_link"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_link") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++  if { ac_try='./conftest$ac_cv_exeext'
++  { { case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_try") 2>&5
++  ac_status=$?
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; }; then
++    cross_compiling=no
++  else
++    if test "$cross_compiling" = maybe; then
++	cross_compiling=yes
++    else
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "cannot run C compiled programs.
++If you meant to cross compile, use \`--host'.
++See \`config.log' for more details." "$LINENO" 5; }
++    fi
++  fi
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
++$as_echo "$cross_compiling" >&6; }
++
++rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
++ac_clean_files=$ac_clean_files_save
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+ $as_echo_n "checking for suffix of object files... " >&6; }
+-if test "${ac_cv_objext+set}" = set; then
++if test "${ac_cv_objext+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4017,17 +4268,17 @@
+ }
+ _ACEOF
+ rm -f conftest.o conftest.obj
+-if { (ac_try="$ac_compile"
++if { { ac_try="$ac_compile"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$ac_compile") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then :
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
+   case $ac_file in
+@@ -4040,31 +4291,23 @@
+   $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+-
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+ $as_echo "$ac_cv_objext" >&6; }
+ OBJEXT=$ac_cv_objext
+ ac_objext=$OBJEXT
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4078,37 +4321,16 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_compiler_gnu=no
++  ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -4117,20 +4339,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+    CFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4141,35 +4359,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4180,36 +4374,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+-	ac_c_werror_flag=$ac_save_c_werror_flag
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
+ 	 CFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4220,42 +4390,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -4272,18 +4417,14 @@
+     CFLAGS=
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -4340,32 +4481,9 @@
+ 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++  if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_c89=$ac_arg
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -4376,17 +4494,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
++fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -4396,9 +4516,9 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4506,7 +4626,7 @@
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+@@ -4541,17 +4661,13 @@
+ 	-Wredundant-decls -Wundef -Wwrite-strings"
+   flags_supported=""
+   flags_unsupported=""
+-  { $as_echo "$as_me:$LINENO: checking for supported compiler flags" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for supported compiler flags" >&5
+ $as_echo_n "checking for supported compiler flags... " >&6; }
+   for each in $list
+   do
+     save_CFLAGS="$CFLAGS"
+     CFLAGS="$CFLAGS $each"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4562,32 +4678,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   flag_ok=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	flag_ok=no
++  flag_ok=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     CFLAGS="$save_CFLAGS"
+ 
+@@ -4597,10 +4692,10 @@
+       flags_unsupported="$flags_unsupported $each"
+     fi
+   done
+-  { $as_echo "$as_me:$LINENO: result: $flags_supported" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $flags_supported" >&5
+ $as_echo "$flags_supported" >&6; }
+   if test "X$flags_unsupported" != X ; then
+-    { $as_echo "$as_me:$LINENO: WARNING: unsupported compiler flags: $flags_unsupported" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unsupported compiler flags: $flags_unsupported" >&5
+ $as_echo "$as_me: WARNING: unsupported compiler flags: $flags_unsupported" >&2;}
+   fi
+   WARNING_FLAGS="$WARNING_FLAGS $flags_supported"
+@@ -4612,35 +4707,27 @@
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+-$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ 
+-{ $as_echo "$as_me:$LINENO: checking build system type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+-if test "${ac_cv_build+set}" = set; then
++if test "${ac_cv_build+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_build_alias=$build_alias
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+-$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+-$as_echo "$as_me: error: invalid value of canonical build" >&2;}
+-   { (exit 1); exit 1; }; };;
++*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4656,28 +4743,24 @@
+ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking host system type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+ $as_echo_n "checking host system type... " >&6; }
+-if test "${ac_cv_host+set}" = set; then
++if test "${ac_cv_host+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test "x$host_alias" = x; then
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+-$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+-$as_echo "$as_me: error: invalid value of canonical host" >&2;}
+-   { (exit 1); exit 1; }; };;
++*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -4702,16 +4785,16 @@
+ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
+     # Check whether --enable-maintainer-mode was given.
+-if test "${enable_maintainer_mode+set}" = set; then
++if test "${enable_maintainer_mode+set}" = set; then :
+   enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+ else
+   USE_MAINTAINER_MODE=no
+ fi
+ 
+-  { $as_echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
+ $as_echo "$USE_MAINTAINER_MODE" >&6; }
+    if test $USE_MAINTAINER_MODE = yes; then
+   MAINTAINER_MODE_TRUE=
+@@ -4727,9 +4810,7 @@
+ 
+ if test "$2.28.3" != "$2.28.3"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STABLE_VERSION "2.28.3"
+-_ACEOF
++$as_echo "#define STABLE_VERSION \"2.28.3\"" >>confdefs.h
+ 
+ fi
+ 
+@@ -4757,9 +4838,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4770,24 +4851,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4797,9 +4878,9 @@
+   ac_ct_CC=$CC
+   # Extract the first word of "gcc", so it can be a program name with args.
+ set dummy gcc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4810,24 +4891,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="gcc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4836,7 +4917,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4850,9 +4931,9 @@
+           if test -n "$ac_tool_prefix"; then
+     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4863,24 +4944,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="${ac_tool_prefix}cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4890,9 +4971,9 @@
+ if test -z "$CC"; then
+   # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4904,18 +4985,18 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+        ac_prog_rejected=yes
+        continue
+      fi
+     ac_cv_prog_CC="cc"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -4934,10 +5015,10 @@
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4949,9 +5030,9 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CC+set}" = set; then
++if test "${ac_cv_prog_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4962,24 +5043,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CC=$ac_cv_prog_CC
+ if test -n "$CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+ $as_echo "$CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4993,9 +5074,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
++if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -5006,24 +5087,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CC=$ac_cv_prog_ac_ct_CC
+ if test -n "$ac_ct_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+ $as_echo "$ac_ct_CC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5036,7 +5117,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5047,62 +5128,42 @@
+ fi
+ 
+ 
+-test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "no acceptable C compiler found in \$PATH
++See \`config.log' for more details." "$LINENO" 5; }
+ 
+ # Provide some information about the compiler.
+-$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
++$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&5"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler --version >&5") 2>&5
+-  ac_status=$?
+-  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -v >&5") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ (ac_try="$ac_compiler -V >&5"
++for ac_option in --version -v -V -qversion; do
++  { { ac_try="$ac_compiler $ac_option >&5"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compiler -V >&5") 2>&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
++  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  if test -s conftest.err; then
++    sed '10a\
++... rest of stderr output deleted ...
++         10q' conftest.err >conftest.er1
++    cat conftest.er1 >&5
++  fi
++  rm -f conftest.er1 conftest.err
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
+ $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
+-if test "${ac_cv_c_compiler_gnu+set}" = set; then
++if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5116,37 +5177,16 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_compiler_gnu=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_compiler_gnu=no
++  ac_compiler_gnu=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_c_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -5155,20 +5195,16 @@
+ fi
+ ac_test_CFLAGS=${CFLAGS+set}
+ ac_save_CFLAGS=$CFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+ $as_echo_n "checking whether $CC accepts -g... " >&6; }
+-if test "${ac_cv_prog_cc_g+set}" = set; then
++if test "${ac_cv_prog_cc_g+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_c_werror_flag=$ac_c_werror_flag
+    ac_c_werror_flag=yes
+    ac_cv_prog_cc_g=no
+    CFLAGS="-g"
+-   cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5179,35 +5215,11 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  CFLAGS=""
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5218,36 +5230,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
+-	ac_c_werror_flag=$ac_save_c_werror_flag
++else
++  ac_c_werror_flag=$ac_save_c_werror_flag
+ 	 CFLAGS="-g"
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -5258,42 +5246,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_g=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_c_werror_flag=$ac_save_c_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -5310,18 +5273,14 @@
+     CFLAGS=
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
+ $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
+-if test "${ac_cv_prog_cc_c89+set}" = set; then
++if test "${ac_cv_prog_cc_c89+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -5378,32 +5337,9 @@
+ 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+-  rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++  if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_prog_cc_c89=$ac_arg
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+   test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
+@@ -5414,17 +5350,19 @@
+ # AC_CACHE_VAL
+ case "x$ac_cv_prog_cc_c89" in
+   x)
+-    { $as_echo "$as_me:$LINENO: result: none needed" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+ $as_echo "none needed" >&6; } ;;
+   xno)
+-    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+ $as_echo "unsupported" >&6; } ;;
+   *)
+     CC="$CC $ac_cv_prog_cc_c89"
+-    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+ $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
++if test "x$ac_cv_prog_cc_c89" != xno; then :
+ 
++fi
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5434,9 +5372,9 @@
+ 
+ depcc="$CC"   am_compiler_list=
+ 
+-{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
++if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5544,7 +5482,7 @@
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
+ $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+@@ -5559,18 +5497,14 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
+ $as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then
++if test "${ac_cv_c_inline+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -5579,41 +5513,17 @@
+ #endif
+ 
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_c_inline=$ac_kw
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   test "$ac_cv_c_inline" != no && break
+ done
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
+ $as_echo "$ac_cv_c_inline" >&6; }
+ 
+-
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+   *)
+@@ -5634,14 +5544,14 @@
+ 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
+-{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+ $as_echo_n "checking how to run the C preprocessor... " >&6; }
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-  if test "${ac_cv_prog_CPP+set}" = set; then
++  if test "${ac_cv_prog_CPP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5656,11 +5566,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -5669,78 +5575,34 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
++if $ac_preproc_ok; then :
+   break
+ fi
+ 
+@@ -5752,7 +5614,7 @@
+ else
+   ac_cv_prog_CPP=$CPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+ $as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -5763,11 +5625,7 @@
+   # <limits.h> exists even on freestanding compilers.
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+   # not just through cpp. "Syntax error" is here to catch this case.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -5776,87 +5634,40 @@
+ #endif
+ 		     Syntax error
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_cpp "$LINENO"; then :
+ 
++else
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # Broken: success on invalid input.
+ continue
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   # Passes both tests.
+ ac_preproc_ok=:
+ break
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+ rm -f conftest.err conftest.$ac_ext
+-if $ac_preproc_ok; then
+-  :
++if $ac_preproc_ok; then :
++
+ else
+-  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ 
+ ac_ext=c
+@@ -5865,115 +5676,23 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-# Find a good install program.  We prefer a C program (faster),
+-# so one script is as good as another.  But avoid the broken or
+-# incompatible versions:
+-# SysV /etc/install, /usr/sbin/install
+-# SunOS /usr/etc/install
+-# IRIX /sbin/install
+-# AIX /bin/install
+-# AmigaOS /C/install, which installs bootblocks on floppy discs
+-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
+-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
+-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+-# OS/2's system install, which has a completely different semantic
+-# ./install, which can be erroneously created by make from ./install.sh.
+-# Reject install programs that cannot install multiple files.
+-{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
+-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+-if test -z "$INSTALL"; then
+-if test "${ac_cv_path_install+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  # Account for people who put trailing slashes in PATH elements.
+-case $as_dir/ in
+-  ./ | .// | /cC/* | \
+-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
+-  /usr/ucb/* ) ;;
+-  *)
+-    # OSF1 and SCO ODT 3.0 have their own names for install.
+-    # Don't use installbsd from OSF since it installs stuff as root
+-    # by default.
+-    for ac_prog in ginstall scoinst install; do
+-      for ac_exec_ext in '' $ac_executable_extensions; do
+-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+-	  if test $ac_prog = install &&
+-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-	    # AIX install.  It has an incompatible calling convention.
+-	    :
+-	  elif test $ac_prog = install &&
+-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+-	    # program-specific install script used by HP pwplus--don't use.
+-	    :
+-	  else
+-	    rm -rf conftest.one conftest.two conftest.dir
+-	    echo one > conftest.one
+-	    echo two > conftest.two
+-	    mkdir conftest.dir
+-	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+-	      test -s conftest.one && test -s conftest.two &&
+-	      test -s conftest.dir/conftest.one &&
+-	      test -s conftest.dir/conftest.two
+-	    then
+-	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+-	      break 3
+-	    fi
+-	  fi
+-	fi
+-      done
+-    done
+-    ;;
+-esac
+-
+-done
+-IFS=$as_save_IFS
+-
+-rm -rf conftest.one conftest.two conftest.dir
+-
+-fi
+-  if test "${ac_cv_path_install+set}" = set; then
+-    INSTALL=$ac_cv_path_install
+-  else
+-    # As a last resort, use the slow shell script.  Don't cache a
+-    # value for INSTALL within a source directory, because that will
+-    # break other packages using the cache if that directory is
+-    # removed, or if the value is a relative name.
+-    INSTALL=$ac_install_sh
+-  fi
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+-$as_echo "$INSTALL" >&6; }
+-
+-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+-# It thinks the first close brace ends the variable substitution.
+-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
+-
+-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+-
+-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+ $as_echo_n "checking whether ln -s works... " >&6; }
+ LN_S=$as_ln_s
+ if test "$LN_S" = "ln -s"; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+ $as_echo "no, using $LN_S" >&6; }
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
++if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -5991,11 +5710,11 @@
+ rm -f conftest.make
+ fi
+ if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+   SET_MAKE=
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -6004,9 +5723,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LEX+set}" = set; then
++if test "${ac_cv_prog_LEX+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LEX"; then
+@@ -6017,24 +5736,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_LEX="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ LEX=$ac_cv_prog_LEX
+ if test -n "$LEX"; then
+-  { $as_echo "$as_me:$LINENO: result: $LEX" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LEX" >&5
+ $as_echo "$LEX" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -6063,20 +5782,20 @@
+   return ! yylex () + ! yywrap ();
+ }
+ _ACEOF
+-{ (ac_try="$LEX conftest.l"
++{ { ac_try="$LEX conftest.l"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
++eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
++$as_echo "$ac_try_echo"; } >&5
+   (eval "$LEX conftest.l") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
+-{ $as_echo "$as_me:$LINENO: checking lex output file root" >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lex output file root" >&5
+ $as_echo_n "checking lex output file root... " >&6; }
+-if test "${ac_cv_prog_lex_root+set}" = set; then
++if test "${ac_cv_prog_lex_root+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -6085,19 +5804,17 @@
+ elif test -f lexyy.c; then
+   ac_cv_prog_lex_root=lexyy
+ else
+-  { { $as_echo "$as_me:$LINENO: error: cannot find output from $LEX; giving up" >&5
+-$as_echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_root" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5
+ $as_echo "$ac_cv_prog_lex_root" >&6; }
+ LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
+ 
+ if test -z "${LEXLIB+set}"; then
+-  { $as_echo "$as_me:$LINENO: checking lex library" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking lex library" >&5
+ $as_echo_n "checking lex library... " >&6; }
+-if test "${ac_cv_lib_lex+set}" = set; then
++if test "${ac_cv_lib_lex+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -6105,55 +5822,29 @@
+     ac_cv_lib_lex='none needed'
+     for ac_lib in '' -lfl -ll; do
+       LIBS="$ac_lib $ac_save_LIBS"
+-      cat >conftest.$ac_ext <<_ACEOF
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ `cat $LEX_OUTPUT_ROOT.c`
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_lex=$ac_lib
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+       test "$ac_cv_lib_lex" != 'none needed' && break
+     done
+     LIBS=$ac_save_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lex" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lex" >&5
+ $as_echo "$ac_cv_lib_lex" >&6; }
+   test "$ac_cv_lib_lex" != 'none needed' && LEXLIB=$ac_cv_lib_lex
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether yytext is a pointer" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether yytext is a pointer" >&5
+ $as_echo_n "checking whether yytext is a pointer... " >&6; }
+-if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
++if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # POSIX says lex can declare yytext either as a pointer or an array; the
+@@ -6162,52 +5853,24 @@
+ ac_cv_prog_lex_yytext_pointer=no
+ ac_save_LIBS=$LIBS
+ LIBS="$LEXLIB $ac_save_LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ #define YYTEXT_POINTER 1
+ `cat $LEX_OUTPUT_ROOT.c`
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_prog_lex_yytext_pointer=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_save_LIBS
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_lex_yytext_pointer" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_yytext_pointer" >&5
+ $as_echo "$ac_cv_prog_lex_yytext_pointer" >&6; }
+ if test $ac_cv_prog_lex_yytext_pointer = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define YYTEXT_POINTER 1
+-_ACEOF
++$as_echo "#define YYTEXT_POINTER 1" >>confdefs.h
+ 
+ fi
+ rm -f conftest.l $LEX_OUTPUT_ROOT.c
+@@ -6220,9 +5883,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_YACC+set}" = set; then
++if test "${ac_cv_prog_YACC+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$YACC"; then
+@@ -6233,24 +5896,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_YACC="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ YACC=$ac_cv_prog_YACC
+ if test -n "$YACC"; then
+-  { $as_echo "$as_me:$LINENO: result: $YACC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YACC" >&5
+ $as_echo "$YACC" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -6263,9 +5926,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AWK+set}" = set; then
++if test "${ac_cv_prog_AWK+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -6276,24 +5939,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AWK="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AWK=$ac_cv_prog_AWK
+ if test -n "$AWK"; then
+-  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+ $as_echo "$AWK" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -6303,9 +5966,9 @@
+ 
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PERL+set}" = set; then
++if test "${ac_cv_path_PERL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PERL in
+@@ -6318,14 +5981,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6333,10 +5996,10 @@
+ fi
+ PERL=$ac_cv_path_PERL
+ if test -n "$PERL"; then
+-  { $as_echo "$as_me:$LINENO: result: $PERL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5
+ $as_echo "$PERL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -6345,18 +6008,16 @@
+ 
+ case $YACC in
+ *yacc*)
+-	{ { $as_echo "$as_me:$LINENO: error: You need bison to build Evolution" >&5
+-$as_echo "$as_me: error: You need bison to build Evolution" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "You need bison to build Evolution" "$LINENO" 5
+ 	;;
+ esac
+ 
+ 
+ # Extract the first word of "jw", so it can be a program name with args.
+ set dummy jw; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_JW+set}" = set; then
++if test "${ac_cv_path_JW+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $JW in
+@@ -6369,14 +6030,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_JW="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_JW" && ac_cv_path_JW="no"
+@@ -6385,10 +6046,10 @@
+ fi
+ JW=$ac_cv_path_JW
+ if test -n "$JW"; then
+-  { $as_echo "$as_me:$LINENO: result: $JW" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JW" >&5
+ $as_echo "$JW" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -6409,16 +6070,16 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether NLS is requested" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+ $as_echo_n "checking whether NLS is requested... " >&6; }
+     # Check whether --enable-nls was given.
+-if test "${enable_nls+set}" = set; then
++if test "${enable_nls+set}" = set; then :
+   enableval=$enable_nls; USE_NLS=$enableval
+ else
+   USE_NLS=yes
+ fi
+ 
+-  { $as_echo "$as_me:$LINENO: result: $USE_NLS" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+ $as_echo "$USE_NLS" >&6; }
+ 
+ 
+@@ -6426,35 +6087,31 @@
+ 
+ case "$am__api_version" in
+     1.01234)
+-	{ { $as_echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+-$as_echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5
+     ;;
+     *)
+     ;;
+ esac
+ 
+ if test -n "0.35.5"; then
+-    { $as_echo "$as_me:$LINENO: checking for intltool >= 0.35.5" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.5" >&5
+ $as_echo_n "checking for intltool >= 0.35.5... " >&6; }
+ 
+     INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.5 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+     INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
+     INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ 
+-    { $as_echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5
+ $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; }
+     test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+-	{ { $as_echo "$as_me:$LINENO: error: Your intltool is too old.  You need intltool 0.35.5 or later." >&5
+-$as_echo "$as_me: error: Your intltool is too old.  You need intltool 0.35.5 or later." >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "Your intltool is too old.  You need intltool 0.35.5 or later." "$LINENO" 5
+ fi
+ 
+ # Extract the first word of "intltool-update", so it can be a program name with args.
+ set dummy intltool-update; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_UPDATE+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $INTLTOOL_UPDATE in
+@@ -6467,14 +6124,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6482,19 +6139,19 @@
+ fi
+ INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE
+ if test -n "$INTLTOOL_UPDATE"; then
+-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_UPDATE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5
+ $as_echo "$INTLTOOL_UPDATE" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ # Extract the first word of "intltool-merge", so it can be a program name with args.
+ set dummy intltool-merge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_MERGE+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $INTLTOOL_MERGE in
+@@ -6507,14 +6164,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6522,19 +6179,19 @@
+ fi
+ INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE
+ if test -n "$INTLTOOL_MERGE"; then
+-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_MERGE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5
+ $as_echo "$INTLTOOL_MERGE" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ # Extract the first word of "intltool-extract", so it can be a program name with args.
+ set dummy intltool-extract; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_EXTRACT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $INTLTOOL_EXTRACT in
+@@ -6547,14 +6204,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6562,18 +6219,16 @@
+ fi
+ INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT
+ if test -n "$INTLTOOL_EXTRACT"; then
+-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_EXTRACT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5
+ $as_echo "$INTLTOOL_EXTRACT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
+-    { { $as_echo "$as_me:$LINENO: error: The intltool scripts were not found. Please install intltool." >&5
+-$as_echo "$as_me: error: The intltool scripts were not found. Please install intltool." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5
+ 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 $< $@'
+@@ -6695,9 +6350,9 @@
+ # Check the gettext tools to make sure they are GNU
+ # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $XGETTEXT in
+@@ -6710,14 +6365,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6725,19 +6380,19 @@
+ fi
+ XGETTEXT=$ac_cv_path_XGETTEXT
+ if test -n "$XGETTEXT"; then
+-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ # Extract the first word of "msgmerge", so it can be a program name with args.
+ set dummy msgmerge; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGMERGE+set}" = set; then
++if test "${ac_cv_path_MSGMERGE+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MSGMERGE in
+@@ -6750,14 +6405,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6765,19 +6420,19 @@
+ fi
+ MSGMERGE=$ac_cv_path_MSGMERGE
+ if test -n "$MSGMERGE"; then
+-  { $as_echo "$as_me:$LINENO: result: $MSGMERGE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+ $as_echo "$MSGMERGE" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ # Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MSGFMT in
+@@ -6790,14 +6445,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6805,19 +6460,19 @@
+ fi
+ MSGFMT=$ac_cv_path_MSGFMT
+ if test -n "$MSGFMT"; then
+-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GMSGFMT in
+@@ -6830,14 +6485,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -6846,33 +6501,29 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
+-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
+ mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
+ mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
+ if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
+-    { { $as_echo "$as_me:$LINENO: error: GNU gettext tools not found; required for intltool" >&5
+-$as_echo "$as_me: error: GNU gettext tools not found; required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
+ 
+ # Extract the first word of "perl", so it can be a program name with args.
+ set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
++if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $INTLTOOL_PERL in
+@@ -6885,14 +6536,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -6900,41 +6551,35 @@
+ fi
+ INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+ if test -n "$INTLTOOL_PERL"; then
+-  { $as_echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+ $as_echo "$INTLTOOL_PERL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ if test -z "$INTLTOOL_PERL"; then
+-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error "perl not found" "$LINENO" 5
+ fi
+-{ $as_echo "$as_me:$LINENO: checking for perl >= 5.8.1" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+ $as_echo_n "checking for perl >= 5.8.1... " >&6; }
+ $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+ if test $? -ne 0; then
+-   { { $as_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+ else
+    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+ $as_echo "$IT_PERL_VERSION" >&6; }
+ fi
+ if test "x" != "xno-xml"; then
+-   { $as_echo "$as_me:$LINENO: checking for XML::Parser" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+ $as_echo_n "checking for XML::Parser... " >&6; }
+    if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       { $as_echo "$as_me:$LINENO: result: ok" >&5
++       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+    else
+-       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
++       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+    fi
+ fi
+ 
+@@ -6944,11 +6589,7 @@
+ # Set DATADIRNAME correctly if it is not set yet
+ # (copied from glib-gettext.m4)
+ if test -z "$DATADIRNAME"; then
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -6960,120 +6601,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   DATADIRNAME=share
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	case $host in
++  case $host in
+     *-*-solaris*)
+-                        { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char bind_textdomain_codeset (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return bind_textdomain_codeset ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_bind_textdomain_codeset=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++                        ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+   DATADIRNAME=share
+ else
+   DATADIRNAME=lib
+@@ -7085,10 +6619,8 @@
+     ;;
+     esac
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+ 
+ 
+@@ -7097,9 +6629,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
+ $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+-if test "${ac_cv_path_GREP+set}" = set; then
++if test "${ac_cv_path_GREP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -7110,7 +6642,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in grep ggrep; do
++    for ac_prog in grep ggrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+@@ -7130,7 +6662,7 @@
+     $as_echo 'GREP' >> "conftest.nl"
+     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_GREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_GREP="$ac_path_GREP"
+@@ -7145,26 +6677,24 @@
+       $ac_path_GREP_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
+ $as_echo "$ac_cv_path_GREP" >&6; }
+  GREP="$ac_cv_path_GREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
+ $as_echo_n "checking for egrep... " >&6; }
+-if test "${ac_cv_path_EGREP+set}" = set; then
++if test "${ac_cv_path_EGREP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -7178,7 +6708,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in egrep; do
++    for ac_prog in egrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+@@ -7198,7 +6728,7 @@
+     $as_echo 'EGREP' >> "conftest.nl"
+     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_EGREP="$ac_path_EGREP"
+@@ -7213,12 +6743,10 @@
+       $ac_path_EGREP_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -7226,21 +6754,17 @@
+ 
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
+ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
+-if test "${ac_cv_header_stdc+set}" = set; then
++if test "${ac_cv_header_stdc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -7255,48 +6779,23 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_header_stdc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdc=no
++  ac_cv_header_stdc=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <string.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "memchr" >/dev/null 2>&1; then
+-  :
++  $EGREP "memchr" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -7306,18 +6805,14 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "free" >/dev/null 2>&1; then
+-  :
++  $EGREP "free" >/dev/null 2>&1; then :
++
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -7327,14 +6822,10 @@
+ 
+ if test $ac_cv_header_stdc = yes; then
+   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   :
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -7361,118 +6852,34 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_run "$LINENO"; then :
+ 
+-( exit $ac_status )
+-ac_cv_header_stdc=no
++else
++  ac_cv_header_stdc=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+ $as_echo "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
++$as_echo "#define STDC_HEADERS 1" >>confdefs.h
+ 
+ fi
+ 
+ # On IRIX 5.3, sys/types and inttypes.h are conflicting.
+-
+-
+-
+-
+-
+-
+-
+-
+-
+ for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+ 		  inttypes.h stdint.h unistd.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7483,151 +6890,12 @@
+ 
+ 
+ 
+-
+-for ac_header in locale.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+-$as_echo_n "checking $ac_header usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+-$as_echo_n "checking $ac_header presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$ac_header>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------ ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
+-## ------------------------------------------------------------------------ ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++   for ac_header in locale.h
++do :
++  ac_fn_c_check_header_mongrel "$LINENO" "locale.h" "ac_cv_header_locale_h" "$ac_includes_default"
++if test "x$ac_cv_header_locale_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_LOCALE_H 1
+ _ACEOF
+ 
+ fi
+@@ -7635,16 +6903,12 @@
+ done
+ 
+     if test $ac_cv_header_locale_h = yes; then
+-    { $as_echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LC_MESSAGES" >&5
+ $as_echo_n "checking for LC_MESSAGES... " >&6; }
+-if test "${am_cv_val_LC_MESSAGES+set}" = set; then
++if test "${am_cv_val_LC_MESSAGES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <locale.h>
+ int
+@@ -7655,46 +6919,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   am_cv_val_LC_MESSAGES=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	am_cv_val_LC_MESSAGES=no
++  am_cv_val_LC_MESSAGES=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_val_LC_MESSAGES" >&5
+ $as_echo "$am_cv_val_LC_MESSAGES" >&6; }
+     if test $am_cv_val_LC_MESSAGES = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LC_MESSAGES 1
+-_ACEOF
++$as_echo "#define HAVE_LC_MESSAGES 1" >>confdefs.h
+ 
+     fi
+   fi
+@@ -7707,155 +6944,20 @@
+     XGETTEXT=:
+     INTLLIBS=
+ 
+-    if test "${ac_cv_header_libintl_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
+-if test "${ac_cv_header_libintl_h+set}" = set; then
++    ac_fn_c_check_header_mongrel "$LINENO" "libintl.h" "ac_cv_header_libintl_h" "$ac_includes_default"
++if test "x$ac_cv_header_libintl_h" = x""yes; then :
++  gt_cv_func_dgettext_libintl="no"
++      libintl_extra_libs=""
++
++      #
++      # First check in libc
++      #
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in libc" >&5
++$as_echo_n "checking for ngettext in libc... " >&6; }
++if test "${gt_cv_func_ngettext_libc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
+ else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h usability" >&5
+-$as_echo_n "checking libintl.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <libintl.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libintl.h presence" >&5
+-$as_echo_n "checking libintl.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <libintl.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libintl.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------ ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
+-## ------------------------------------------------------------------------ ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libintl.h" >&5
+-$as_echo_n "checking for libintl.h... " >&6; }
+-if test "${ac_cv_header_libintl_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libintl_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5
+-$as_echo "$ac_cv_header_libintl_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libintl_h" = x""yes; then
+-  gt_cv_func_dgettext_libintl="no"
+-      libintl_extra_libs=""
+-
+-      #
+-      # First check in libc
+-      #
+-      { $as_echo "$as_me:$LINENO: checking for ngettext in libc" >&5
+-$as_echo_n "checking for ngettext in libc... " >&6; }
+-if test "${gt_cv_func_ngettext_libc+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <libintl.h>
+@@ -7868,54 +6970,25 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   gt_cv_func_ngettext_libc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	gt_cv_func_ngettext_libc=no
++  gt_cv_func_ngettext_libc=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_ngettext_libc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_ngettext_libc" >&5
+ $as_echo "$gt_cv_func_ngettext_libc" >&6; }
+ 
+       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-	      { $as_echo "$as_me:$LINENO: checking for dgettext in libc" >&5
++	      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in libc" >&5
+ $as_echo_n "checking for dgettext in libc... " >&6; }
+-if test "${gt_cv_func_dgettext_libc+set}" = set; then
++if test "${gt_cv_func_dgettext_libc+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <libintl.h>
+@@ -7928,141 +7001,26 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   gt_cv_func_dgettext_libc=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	gt_cv_func_dgettext_libc=no
++  gt_cv_func_dgettext_libc=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_dgettext_libc" >&5
+ $as_echo "$gt_cv_func_dgettext_libc" >&6; }
+       fi
+ 
+       if test "$gt_cv_func_ngettext_libc" = "yes" ; then
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++        for ac_func in bind_textdomain_codeset
++do :
++  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+ 
+ fi
+@@ -8077,18 +7035,14 @@
+ 	 || test "$gt_cv_func_ngettext_libc" != "yes" \
+          || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then
+ 
+-        { $as_echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bindtextdomain in -lintl" >&5
+ $as_echo_n "checking for bindtextdomain in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then
++if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -8106,55 +7060,26 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_intl_bindtextdomain=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_bindtextdomain=no
++  ac_cv_lib_intl_bindtextdomain=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_bindtextdomain" >&5
+ $as_echo "$ac_cv_lib_intl_bindtextdomain" >&6; }
+-if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then
+-  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_bindtextdomain" = x""yes; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -8172,55 +7097,26 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_intl_ngettext=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_ngettext=no
++  ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+-  { $as_echo "$as_me:$LINENO: checking for dgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
+ $as_echo_n "checking for dgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -8238,43 +7134,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_intl_dgettext=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_dgettext=no
++  ac_cv_lib_intl_dgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
+   gt_cv_func_dgettext_libintl=yes
+ fi
+ 
+@@ -8284,22 +7155,18 @@
+ 
+ 
+ 	if test "$gt_cv_func_dgettext_libintl" != "yes" ; then
+-	  { $as_echo "$as_me:$LINENO: checking if -liconv is needed to use gettext" >&5
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if -liconv is needed to use gettext" >&5
+ $as_echo_n "checking if -liconv is needed to use gettext... " >&6; }
+-	  { $as_echo "$as_me:$LINENO: result: " >&5
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+-  	  { $as_echo "$as_me:$LINENO: checking for ngettext in -lintl" >&5
++  	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ngettext in -lintl" >&5
+ $as_echo_n "checking for ngettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_ngettext+set}" = set; then
++if test "${ac_cv_lib_intl_ngettext+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -8317,55 +7184,26 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_intl_ngettext=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_ngettext=no
++  ac_cv_lib_intl_ngettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_ngettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_ngettext" >&5
+ $as_echo "$ac_cv_lib_intl_ngettext" >&6; }
+-if test "x$ac_cv_lib_intl_ngettext" = x""yes; then
+-  { $as_echo "$as_me:$LINENO: checking for dcgettext in -lintl" >&5
++if test "x$ac_cv_lib_intl_ngettext" = x""yes; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dcgettext in -lintl" >&5
+ $as_echo_n "checking for dcgettext in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_dcgettext+set}" = set; then
++if test "${ac_cv_lib_intl_dcgettext+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl -liconv $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -8383,43 +7221,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_intl_dcgettext=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_dcgettext=no
++  ac_cv_lib_intl_dcgettext=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dcgettext" >&5
+ $as_echo "$ac_cv_lib_intl_dcgettext" >&6; }
+-if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then
++if test "x$ac_cv_lib_intl_dcgettext" = x""yes; then :
+   gt_cv_func_dgettext_libintl=yes
+ 			libintl_extra_libs=-liconv
+ else
+@@ -8441,106 +7254,16 @@
+           glib_save_LIBS="$LIBS"
+           LIBS="$LIBS -lintl $libintl_extra_libs"
+           unset ac_cv_func_bind_textdomain_codeset
+-
+-for ac_func in bind_textdomain_codeset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
++          for ac_func in bind_textdomain_codeset
++do :
++  ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_BIND_TEXTDOMAIN_CODESET 1
+ _ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
++fi
++done
+ 
+           LIBS="$glib_save_LIBS"
+ 
+@@ -8566,15 +7289,13 @@
+ 
+       if test "$gt_cv_have_gettext" = "yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_GETTEXT 1
+-_ACEOF
++$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+ 
+ 	# Extract the first word of "msgfmt", so it can be a program name with args.
+ set dummy msgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_MSGFMT+set}" = set; then
++if test "${ac_cv_path_MSGFMT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$MSGFMT" in
+@@ -8599,118 +7320,28 @@
+ fi
+ MSGFMT="$ac_cv_path_MSGFMT"
+ if test "$MSGFMT" != "no"; then
+-  { $as_echo "$as_me:$LINENO: result: $MSGFMT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+ $as_echo "$MSGFMT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 	if test "$MSGFMT" != "no"; then
+           glib_save_LIBS="$LIBS"
+           LIBS="$LIBS $INTLLIBS"
+-
+-for ac_func in dcgettext
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++	  for ac_func in dcgettext
++do :
++  ac_fn_c_check_func "$LINENO" "dcgettext" "ac_cv_func_dcgettext"
++if test "x$ac_cv_func_dcgettext" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_DCGETTEXT 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 	  MSGFMT_OPTS=
+-	  { $as_echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
++	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if msgfmt accepts -c" >&5
+ $as_echo_n "checking if msgfmt accepts -c... " >&6; }
+ 	  cat >conftest.foo <<_ACEOF
+ 
+@@ -8725,14 +7356,14 @@
+ "Content-Transfer-Encoding: 8bit\n"
+ 
+ _ACEOF
+-if { ($as_echo "$as_me:$LINENO: \$MSGFMT -c -o /dev/null conftest.foo") >&5
++if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$MSGFMT -c -o /dev/null conftest.foo"; } >&5
+   ($MSGFMT -c -o /dev/null conftest.foo) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  MSGFMT_OPTS=-c; { $as_echo "$as_me:$LINENO: result: yes" >&5
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  MSGFMT_OPTS=-c; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+-else { $as_echo "$as_me:$LINENO: result: no" >&5
++else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ echo "$as_me: failed input was:" >&5
+ sed 's/^/| /' conftest.foo >&5
+@@ -8740,9 +7371,9 @@
+ 
+ 	  # Extract the first word of "gmsgfmt", so it can be a program name with args.
+ set dummy gmsgfmt; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GMSGFMT+set}" = set; then
++if test "${ac_cv_path_GMSGFMT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GMSGFMT in
+@@ -8755,14 +7386,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
+@@ -8771,19 +7402,19 @@
+ fi
+ GMSGFMT=$ac_cv_path_GMSGFMT
+ if test -n "$GMSGFMT"; then
+-  { $as_echo "$as_me:$LINENO: result: $GMSGFMT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+ $as_echo "$GMSGFMT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ 	  # Extract the first word of "xgettext", so it can be a program name with args.
+ set dummy xgettext; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_XGETTEXT+set}" = set; then
++if test "${ac_cv_path_XGETTEXT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case "$XGETTEXT" in
+@@ -8808,18 +7439,14 @@
+ fi
+ XGETTEXT="$ac_cv_path_XGETTEXT"
+ if test "$XGETTEXT" != ":"; then
+-  { $as_echo "$as_me:$LINENO: result: $XGETTEXT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+ $as_echo "$XGETTEXT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+-	  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -8831,121 +7458,14 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   CATOBJEXT=.gmo
+              DATADIRNAME=share
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	case $host in
++  case $host in
+ 	    *-*-solaris*)
+-	    	                	    	                { $as_echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+-$as_echo_n "checking for bind_textdomain_codeset... " >&6; }
+-if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char bind_textdomain_codeset (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef bind_textdomain_codeset
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char bind_textdomain_codeset ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return bind_textdomain_codeset ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_bind_textdomain_codeset=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_bind_textdomain_codeset=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+-$as_echo "$ac_cv_func_bind_textdomain_codeset" >&6; }
+-if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then
++	    	                	    	                ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset"
++if test "x$ac_cv_func_bind_textdomain_codeset" = x""yes; then :
+   CATOBJEXT=.gmo
+                DATADIRNAME=share
+ else
+@@ -8960,10 +7480,8 @@
+ 	    ;;
+ 	    esac
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+           LIBS="$glib_save_LIBS"
+ 	  INSTOBJEXT=.mo
+ 	else
+@@ -8977,9 +7495,7 @@
+ 
+     if test "$gt_cv_have_gettext" = "yes" ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NLS 1
+-_ACEOF
++$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+ 
+     fi
+ 
+@@ -8987,7 +7503,7 @@
+                   if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
+         : ;
+       else
+-        { $as_echo "$as_me:$LINENO: result: found xgettext program is not GNU xgettext; ignore it" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: found xgettext program is not GNU xgettext; ignore it" >&5
+ $as_echo "found xgettext program is not GNU xgettext; ignore it" >&6; }
+         XGETTEXT=":"
+       fi
+@@ -9020,7 +7536,7 @@
+      if test "x$ALL_LINGUAS" = "x"; then
+        LINGUAS=
+      else
+-       { $as_echo "$as_me:$LINENO: checking for catalogs to be installed" >&5
++       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5
+ $as_echo_n "checking for catalogs to be installed... " >&6; }
+        NEW_LINGUAS=
+        for presentlang in $ALL_LINGUAS; do
+@@ -9045,7 +7561,7 @@
+          fi
+        done
+        LINGUAS=$NEW_LINGUAS
+-       { $as_echo "$as_me:$LINENO: result: $LINGUAS" >&5
++       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5
+ $as_echo "$LINGUAS" >&6; }
+      fi
+ 
+@@ -9090,7 +7606,7 @@
+ 
+ 
+ # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
++if test "${enable_static+set}" = set; then :
+   enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+@@ -9127,9 +7643,9 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}as; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AS+set}" = set; then
++if test "${ac_cv_prog_AS+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AS"; then
+@@ -9140,24 +7656,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AS="${ac_tool_prefix}as"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AS=$ac_cv_prog_AS
+ if test -n "$AS"; then
+-  { $as_echo "$as_me:$LINENO: result: $AS" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5
+ $as_echo "$AS" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9167,9 +7683,9 @@
+   ac_ct_AS=$AS
+   # Extract the first word of "as", so it can be a program name with args.
+ set dummy as; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
++if test "${ac_cv_prog_ac_ct_AS+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AS"; then
+@@ -9180,24 +7696,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AS="as"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_AS=$ac_cv_prog_ac_ct_AS
+ if test -n "$ac_ct_AS"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5
+ $as_echo "$ac_ct_AS" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9206,7 +7722,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -9219,9 +7735,9 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DLLTOOL+set}" = set; then
++if test "${ac_cv_prog_DLLTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DLLTOOL"; then
+@@ -9232,24 +7748,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ DLLTOOL=$ac_cv_prog_DLLTOOL
+ if test -n "$DLLTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+ $as_echo "$DLLTOOL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9259,9 +7775,9 @@
+   ac_ct_DLLTOOL=$DLLTOOL
+   # Extract the first word of "dlltool", so it can be a program name with args.
+ set dummy dlltool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
++if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DLLTOOL"; then
+@@ -9272,24 +7788,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DLLTOOL="dlltool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+ if test -n "$ac_ct_DLLTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+ $as_echo "$ac_ct_DLLTOOL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9298,7 +7814,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -9311,9 +7827,9 @@
+   if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -9324,24 +7840,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ OBJDUMP=$ac_cv_prog_OBJDUMP
+ if test -n "$OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+ $as_echo "$OBJDUMP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9351,9 +7867,9 @@
+   ac_ct_OBJDUMP=$OBJDUMP
+   # Extract the first word of "objdump", so it can be a program name with args.
+ set dummy objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -9364,24 +7880,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+ if test -n "$ac_ct_OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9390,7 +7906,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -9425,7 +7941,7 @@
+ 
+ case `pwd` in
+   *\ * | *\	*)
+-    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
+ $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
+ esac
+ 
+@@ -9448,9 +7964,9 @@
+ 
+ ltmain="$ac_aux_dir/ltmain.sh"
+ 
+-{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+ $as_echo_n "checking for a sed that does not truncate output... " >&6; }
+-if test "${ac_cv_path_SED+set}" = set; then
++if test "${ac_cv_path_SED+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+@@ -9458,7 +7974,7 @@
+        ac_script="$ac_script$as_nl$ac_script"
+      done
+      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
+-     $as_unset ac_script || ac_script=
++     { ac_script=; unset ac_script;}
+      if test -z "$SED"; then
+   ac_path_SED_found=false
+   # Loop through the user's path and test for each of PROGNAME-LIST
+@@ -9467,7 +7983,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in sed gsed; do
++    for ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+@@ -9487,7 +8003,7 @@
+     $as_echo '' >> "conftest.nl"
+     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_SED_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_SED="$ac_path_SED"
+@@ -9502,19 +8018,17 @@
+       $ac_path_SED_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_SED"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_SED=$SED
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+ $as_echo "$ac_cv_path_SED" >&6; }
+  SED="$ac_cv_path_SED"
+   rm -f conftest.sed
+@@ -9532,9 +8046,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
+ $as_echo_n "checking for fgrep... " >&6; }
+-if test "${ac_cv_path_FGREP+set}" = set; then
++if test "${ac_cv_path_FGREP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
+@@ -9548,7 +8062,7 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in fgrep; do
++    for ac_prog in fgrep; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
+       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+@@ -9568,7 +8082,7 @@
+     $as_echo 'FGREP' >> "conftest.nl"
+     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
+     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
+-    ac_count=`expr $ac_count + 1`
++    as_fn_arith $ac_count + 1 && ac_count=$as_val
+     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
+       # Best one so far, save it but keep looking for a better one
+       ac_cv_path_FGREP="$ac_path_FGREP"
+@@ -9583,12 +8097,10 @@
+       $ac_path_FGREP_found && break 3
+     done
+   done
+-done
++  done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_FGREP"; then
+-    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+-$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_FGREP=$FGREP
+@@ -9596,7 +8108,7 @@
+ 
+    fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
+ $as_echo "$ac_cv_path_FGREP" >&6; }
+  FGREP="$ac_cv_path_FGREP"
+ 
+@@ -9622,7 +8134,7 @@
+ 
+ 
+ # Check whether --with-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
++if test "${with_gnu_ld+set}" = set; then :
+   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
+ else
+   with_gnu_ld=no
+@@ -9631,7 +8143,7 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+ $as_echo_n "checking for ld used by $CC... " >&6; }
+   case $host in
+   *-*-mingw*)
+@@ -9661,13 +8173,13 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+ $as_echo_n "checking for GNU ld... " >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+ $as_echo_n "checking for non-GNU ld... " >&6; }
+ fi
+-if test "${lt_cv_path_LD+set}" = set; then
++if test "${lt_cv_path_LD+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$LD"; then
+@@ -9698,18 +8210,16 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  { $as_echo "$as_me:$LINENO: result: $LD" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+ $as_echo "$LD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+-test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
+-$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
+-   { (exit 1); exit 1; }; }
+-{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
++test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+ $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
+-if test "${lt_cv_prog_gnu_ld+set}" = set; then
++if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # I'd rather use --version here, but apparently some GNU lds only accept -v.
+@@ -9722,7 +8232,7 @@
+   ;;
+ esac
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
+ $as_echo "$lt_cv_prog_gnu_ld" >&6; }
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+@@ -9734,9 +8244,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
+ $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
+-if test "${lt_cv_path_NM+set}" = set; then
++if test "${lt_cv_path_NM+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NM"; then
+@@ -9783,7 +8293,7 @@
+   : ${lt_cv_path_NM=no}
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
+ $as_echo "$lt_cv_path_NM" >&6; }
+ if test "$lt_cv_path_NM" != "no"; then
+   NM="$lt_cv_path_NM"
+@@ -9794,9 +8304,9 @@
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DUMPBIN+set}" = set; then
++if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DUMPBIN"; then
+@@ -9807,24 +8317,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ DUMPBIN=$ac_cv_prog_DUMPBIN
+ if test -n "$DUMPBIN"; then
+-  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
+ $as_echo "$DUMPBIN" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9838,9 +8348,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
++if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DUMPBIN"; then
+@@ -9851,24 +8361,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
+ if test -n "$ac_ct_DUMPBIN"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
+ $as_echo "$ac_ct_DUMPBIN" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -9881,7 +8391,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -9901,33 +8411,33 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
+ $as_echo_n "checking the name lister ($NM) interface... " >&6; }
+-if test "${lt_cv_nm_interface+set}" = set; then
++if test "${lt_cv_nm_interface+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_nm_interface="BSD nm"
+   echo "int some_variable = 0;" > conftest.$ac_ext
+-  (eval echo "\"\$as_me:9911: $ac_compile\"" >&5)
++  (eval echo "\"\$as_me:8421: $ac_compile\"" >&5)
+   (eval "$ac_compile" 2>conftest.err)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:9914: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
++  (eval echo "\"\$as_me:8424: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+   cat conftest.err >&5
+-  (eval echo "\"\$as_me:9917: output\"" >&5)
++  (eval echo "\"\$as_me:8427: output\"" >&5)
+   cat conftest.out >&5
+   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+     lt_cv_nm_interface="MS dumpbin"
+   fi
+   rm -f conftest*
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
+ $as_echo "$lt_cv_nm_interface" >&6; }
+ 
+ # find the maximum length of command line arguments
+-{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
+ $as_echo_n "checking the maximum length of command line arguments... " >&6; }
+-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
++if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+     i=0
+@@ -10045,10 +8555,10 @@
+ fi
+ 
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
+ $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: none" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
+ $as_echo "none" >&6; }
+ fi
+ max_cmd_len=$lt_cv_sys_max_cmd_len
+@@ -10062,7 +8572,7 @@
+ : ${MV="mv -f"}
+ : ${RM="rm -f"}
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
+ $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
+ # Try some XSI features
+ xsi_shell=no
+@@ -10072,17 +8582,17 @@
+     && eval 'test $(( 1 + 1 )) -eq 2 \
+     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
+   && xsi_shell=yes
+-{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
+ $as_echo "$xsi_shell" >&6; }
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
+ $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
+ lt_shell_append=no
+ ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
+     >/dev/null 2>&1 \
+   && lt_shell_append=yes
+-{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
+ $as_echo "$lt_shell_append" >&6; }
+ 
+ 
+@@ -10117,14 +8627,14 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
+ $as_echo_n "checking for $LD option to reload object files... " >&6; }
+-if test "${lt_cv_ld_reload_flag+set}" = set; then
++if test "${lt_cv_ld_reload_flag+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
+ $as_echo "$lt_cv_ld_reload_flag" >&6; }
+ reload_flag=$lt_cv_ld_reload_flag
+ case $reload_flag in
+@@ -10153,9 +8663,9 @@
+ if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OBJDUMP+set}" = set; then
++if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OBJDUMP"; then
+@@ -10166,24 +8676,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ OBJDUMP=$ac_cv_prog_OBJDUMP
+ if test -n "$OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
+ $as_echo "$OBJDUMP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10193,9 +8703,9 @@
+   ac_ct_OBJDUMP=$OBJDUMP
+   # Extract the first word of "objdump", so it can be a program name with args.
+ set dummy objdump; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OBJDUMP"; then
+@@ -10206,24 +8716,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OBJDUMP="objdump"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
+ if test -n "$ac_ct_OBJDUMP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
+ $as_echo "$ac_ct_OBJDUMP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10232,7 +8742,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -10249,9 +8759,9 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
+ $as_echo_n "checking how to recognize dependent libraries... " >&6; }
+-if test "${lt_cv_deplibs_check_method+set}" = set; then
++if test "${lt_cv_deplibs_check_method+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+@@ -10445,7 +8955,7 @@
+ esac
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
+ $as_echo "$lt_cv_deplibs_check_method" >&6; }
+ file_magic_cmd=$lt_cv_file_magic_cmd
+ deplibs_check_method=$lt_cv_deplibs_check_method
+@@ -10465,9 +8975,9 @@
+ 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_AR+set}" = set; then
++if test "${ac_cv_prog_AR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AR"; then
+@@ -10478,24 +8988,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_AR="${ac_tool_prefix}ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ AR=$ac_cv_prog_AR
+ if test -n "$AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $AR" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+ $as_echo "$AR" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10505,9 +9015,9 @@
+   ac_ct_AR=$AR
+   # Extract the first word of "ar", so it can be a program name with args.
+ set dummy ar; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
++if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_AR"; then
+@@ -10518,24 +9028,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_AR="ar"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_AR=$ac_cv_prog_ac_ct_AR
+ if test -n "$ac_ct_AR"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+ $as_echo "$ac_ct_AR" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10544,7 +9054,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -10570,9 +9080,9 @@
+ 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_STRIP+set}" = set; then
++if test "${ac_cv_prog_STRIP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -10583,24 +9093,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ STRIP=$ac_cv_prog_STRIP
+ if test -n "$STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+ $as_echo "$STRIP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10610,9 +9120,9 @@
+   ac_ct_STRIP=$STRIP
+   # Extract the first word of "strip", so it can be a program name with args.
+ set dummy strip; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
++if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -10623,24 +9133,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_STRIP="strip"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+ if test -n "$ac_ct_STRIP"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+ $as_echo "$ac_ct_STRIP" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10649,7 +9159,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -10669,9 +9179,9 @@
+ 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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_RANLIB+set}" = set; then
++if test "${ac_cv_prog_RANLIB+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -10682,24 +9192,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ RANLIB=$ac_cv_prog_RANLIB
+ if test -n "$RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+ $as_echo "$RANLIB" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10709,9 +9219,9 @@
+   ac_ct_RANLIB=$RANLIB
+   # Extract the first word of "ranlib", so it can be a program name with args.
+ set dummy ranlib; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
++if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -10722,24 +9232,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_RANLIB="ranlib"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
+ if test -n "$ac_ct_RANLIB"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
+ $as_echo "$ac_ct_RANLIB" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -10748,7 +9258,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -10826,9 +9336,9 @@
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
+ $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
+-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
++if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -10944,18 +9454,18 @@
+ int main(){nm_test_var='a';nm_test_func();return(0);}
+ _LT_EOF
+ 
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
++    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
+   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s "$nlist"; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s "$nlist"; then
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+ 	mv -f "$nlist"T "$nlist"
+@@ -11008,11 +9518,11 @@
+ 	  lt_save_CFLAGS="$CFLAGS"
+ 	  LIBS="conftstm.$ac_objext"
+ 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
+-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
+ 	    pipe_works=yes
+ 	  fi
+ 	  LIBS="$lt_save_LIBS"
+@@ -11046,10 +9556,10 @@
+   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
+-  { $as_echo "$as_me:$LINENO: result: failed" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+ $as_echo "failed" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: ok" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ fi
+ 
+@@ -11075,7 +9585,7 @@
+ 
+ 
+ # Check whether --enable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
++if test "${enable_libtool_lock+set}" = set; then :
+   enableval=$enable_libtool_lock;
+ fi
+ 
+@@ -11087,11 +9597,11 @@
+ ia64-*-hpux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+     case `/usr/bin/file conftest.$ac_objext` in
+       *ELF-32*)
+ 	HPUX_IA64_MODE="32"
+@@ -11105,12 +9615,12 @@
+   ;;
+ *-*-irix6*)
+   # Find out which ABI we are using.
+-  echo '#line 11108 "configure"' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  echo '#line 9618 "configure"' > conftest.$ac_ext
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+     if test "$lt_cv_prog_gnu_ld" = yes; then
+       case `/usr/bin/file conftest.$ac_objext` in
+ 	*32-bit*)
+@@ -11144,11 +9654,11 @@
+ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+     case `/usr/bin/file conftest.o` in
+       *32-bit*)
+ 	case $host in
+@@ -11197,9 +9707,9 @@
+   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+   SAVE_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -belf"
+-  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
+ $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
+-if test "${lt_cv_cc_needs_belf+set}" = set; then
++if test "${lt_cv_cc_needs_belf+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_ext=c
+@@ -11208,11 +9718,7 @@
+ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+-     cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -11223,38 +9729,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   lt_cv_cc_needs_belf=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	lt_cv_cc_needs_belf=no
++  lt_cv_cc_needs_belf=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+      ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -11262,7 +9743,7 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
+ $as_echo "$lt_cv_cc_needs_belf" >&6; }
+   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
+@@ -11272,11 +9753,11 @@
+ sparc*-*solaris*)
+   # Find out which ABI we are using.
+   echo 'int i;' > conftest.$ac_ext
+-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+     case `/usr/bin/file conftest.o` in
+     *64-bit*)
+       case $lt_cv_prog_gnu_ld in
+@@ -11302,9 +9783,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
++if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$DSYMUTIL"; then
+@@ -11315,24 +9796,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ DSYMUTIL=$ac_cv_prog_DSYMUTIL
+ if test -n "$DSYMUTIL"; then
+-  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
+ $as_echo "$DSYMUTIL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11342,9 +9823,9 @@
+   ac_ct_DSYMUTIL=$DSYMUTIL
+   # Extract the first word of "dsymutil", so it can be a program name with args.
+ set dummy dsymutil; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
++if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_DSYMUTIL"; then
+@@ -11355,24 +9836,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
+ if test -n "$ac_ct_DSYMUTIL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
+ $as_echo "$ac_ct_DSYMUTIL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11381,7 +9862,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11394,9 +9875,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_NMEDIT+set}" = set; then
++if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$NMEDIT"; then
+@@ -11407,24 +9888,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ NMEDIT=$ac_cv_prog_NMEDIT
+ if test -n "$NMEDIT"; then
+-  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
+ $as_echo "$NMEDIT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11434,9 +9915,9 @@
+   ac_ct_NMEDIT=$NMEDIT
+   # Extract the first word of "nmedit", so it can be a program name with args.
+ set dummy nmedit; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
++if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_NMEDIT"; then
+@@ -11447,24 +9928,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_NMEDIT="nmedit"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
+ if test -n "$ac_ct_NMEDIT"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
+ $as_echo "$ac_ct_NMEDIT" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11473,7 +9954,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11486,9 +9967,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}lipo; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_LIPO+set}" = set; then
++if test "${ac_cv_prog_LIPO+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$LIPO"; then
+@@ -11499,24 +9980,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ LIPO=$ac_cv_prog_LIPO
+ if test -n "$LIPO"; then
+-  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
+ $as_echo "$LIPO" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11526,9 +10007,9 @@
+   ac_ct_LIPO=$LIPO
+   # Extract the first word of "lipo", so it can be a program name with args.
+ set dummy lipo; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
++if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_LIPO"; then
+@@ -11539,24 +10020,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_LIPO="lipo"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
+ if test -n "$ac_ct_LIPO"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
+ $as_echo "$ac_ct_LIPO" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11565,7 +10046,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11578,9 +10059,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}otool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL+set}" = set; then
++if test "${ac_cv_prog_OTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL"; then
+@@ -11591,24 +10072,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ OTOOL=$ac_cv_prog_OTOOL
+ if test -n "$OTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
+ $as_echo "$OTOOL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11618,9 +10099,9 @@
+   ac_ct_OTOOL=$OTOOL
+   # Extract the first word of "otool", so it can be a program name with args.
+ set dummy otool; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
++if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL"; then
+@@ -11631,24 +10112,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OTOOL="otool"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
+ if test -n "$ac_ct_OTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
+ $as_echo "$ac_ct_OTOOL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11657,7 +10138,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11670,9 +10151,9 @@
+     if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}otool64; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_OTOOL64+set}" = set; then
++if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$OTOOL64"; then
+@@ -11683,24 +10164,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ OTOOL64=$ac_cv_prog_OTOOL64
+ if test -n "$OTOOL64"; then
+-  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
+ $as_echo "$OTOOL64" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11710,9 +10191,9 @@
+   ac_ct_OTOOL64=$OTOOL64
+   # Extract the first word of "otool64", so it can be a program name with args.
+ set dummy otool64; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
++if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_OTOOL64"; then
+@@ -11723,24 +10204,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_OTOOL64="otool64"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
+ if test -n "$ac_ct_OTOOL64"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
+ $as_echo "$ac_ct_OTOOL64" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -11749,7 +10230,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -11785,9 +10266,9 @@
+ 
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
+ $as_echo_n "checking for -single_module linker flag... " >&6; }
+-if test "${lt_cv_apple_cc_single_mod+set}" = set; then
++if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_apple_cc_single_mod=no
+@@ -11812,22 +10293,18 @@
+ 	rm -f conftest.*
+       fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
+ $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+-    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
+ $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
+-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
++if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_ld_exported_symbols_list=no
+       save_LDFLAGS=$LDFLAGS
+       echo "_main" > conftest.sym
+       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -11838,42 +10315,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   lt_cv_ld_exported_symbols_list=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	lt_cv_ld_exported_symbols_list=no
++  lt_cv_ld_exported_symbols_list=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 	LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
+ $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
+     case $host_os in
+     rhapsody* | darwin1.[012])
+@@ -11910,62 +10362,13 @@
+     ;;
+   esac
+ 
+-
+ for ac_header in dlfcn.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
++"
++if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
++#define HAVE_DLFCN_H 1
+ _ACEOF
+ 
+ fi
+@@ -11983,7 +10386,7 @@
+ 
+ 
+             # Check whether --enable-shared was given.
+-if test "${enable_shared+set}" = set; then
++if test "${enable_shared+set}" = set; then :
+   enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+@@ -12016,7 +10419,7 @@
+ 
+ 
+ # Check whether --with-pic was given.
+-if test "${with_pic+set}" = set; then
++if test "${with_pic+set}" = set; then :
+   withval=$with_pic; pic_mode="$withval"
+ else
+   pic_mode=default
+@@ -12032,7 +10435,7 @@
+ 
+ 
+   # Check whether --enable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
++if test "${enable_fast_install+set}" = set; then :
+   enableval=$enable_fast_install; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_fast_install=yes ;;
+@@ -12113,9 +10516,9 @@
+    setopt NO_GLOB_SUBST
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
+ $as_echo_n "checking for objdir... " >&6; }
+-if test "${lt_cv_objdir+set}" = set; then
++if test "${lt_cv_objdir+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f .libs 2>/dev/null
+@@ -12128,7 +10531,7 @@
+ fi
+ rmdir .libs 2>/dev/null
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
+ $as_echo "$lt_cv_objdir" >&6; }
+ objdir=$lt_cv_objdir
+ 
+@@ -12221,9 +10624,9 @@
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
+ $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -12274,10 +10677,10 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12287,9 +10690,9 @@
+ 
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    { $as_echo "$as_me:$LINENO: checking for file" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
+ $as_echo_n "checking for file... " >&6; }
+-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
++if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $MAGIC_CMD in
+@@ -12340,10 +10743,10 @@
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
+ $as_echo "$MAGIC_CMD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -12424,9 +10827,9 @@
+ if test "$GCC" = yes; then
+   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+ 
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+ $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
+-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
++if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_rtti_exceptions=no
+@@ -12442,11 +10845,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:12445: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10848: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12449: \$? = $ac_status" >&5
++   echo "$as_me:10852: \$? = $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.
+@@ -12459,7 +10862,7 @@
+    $RM conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
+ $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
+@@ -12479,7 +10882,7 @@
+ lt_prog_compiler_pic=
+ lt_prog_compiler_static=
+ 
+-{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+ $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+ 
+   if test "$GCC" = yes; then
+@@ -12751,7 +11154,7 @@
+     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
+     ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
+ $as_echo "$lt_prog_compiler_pic" >&6; }
+ 
+ 
+@@ -12763,9 +11166,9 @@
+ # Check to make sure the PIC flag actually works.
+ #
+ if test -n "$lt_prog_compiler_pic"; then
+-  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
+ $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
+-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
++if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_pic_works=no
+@@ -12781,11 +11184,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:12784: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11187: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>conftest.err)
+    ac_status=$?
+    cat conftest.err >&5
+-   echo "$as_me:12788: \$? = $ac_status" >&5
++   echo "$as_me:11191: \$? = $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.
+@@ -12798,7 +11201,7 @@
+    $RM conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
+ $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
+@@ -12822,9 +11225,9 @@
+ # Check to make sure the static flag actually works.
+ #
+ wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
+-{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
+ $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
+-if test "${lt_cv_prog_compiler_static_works+set}" = set; then
++if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_static_works=no
+@@ -12850,7 +11253,7 @@
+    LDFLAGS="$save_LDFLAGS"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
+ $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
+ 
+ if test x"$lt_cv_prog_compiler_static_works" = xyes; then
+@@ -12865,9 +11268,9 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -12886,11 +11289,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:12889: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11292: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12893: \$? = $ac_status" >&5
++   echo "$as_me:11296: \$? = $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
+@@ -12912,7 +11315,7 @@
+    $RM conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+@@ -12920,9 +11323,9 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
+ $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
+-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
++if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   lt_cv_prog_compiler_c_o=no
+@@ -12941,11 +11344,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:12944: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:11347: $lt_compile\"" >&5)
+    (eval "$lt_compile" 2>out/conftest.err)
+    ac_status=$?
+    cat out/conftest.err >&5
+-   echo "$as_me:12948: \$? = $ac_status" >&5
++   echo "$as_me:11351: \$? = $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
+@@ -12967,7 +11370,7 @@
+    $RM conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
+ $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
+ 
+ 
+@@ -12976,7 +11379,7 @@
+ hard_links="nottested"
+ if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+-  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
+ $as_echo_n "checking if we can lock with hard links... " >&6; }
+   hard_links=yes
+   $RM conftest*
+@@ -12984,10 +11387,10 @@
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
+ $as_echo "$hard_links" >&6; }
+   if test "$hard_links" = no; then
+-    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+ $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
+     need_locks=warn
+   fi
+@@ -13000,7 +11403,7 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
+ $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
+ 
+   runpath_var=
+@@ -13442,11 +11845,7 @@
+ 	allow_undefined_flag='-berok'
+         # Determine the default libpath from the value encoded in an
+         # empty executable.
+-        cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -13457,27 +11856,7 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -13491,16 +11870,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -13513,11 +11885,7 @@
+ 	else
+ 	 # Determine the default libpath from the value encoded in an
+ 	 # empty executable.
+-	 cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -13528,27 +11896,7 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+ lt_aix_libpath_sed='
+     /Import File Strings/,/^$/ {
+@@ -13562,16 +11910,9 @@
+ if test -z "$aix_libpath"; then
+   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ fi
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ 
+ 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
+@@ -13783,42 +12124,16 @@
+ 	# implicitly export all symbols.
+         save_LDFLAGS="$LDFLAGS"
+         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+-        cat >conftest.$ac_ext <<_ACEOF
++        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ int foo(void) {}
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ 
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+         LDFLAGS="$save_LDFLAGS"
+       else
+ 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -14074,7 +12389,7 @@
+     fi
+   fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
+ $as_echo "$ld_shlibs" >&6; }
+ test "$ld_shlibs" = no && can_build_shared=no
+ 
+@@ -14111,16 +12426,16 @@
+       # 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.
+-      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
+ $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
+       $RM conftest*
+       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+   (eval $ac_compile) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } 2>conftest.err; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } 2>conftest.err; then
+         soname=conftest
+         lib=conftest
+         libobjs=conftest.$ac_objext
+@@ -14134,11 +12449,11 @@
+         libname=conftest
+         lt_save_allow_undefined_flag=$allow_undefined_flag
+         allow_undefined_flag=
+-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
++        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }
+         then
+ 	  archive_cmds_need_lc=no
+         else
+@@ -14149,7 +12464,7 @@
+         cat conftest.err 1>&5
+       fi
+       $RM conftest*
+-      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
+ $as_echo "$archive_cmds_need_lc" >&6; }
+       ;;
+     esac
+@@ -14313,7 +12628,7 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
+ $as_echo_n "checking dynamic linker characteristics... " >&6; }
+ 
+ if test "$GCC" = yes; then
+@@ -14735,11 +13050,7 @@
+   save_libdir=$libdir
+   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -14750,41 +13061,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
++if ac_fn_c_try_link "$LINENO"; then :
++  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
+   shlibpath_overrides_runpath=yes
+ fi
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+   LDFLAGS=$save_LDFLAGS
+   libdir=$save_libdir
+ 
+@@ -14996,7 +13279,7 @@
+   dynamic_linker=no
+   ;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
+ $as_echo "$dynamic_linker" >&6; }
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+@@ -15098,7 +13381,7 @@
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
+ $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
+ hardcode_action=
+ if test -n "$hardcode_libdir_flag_spec" ||
+@@ -15123,7 +13406,7 @@
+   # directories.
+   hardcode_action=unsupported
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
+ $as_echo "$hardcode_action" >&6; }
+ 
+ if test "$hardcode_action" = relink ||
+@@ -15168,18 +13451,14 @@
+ 
+   darwin*)
+   # if libdl is installed we need to link against it
+-    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15197,43 +13476,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dl_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
++  ac_cv_lib_dl_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+ 
+@@ -15246,33 +13500,19 @@
+     ;;
+ 
+   *)
+-    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
+-$as_echo_n "checking for shl_load... " >&6; }
+-if test "${ac_cv_func_shl_load+set}" = set; then
++    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
++if test "x$ac_cv_func_shl_load" = x""yes; then :
++  lt_cv_dlopen="shl_load"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
++$as_echo_n "checking for shl_load in -ldld... " >&6; }
++if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-ldld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shl_load innocuous_shl_load
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shl_load
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -15281,13 +13521,6 @@
+ extern "C"
+ #endif
+ char shl_load ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shl_load || defined __stub___shl_load
+-choke me
+-#endif
+-
+ int
+ main ()
+ {
+@@ -15296,56 +13529,32 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_shl_load=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dld_shl_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_shl_load=no
++  ac_cv_lib_dld_shl_load=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
+-$as_echo "$ac_cv_func_shl_load" >&6; }
+-if test "x$ac_cv_func_shl_load" = x""yes; then
+-  lt_cv_dlopen="shl_load"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
++$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
++if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
++  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
+-$as_echo_n "checking for shl_load in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
++  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
++if test "x$ac_cv_func_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen"
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
++$as_echo_n "checking for dlopen in -ldl... " >&6; }
++if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++LIBS="-ldl  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15354,222 +13563,37 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shl_load ();
++char dlopen ();
+ int
+ main ()
+ {
+-return shl_load ();
++return dlopen ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_dld_shl_load=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_dl_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_shl_load=no
++  ac_cv_lib_dl_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
+-$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
+-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
+-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
++$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
++if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
++  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
+-$as_echo_n "checking for dlopen... " >&6; }
+-if test "${ac_cv_func_dlopen+set}" = set; then
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
++$as_echo_n "checking for dlopen in -lsvld... " >&6; }
++if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define dlopen innocuous_dlopen
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef dlopen
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_dlopen || defined __stub___dlopen
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_dlopen=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_dlopen=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
+-$as_echo "$ac_cv_func_dlopen" >&6; }
+-if test "x$ac_cv_func_dlopen" = x""yes; then
+-  lt_cv_dlopen="dlopen"
+-else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
+-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-ldl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char dlopen ();
+-int
+-main ()
+-{
+-return dlopen ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_dl_dlopen=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dl_dlopen=no
+-fi
+-
+-rm -rf conftest.dSYM
+-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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
+-$as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
+-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+-else
+-  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
+-$as_echo_n "checking for dlopen in -lsvld... " >&6; }
+-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lsvld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lsvld  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15587,57 +13611,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_svld_dlopen=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_svld_dlopen=no
++  ac_cv_lib_svld_dlopen=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
+ $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
+-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
++if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
+ $as_echo_n "checking for dld_link in -ldld... " >&6; }
+-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
++if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldld  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -15655,43 +13650,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dld_dld_link=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dld_dld_link=no
++  ac_cv_lib_dld_dld_link=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
+ $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
+-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
++if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
+ fi
+ 
+@@ -15730,9 +13700,9 @@
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
+ $as_echo_n "checking whether a program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self+set}" = set; then
++if test "${lt_cv_dlopen_self+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -15741,7 +13711,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 15744 "configure"
++#line 13714 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15800,11 +13770,11 @@
+   return status;
+ }
+ _LT_EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+     (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+@@ -15821,14 +13791,14 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
+ $as_echo "$lt_cv_dlopen_self" >&6; }
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+-      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
+ $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
++if test "${lt_cv_dlopen_self_static+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   	  if test "$cross_compiling" = yes; then :
+@@ -15837,7 +13807,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 15840 "configure"
++#line 13810 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -15896,11 +13866,11 @@
+   return status;
+ }
+ _LT_EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
+   (eval $ac_link) 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
+     (./conftest; exit; ) >&5 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+@@ -15917,7 +13887,7 @@
+ 
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
+ $as_echo "$lt_cv_dlopen_self_static" >&6; }
+     fi
+ 
+@@ -15956,12 +13926,12 @@
+ 
+ striplib=
+ old_striplib=
+-{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
+ $as_echo_n "checking whether stripping libraries is possible... " >&6; }
+ if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ # FIXME - insert some real tests, host_os isn't really good enough
+@@ -15970,15 +13940,15 @@
+     if test -n "$STRIP" ; then
+       striplib="$STRIP -x"
+       old_striplib="$STRIP -S"
+-      { $as_echo "$as_me:$LINENO: result: yes" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+     else
+-      { $as_echo "$as_me:$LINENO: result: no" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+     fi
+     ;;
+   *)
+-    { $as_echo "$as_me:$LINENO: result: no" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+     ;;
+   esac
+@@ -15996,12 +13966,12 @@
+ 
+ 
+   # Report which library types will actually be built
+-  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
+ $as_echo_n "checking if libtool supports shared libraries... " >&6; }
+-  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
+ $as_echo "$can_build_shared" >&6; }
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
+ $as_echo_n "checking whether to build shared libraries... " >&6; }
+   test "$can_build_shared" = "no" && enable_shared=no
+ 
+@@ -16022,14 +13992,14 @@
+     fi
+     ;;
+   esac
+-  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
+ $as_echo "$enable_shared" >&6; }
+ 
+-  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
+ $as_echo_n "checking whether to build static libraries... " >&6; }
+   # Make sure either enable_shared or enable_static is yes.
+   test "$enable_shared" = yes || enable_static=yes
+-  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
+ $as_echo "$enable_static" >&6; }
+ 
+ 
+@@ -16070,9 +14040,9 @@
+ # Josh Triplett <josh@freedesktop.org>
+ # Extract the first word of "bash", so it can be a program name with args.
+ set dummy bash; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_DOLT_BASH+set}" = set; then
++if test "${ac_cv_path_DOLT_BASH+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $DOLT_BASH in
+@@ -16085,14 +14055,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_DOLT_BASH="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -16100,15 +14070,15 @@
+ fi
+ DOLT_BASH=$ac_cv_path_DOLT_BASH
+ if test -n "$DOLT_BASH"; then
+-  { $as_echo "$as_me:$LINENO: result: $DOLT_BASH" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOLT_BASH" >&5
+ $as_echo "$DOLT_BASH" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking if dolt supports this host" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dolt supports this host" >&5
+ $as_echo_n "checking if dolt supports this host... " >&6; }
+ dolt_supported=yes
+ if test x$DOLT_BASH = x; then
+@@ -16130,12 +14100,12 @@
+     ;;
+ esac
+ if test x$dolt_supported = xno ; then
+-    { $as_echo "$as_me:$LINENO: result: no, falling back to libtool" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, falling back to libtool" >&5
+ $as_echo "no, falling back to libtool" >&6; }
+     LTCOMPILE='$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(COMPILE)'
+     LTCXXCOMPILE='$(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXXCOMPILE)'
+ else
+-    { $as_echo "$as_me:$LINENO: result: yes, replacing libtool" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, replacing libtool" >&5
+ $as_echo "yes, replacing libtool" >&6; }
+ 
+     cat <<__DOLTCOMPILE__EOF__ >doltcompile
+@@ -16268,9 +14238,9 @@
+ 	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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -16283,14 +14253,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -16298,10 +14268,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -16311,9 +14281,9 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -16326,14 +14296,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -16341,10 +14311,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -16353,7 +14323,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -16366,20 +14336,20 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ 	_pkg_min_version=0.9.0
+-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for Win32" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Win32" >&5
+ $as_echo_n "checking for Win32... " >&6; }
+ case "$host" in
+ *-mingw*)
+@@ -16403,7 +14373,7 @@
+ 	HAL_REQUIREMENT='hal'
+ 	;;
+ esac
+-{ $as_echo "$as_me:$LINENO: result: $os_win32" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $os_win32" >&5
+ $as_echo "$os_win32" >&6; }
+  if test $os_win32 = yes; then
+   OS_WIN32_TRUE=
+@@ -16420,9 +14390,9 @@
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+ set dummy ${ac_tool_prefix}windres; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_WINDRES+set}" = set; then
++if test "${ac_cv_prog_WINDRES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$WINDRES"; then
+@@ -16433,24 +14403,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ WINDRES=$ac_cv_prog_WINDRES
+ if test -n "$WINDRES"; then
+-  { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
+ $as_echo "$WINDRES" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -16460,9 +14430,9 @@
+   ac_ct_WINDRES=$WINDRES
+   # Extract the first word of "windres", so it can be a program name with args.
+ set dummy windres; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
++if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_WINDRES"; then
+@@ -16473,24 +14443,24 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_WINDRES="windres"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
+ if test -n "$ac_ct_WINDRES"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_WINDRES" >&5
+ $as_echo "$ac_ct_WINDRES" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -16499,7 +14469,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -16526,14 +14496,14 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GNOME_PLATFORM" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_PLATFORM" >&5
+ $as_echo_n "checking for GNOME_PLATFORM... " >&6; }
+ 
+ if test -n "$GNOME_PLATFORM_CFLAGS"; then
+     pkg_cv_GNOME_PLATFORM_CFLAGS="$GNOME_PLATFORM_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.20.0
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+ 	libbonobo-2.0 >= 2.20.3
+@@ -16543,7 +14513,7 @@
+ 	libgnomeui-2.0 >= 2.0.0
+ 	libxml-2.0 >= 2.7.3
+ 	shared-mime-info >= 0.22
+-	gnome-desktop-2.0 >= 2.26.0\"") >&5
++	gnome-desktop-2.0 >= 2.26.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+@@ -16556,8 +14526,8 @@
+ 	shared-mime-info >= 0.22
+ 	gnome-desktop-2.0 >= 2.26.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GNOME_PLATFORM_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+@@ -16579,7 +14549,7 @@
+     pkg_cv_GNOME_PLATFORM_LIBS="$GNOME_PLATFORM_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.20.0
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+ 	libbonobo-2.0 >= 2.20.3
+@@ -16589,7 +14559,7 @@
+ 	libgnomeui-2.0 >= 2.0.0
+ 	libxml-2.0 >= 2.7.3
+ 	shared-mime-info >= 0.22
+-	gnome-desktop-2.0 >= 2.26.0\"") >&5
++	gnome-desktop-2.0 >= 2.26.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+@@ -16602,8 +14572,8 @@
+ 	shared-mime-info >= 0.22
+ 	gnome-desktop-2.0 >= 2.26.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GNOME_PLATFORM_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+@@ -16659,28 +14629,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNOME_PLATFORM_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (glib-2.0 >= 2.20.0
+-	gtk+-2.0 >= 2.16.0
+-	gconf-2.0 >= 2.0.0
+-	libbonobo-2.0 >= 2.20.3
+-	libbonoboui-2.0 >= 2.4.2
+-	libglade-2.0 >= 2.0.0
+-	libgnomecanvas-2.0 >= 2.0.0
+-	libgnomeui-2.0 >= 2.0.0
+-	libxml-2.0 >= 2.7.3
+-	shared-mime-info >= 0.22
+-	gnome-desktop-2.0 >= 2.26.0) were not met:
+-
+-$GNOME_PLATFORM_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GNOME_PLATFORM_CFLAGS
+-and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (glib-2.0 >= 2.20.0
++	as_fn_error "Package requirements (glib-2.0 >= 2.20.0
+ 	gtk+-2.0 >= 2.16.0
+ 	gconf-2.0 >= 2.0.0
+ 	libbonobo-2.0 >= 2.20.3
+@@ -16700,22 +14649,11 @@
+ Alternatively, you may set the environment variables GNOME_PLATFORM_CFLAGS
+ and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GNOME_PLATFORM_CFLAGS
+-and GNOME_PLATFORM_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -16724,12 +14662,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	GNOME_PLATFORM_CFLAGS=$pkg_cv_GNOME_PLATFORM_CFLAGS
+ 	GNOME_PLATFORM_LIBS=$pkg_cv_GNOME_PLATFORM_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -16738,21 +14675,21 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_DATA_SERVER" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_DATA_SERVER" >&5
+ $as_echo_n "checking for EVOLUTION_DATA_SERVER... " >&6; }
+ 
+ if test -n "$EVOLUTION_DATA_SERVER_CFLAGS"; then
+     pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS="$EVOLUTION_DATA_SERVER_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 2.28.3
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 2.28.3
+ 	libecal-\$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-\$EDS_PACKAGE >= 2.28.3
+ 	libedataserverui-\$EDS_PACKAGE >= 2.28.3
+ 	libegroupwise-\$EDS_PACKAGE >= 2.28.3
+ 	libebackend-\$EDS_PACKAGE >= 2.28.3
+ 	libgdata-\$EDS_PACKAGE >= 2.28.3
+-	libgdata-google-\$EDS_PACKAGE >= 2.28.3\"") >&5
++	libgdata-google-\$EDS_PACKAGE >= 2.28.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 2.28.3
+ 	libecal-$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-$EDS_PACKAGE >= 2.28.3
+@@ -16762,8 +14699,8 @@
+ 	libgdata-$EDS_PACKAGE >= 2.28.3
+ 	libgdata-google-$EDS_PACKAGE >= 2.28.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS=`$PKG_CONFIG --cflags "libebook-$EDS_PACKAGE >= 2.28.3
+ 	libecal-$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-$EDS_PACKAGE >= 2.28.3
+@@ -16782,14 +14719,14 @@
+     pkg_cv_EVOLUTION_DATA_SERVER_LIBS="$EVOLUTION_DATA_SERVER_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 2.28.3
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libebook-\$EDS_PACKAGE >= 2.28.3
+ 	libecal-\$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-\$EDS_PACKAGE >= 2.28.3
+ 	libedataserverui-\$EDS_PACKAGE >= 2.28.3
+ 	libegroupwise-\$EDS_PACKAGE >= 2.28.3
+ 	libebackend-\$EDS_PACKAGE >= 2.28.3
+ 	libgdata-\$EDS_PACKAGE >= 2.28.3
+-	libgdata-google-\$EDS_PACKAGE >= 2.28.3\"") >&5
++	libgdata-google-\$EDS_PACKAGE >= 2.28.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libebook-$EDS_PACKAGE >= 2.28.3
+ 	libecal-$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-$EDS_PACKAGE >= 2.28.3
+@@ -16799,8 +14736,8 @@
+ 	libgdata-$EDS_PACKAGE >= 2.28.3
+ 	libgdata-google-$EDS_PACKAGE >= 2.28.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_DATA_SERVER_LIBS=`$PKG_CONFIG --libs "libebook-$EDS_PACKAGE >= 2.28.3
+ 	libecal-$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-$EDS_PACKAGE >= 2.28.3
+@@ -16847,25 +14784,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_DATA_SERVER_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libebook-$EDS_PACKAGE >= 2.28.3
+-	libecal-$EDS_PACKAGE >= 2.28.3
+-	libedataserver-$EDS_PACKAGE >= 2.28.3
+-	libedataserverui-$EDS_PACKAGE >= 2.28.3
+-	libegroupwise-$EDS_PACKAGE >= 2.28.3
+-	libebackend-$EDS_PACKAGE >= 2.28.3
+-	libgdata-$EDS_PACKAGE >= 2.28.3
+-	libgdata-google-$EDS_PACKAGE >= 2.28.3) were not met:
+-
+-$EVOLUTION_DATA_SERVER_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_DATA_SERVER_CFLAGS
+-and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libebook-$EDS_PACKAGE >= 2.28.3
++	as_fn_error "Package requirements (libebook-$EDS_PACKAGE >= 2.28.3
+ 	libecal-$EDS_PACKAGE >= 2.28.3
+ 	libedataserver-$EDS_PACKAGE >= 2.28.3
+ 	libedataserverui-$EDS_PACKAGE >= 2.28.3
+@@ -16882,22 +14801,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_DATA_SERVER_CFLAGS
+ and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_DATA_SERVER_CFLAGS
+-and EVOLUTION_DATA_SERVER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -16906,22 +14814,21 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_DATA_SERVER_CFLAGS=$pkg_cv_EVOLUTION_DATA_SERVER_CFLAGS
+ 	EVOLUTION_DATA_SERVER_LIBS=$pkg_cv_EVOLUTION_DATA_SERVER_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether to build user documentation" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build user documentation" >&5
+ $as_echo_n "checking whether to build user documentation... " >&6; }
+ 
+ # Check whether --with-help was given.
+-if test "${with_help+set}" = set; then
++if test "${with_help+set}" = set; then :
+   withval=$with_help; with_help="$withval"
+ else
+   with_help="yes"
+@@ -16935,22 +14842,18 @@
+   WITH_HELP_FALSE=
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $with_help" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_help" >&5
+ $as_echo "$with_help" >&6; }
+ 
+ have_iconv=no
+ save_LIBS="$LIBS"
+ LIBS="$LIBS -liconv"
+-{ $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
+-if test "${ac_cv_libiconv+set}" = set; then
++if test "${ac_cv_libiconv+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		#include <iconv.h>
+@@ -16967,40 +14870,15 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_libiconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_libiconv=no
++  ac_cv_libiconv=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_libiconv" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libiconv" >&5
+ $as_echo "$ac_cv_libiconv" >&6; }
+ 
+ if test $ac_cv_libiconv = yes; then
+@@ -17011,217 +14889,39 @@
+ 	have_iconv=yes
+ else
+ 	LIBS="$save_LIBS"
+-	{ $as_echo "$as_me:$LINENO: checking for iconv" >&5
+-$as_echo_n "checking for iconv... " >&6; }
+-if test "${ac_cv_func_iconv+set}" = set; then
+-  $as_echo_n "(cached) " >&6
++	ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
++if test "x$ac_cv_func_iconv" = x""yes; then :
++  have_iconv=yes
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define iconv to an innocuous variant, in case <limits.h> declares iconv.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define iconv innocuous_iconv
++  have_iconv=no
++fi
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char iconv (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++fi
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
++if test $have_iconv = yes; then
++	if test $ac_cv_libiconv = no; then
++		for ac_func in gnu_get_libc_version
++do :
++  ac_fn_c_check_func "$LINENO" "gnu_get_libc_version" "ac_cv_func_gnu_get_libc_version"
++if test "x$ac_cv_func_gnu_get_libc_version" = x""yes; then :
++  cat >>confdefs.h <<_ACEOF
++#define HAVE_GNU_GET_LIBC_VERSION 1
++_ACEOF
+ 
+-#undef iconv
++fi
++done
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_iconv || defined __stub___iconv
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return iconv ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_iconv=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_iconv=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_iconv" >&5
+-$as_echo "$ac_cv_func_iconv" >&6; }
+-if test "x$ac_cv_func_iconv" = x""yes; then
+-  have_iconv=yes
+-else
+-  have_iconv=no
+-fi
+-
+-fi
+-
+-if test $have_iconv = yes; then
+-	if test $ac_cv_libiconv = no; then
+-
+-for ac_func in gnu_get_libc_version
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+-_ACEOF
+-
+-fi
+-done
+-
+-	fi
+-{ $as_echo "$as_me:$LINENO: checking if iconv() handles UTF-8" >&5
+-$as_echo_n "checking if iconv() handles UTF-8... " >&6; }
+-if test "${ac_cv_libiconv_utf8+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test "$cross_compiling" = yes; then
+-  ac_cv_libiconv_utf8=hopefully
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
++	fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv() handles UTF-8" >&5
++$as_echo_n "checking if iconv() handles UTF-8... " >&6; }
++if test "${ac_cv_libiconv_utf8+set}" = set; then :
++  $as_echo_n "(cached) " >&6
++else
++  if test "$cross_compiling" = yes; then :
++  ac_cv_libiconv_utf8=hopefully
++else
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+ 		#include <iconv.h>
+ 		#include <stdlib.h>
+@@ -17254,61 +14954,32 @@
+ 
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_libiconv_utf8=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_libiconv_utf8=no; have_iconv=no
++  ac_cv_libiconv_utf8=no; have_iconv=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_libiconv_utf8" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_libiconv_utf8" >&5
+ $as_echo "$ac_cv_libiconv_utf8" >&6; }
+ fi
+ 
+ if test "$have_iconv" = no; then
+-	{ { $as_echo "$as_me:$LINENO: error: You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv" >&5
+-$as_echo "$as_me: error: You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv" "$LINENO" 5
+ fi
+ 
+ 
+ CFLAGS="$CFLAGS -I$srcdir"
+ 
+-{ $as_echo "$as_me:$LINENO: checking preferred charset name formats for system iconv" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking preferred charset name formats for system iconv" >&5
+ $as_echo_n "checking preferred charset name formats for system iconv... " >&6; }
+-if test "$cross_compiling" = yes; then
++if test "$cross_compiling" = yes; then :
+   if test x$os_win32 = xyes; then
+-		{ $as_echo "$as_me:$LINENO: result: using known win32 result" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using known win32 result" >&5
+ $as_echo "using known win32 result" >&6; }
+ 		echo '/* This is an auto-generated header, DO NOT EDIT! */' > iconv-detect.h
+ 		echo  >>iconv-detect.h
+@@ -17316,9 +14987,9 @@
+ 		echo '#define ICONV_ISO_S_FORMAT "iso-%d-%s"' >>iconv-detect.h
+ 		echo '#define ICONV_10646 "UCS-4BE"' >>iconv-detect.h
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: unknown" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown" >&5
+ $as_echo "unknown" >&6; }
+-		{ $as_echo "$as_me:$LINENO: WARNING:
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+ 		*** We can't determine the preferred charset name formats
+ 		*** recognized by your iconv library. You are
+ 		*** cross-compiling and supposed to know what you are doing.
+@@ -17333,50 +15004,20 @@
+ 	fi
+ 
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 	#define CONFIGURE_IN
+ 	#include "iconv-detect.c"
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  { $as_echo "$as_me:$LINENO: result: found" >&5
++if ac_fn_c_try_run "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5
+ $as_echo "found" >&6; }
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ $as_echo "$as_me:$LINENO: result: not found" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
+ $as_echo "not found" >&6; }
+-		{ $as_echo "$as_me:$LINENO: WARNING:
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING:
+ 		*** The iconv-detect program was unable to determine the
+ 		*** preferred charset name formats recognized by your
+ 		*** iconv library. It is suggested that you install a
+@@ -17391,27 +15032,22 @@
+ 		*** ftp://ftp.gnu.org/pub/gnu/libiconv
+ 	" >&2;}
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+ 
+-
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ 
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
+ $as_echo_n "checking for working alloca.h... " >&6; }
+-if test "${ac_cv_working_alloca_h+set}" = set; then
++if test "${ac_cv_working_alloca_h+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <alloca.h>
+ int
+@@ -17423,59 +15059,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_working_alloca_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_working_alloca_h=no
++  ac_cv_working_alloca_h=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
+ $as_echo "$ac_cv_working_alloca_h" >&6; }
+ if test $ac_cv_working_alloca_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA_H 1
+-_ACEOF
++$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
+ $as_echo_n "checking for alloca... " >&6; }
+-if test "${ac_cv_func_alloca_works+set}" = set; then
++if test "${ac_cv_func_alloca_works+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #ifdef __GNUC__
+ # define alloca __builtin_alloca
+@@ -17507,47 +15112,20 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_func_alloca_works=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_alloca_works=no
++  ac_cv_func_alloca_works=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
+ $as_echo "$ac_cv_func_alloca_works" >&6; }
+ 
+ if test $ac_cv_func_alloca_works = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA 1
+-_ACEOF
++$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
+ 
+ else
+   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+@@ -17557,21 +15135,15 @@
+ 
+ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define C_ALLOCA 1
+-_ACEOF
++$as_echo "#define C_ALLOCA 1" >>confdefs.h
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
+ $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+-if test "${ac_cv_os_cray+set}" = set; then
++if test "${ac_cv_os_cray+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #if defined CRAY && ! defined CRAY2
+ webecray
+@@ -17581,7 +15153,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "webecray" >/dev/null 2>&1; then
++  $EGREP "webecray" >/dev/null 2>&1; then :
+   ac_cv_os_cray=yes
+ else
+   ac_cv_os_cray=no
+@@ -17589,101 +15161,14 @@
+ rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
+ $as_echo "$ac_cv_os_cray" >&6; }
+ if test $ac_cv_os_cray = yes; then
+   for ac_func in _getb67 GETB67 getb67; do
+     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CRAY_STACKSEG_END $ac_func
+@@ -17695,19 +15180,15 @@
+   done
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
+ $as_echo_n "checking stack direction for C alloca... " >&6; }
+-if test "${ac_cv_c_stack_direction+set}" = set; then
++if test "${ac_cv_c_stack_direction+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   ac_cv_c_stack_direction=0
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -17730,46 +15211,18 @@
+   return find_stack_direction () < 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_c_stack_direction=1
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_c_stack_direction=-1
++  ac_cv_c_stack_direction=-1
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
+ $as_echo "$ac_cv_c_stack_direction" >&6; }
+-
+ cat >>confdefs.h <<_ACEOF
+ #define STACK_DIRECTION $ac_cv_c_stack_direction
+ _ACEOF
+@@ -17778,16 +15231,12 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
+ $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+-if test "${ac_cv_header_sys_wait_h+set}" = set; then
++if test "${ac_cv_header_sys_wait_h+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -17808,47 +15257,24 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_header_sys_wait_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_sys_wait_h=no
++  ac_cv_header_sys_wait_h=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
+ $as_echo "$ac_cv_header_sys_wait_h" >&6; }
+ if test $ac_cv_header_sys_wait_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_WAIT_H 1
+-_ACEOF
++$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+ # Check whether --enable-purify was given.
+-if test "${enable_purify+set}" = set; then
++if test "${enable_purify+set}" = set; then :
+   enableval=$enable_purify; enable_purify=yes
+ else
+   enable_purify=no
+@@ -17856,9 +15282,9 @@
+ 
+ 	# Extract the first word of "purify", so it can be a program name with args.
+ set dummy purify; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PURIFY+set}" = set; then
++if test "${ac_cv_path_PURIFY+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PURIFY in
+@@ -17871,14 +15297,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PURIFY="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PURIFY" && ac_cv_path_PURIFY="impure"
+@@ -17887,17 +15313,17 @@
+ fi
+ PURIFY=$ac_cv_path_PURIFY
+ if test -n "$PURIFY"; then
+-  { $as_echo "$as_me:$LINENO: result: $PURIFY" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PURIFY" >&5
+ $as_echo "$PURIFY" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ 
+ # Check whether --with-purify-options was given.
+-if test "${with_purify_options+set}" = set; then
++if test "${with_purify_options+set}" = set; then :
+   withval=$with_purify_options;
+ fi
+ 
+@@ -17920,7 +15346,7 @@
+ 
+ 
+ # Check whether --enable-test-component was given.
+-if test "${enable_test_component+set}" = set; then
++if test "${enable_test_component+set}" = set; then :
+   enableval=$enable_test_component; enable_test_comp=$enableval
+ else
+   enable_test_comp=no
+@@ -17936,16 +15362,12 @@
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for tm_gmtoff in struct tm" >&5
+ $as_echo_n "checking for tm_gmtoff in struct tm... " >&6; }
+-if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
++if test "${ac_cv_struct_tm_gmtoff+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include <time.h>
+ int
+@@ -17960,53 +15382,26 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_struct_tm_gmtoff=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_struct_tm_gmtoff=no
++  ac_cv_struct_tm_gmtoff=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm_gmtoff" >&5
+ $as_echo "$ac_cv_struct_tm_gmtoff" >&6; }
+ if test $ac_cv_struct_tm_gmtoff = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TM_GMTOFF 1
+-_ACEOF
++$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
+ 
+ else
+-	{ $as_echo "$as_me:$LINENO: checking for timezone variable" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for timezone variable" >&5
+ $as_echo_n "checking for timezone variable... " >&6; }
+-if test "${ac_cv_var_timezone+set}" = set; then
++if test "${ac_cv_var_timezone+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include <time.h>
+ int
+@@ -18018,52 +15413,25 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_var_timezone=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_var_timezone=no
++  ac_cv_var_timezone=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_timezone" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_timezone" >&5
+ $as_echo "$ac_cv_var_timezone" >&6; }
+ 	if test $ac_cv_var_timezone = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TIMEZONE 1
+-_ACEOF
++$as_echo "#define HAVE_TIMEZONE 1" >>confdefs.h
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for altzone variable" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for altzone variable" >&5
+ $as_echo_n "checking for altzone variable... " >&6; }
+-if test "${ac_cv_var_altzone+set}" = set; then
++if test "${ac_cv_var_altzone+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include <time.h>
+ int
+@@ -18075,147 +15443,32 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_var_altzone=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_var_altzone=no
++  ac_cv_var_altzone=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_var_altzone" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_var_altzone" >&5
+ $as_echo "$ac_cv_var_altzone" >&6; }
+ 		if test $ac_cv_var_altzone = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALTZONE 1
+-_ACEOF
++$as_echo "#define HAVE_ALTZONE 1" >>confdefs.h
+ 
+ 		fi
+ 	else
+-		{ { $as_echo "$as_me:$LINENO: error: unable to find a way to determine timezone" >&5
+-$as_echo "$as_me: error: unable to find a way to determine timezone" >&2;}
+-   { (exit 1); exit 1; }; }
++		as_fn_error "unable to find a way to determine timezone" "$LINENO" 5
+ 	fi
+ fi
+ 
+ 
+-
+-
+-
+ for ac_func in mkstemp mkdtemp isblank
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
++ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
++eval as_val=\$$as_ac_var
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -18225,17 +15478,13 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking if ctime_r wants three arguments" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if ctime_r wants three arguments" >&5
+ $as_echo_n "checking if ctime_r wants three arguments... " >&6; }
+-if test "${ac_cv_ctime_r_three_args+set}" = set; then
++if test "${ac_cv_ctime_r_three_args+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include <time.h>
+ int
+@@ -18249,156 +15498,39 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_ctime_r_three_args=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_ctime_r_three_args=no
++  ac_cv_ctime_r_three_args=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_ctime_r_three_args" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_ctime_r_three_args" >&5
+ $as_echo "$ac_cv_ctime_r_three_args" >&6; }
+ 
+ if test x"$ac_cv_ctime_r_three_args" = xyes ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define CTIME_R_THREE_ARGS 1
+-_ACEOF
++$as_echo "#define CTIME_R_THREE_ARGS 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-
+ for ac_func in gethostbyname_r
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
++if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETHOSTBYNAME_R 1
+ _ACEOF
+ 
+-{ $as_echo "$as_me:$LINENO: checking if gethostbyname_r wants five arguments" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gethostbyname_r wants five arguments" >&5
+ $as_echo_n "checking if gethostbyname_r wants five arguments... " >&6; }
+-if test "${ac_cv_gethostbyname_r_five_args+set}" = set; then
++if test "${ac_cv_gethostbyname_r_five_args+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		#include "confdefs.h"
+@@ -18424,36 +15556,15 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_gethostbyname_r_five_args=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_gethostbyname_r_five_args=no
++  ac_cv_gethostbyname_r_five_args=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyname_r_five_args" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyname_r_five_args" >&5
+ $as_echo "$ac_cv_gethostbyname_r_five_args" >&6; }
+ fi
+ done
+@@ -18461,122 +15572,26 @@
+ 
+ if test "x$ac_cv_gethostbyname_r_five_args" = "xyes" ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define GETHOSTBYNAME_R_FIVE_ARGS 1
+-_ACEOF
++$as_echo "#define GETHOSTBYNAME_R_FIVE_ARGS 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-
+ for ac_func in gethostbyaddr_r
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "gethostbyaddr_r" "ac_cv_func_gethostbyaddr_r"
++if test "x$ac_cv_func_gethostbyaddr_r" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_GETHOSTBYADDR_R 1
+ _ACEOF
+ 
+-{ $as_echo "$as_me:$LINENO: checking if gethostbyaddr_r wants seven arguments" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if gethostbyaddr_r wants seven arguments" >&5
+ $as_echo_n "checking if gethostbyaddr_r wants seven arguments... " >&6; }
+-if test "${ac_cv_gethostbyaddr_r_seven_args+set}" = set; then
++if test "${ac_cv_gethostbyaddr_r_seven_args+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		#include "confdefs.h"
+@@ -18600,36 +15615,15 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   ac_cv_gethostbyaddr_r_seven_args=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_gethostbyaddr_r_seven_args=no
++  ac_cv_gethostbyaddr_r_seven_args=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_gethostbyaddr_r_seven_args" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_gethostbyaddr_r_seven_args" >&5
+ $as_echo "$ac_cv_gethostbyaddr_r_seven_args" >&6; }
+ fi
+ done
+@@ -18637,382 +15631,65 @@
+ 
+ if test "x$ac_cv_gethostbyaddr_r_seven_args" = "xyes" ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define GETHOSTBYADDR_R_SEVEN_ARGS 1
+-_ACEOF
++$as_echo "#define GETHOSTBYADDR_R_SEVEN_ARGS 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sys/statvfs.h" >&5
+-$as_echo_n "checking for sys/statvfs.h... " >&6; }
+-if test "${ac_cv_header_sys_statvfs_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-	#if HAVE_SYS_STATVFS_H
++ac_fn_c_check_header_compile "$LINENO" "sys/statvfs.h" "ac_cv_header_sys_statvfs_h" "	#if HAVE_SYS_STATVFS_H
+ 		#include <sys/statvfs.h>
+ 		#endif
+ 
++"
++if test "x$ac_cv_header_sys_statvfs_h" = x""yes; then :
+ 
+-#include <sys/statvfs.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_sys_statvfs_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_sys_statvfs_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_statvfs_h" >&5
+-$as_echo "$ac_cv_header_sys_statvfs_h" >&6; }
+-if test "x$ac_cv_header_sys_statvfs_h" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_STATVFS_H 1
+-_ACEOF
++$as_echo "#define HAVE_SYS_STATVFS_H 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-
+ for ac_func in statvfs
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "statvfs" "ac_cv_func_statvfs"
++if test "x$ac_cv_func_statvfs" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_STATVFS 1
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sys/param.h" >&5
+-$as_echo_n "checking for sys/param.h... " >&6; }
+-if test "${ac_cv_header_sys_param_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-	#if HAVE_SYS_PARAM_H
++ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" "	#if HAVE_SYS_PARAM_H
+ 		#include <sys/param.h>
+ 		#endif
+ 
++"
++if test "x$ac_cv_header_sys_param_h" = x""yes; then :
+ 
+-#include <sys/param.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_sys_param_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_sys_param_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_param_h" >&5
+-$as_echo "$ac_cv_header_sys_param_h" >&6; }
+-if test "x$ac_cv_header_sys_param_h" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_PARAM_H 1
+-_ACEOF
++$as_echo "#define HAVE_SYS_PARAM_H 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sys/mount.h" >&5
+-$as_echo_n "checking for sys/mount.h... " >&6; }
+-if test "${ac_cv_header_sys_mount_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-	#if HAVE_SYS_MOUNT_H
++ac_fn_c_check_header_compile "$LINENO" "sys/mount.h" "ac_cv_header_sys_mount_h" "	#if HAVE_SYS_MOUNT_H
+ 		#include <sys/mount.h>
+ 		#endif
+ 
++"
++if test "x$ac_cv_header_sys_mount_h" = x""yes; then :
+ 
+-#include <sys/mount.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_sys_mount_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_sys_mount_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_mount_h" >&5
+-$as_echo "$ac_cv_header_sys_mount_h" >&6; }
+-if test "x$ac_cv_header_sys_mount_h" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_MOUNT_H 1
+-_ACEOF
++$as_echo "#define HAVE_SYS_MOUNT_H 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-
+ for ac_func in statfs
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "statfs" "ac_cv_func_statfs"
++if test "x$ac_cv_func_statfs" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_STATFS 1
+ _ACEOF
+ 
+ fi
+@@ -19021,18 +15698,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GIT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIT" >&5
+ $as_echo_n "checking for GIT... " >&6; }
+ 
+ if test -n "$GIT_CFLAGS"; then
+     pkg_cv_GIT_CFLAGS="$GIT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= 2.19.91\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= 2.19.91\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= 2.19.91") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-icon-theme >= 2.19.91" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -19044,11 +15721,11 @@
+     pkg_cv_GIT_LIBS="$GIT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= 2.19.91\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-icon-theme >= 2.19.91\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-icon-theme >= 2.19.91") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GIT_LIBS=`$PKG_CONFIG --libs "gnome-icon-theme >= 2.19.91" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -19074,18 +15751,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GIT_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-icon-theme >= 2.19.91) were not met:
+-
+-$GIT_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GIT_CFLAGS
+-and GIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gnome-icon-theme >= 2.19.91) were not met:
++	as_fn_error "Package requirements (gnome-icon-theme >= 2.19.91) were not met:
+ 
+ $GIT_PKG_ERRORS
+ 
+@@ -19095,22 +15761,11 @@
+ Alternatively, you may set the environment variables GIT_CFLAGS
+ and GIT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GIT_CFLAGS
+-and GIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -19119,30 +15774,29 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	GIT_CFLAGS=$pkg_cv_GIT_CFLAGS
+ 	GIT_LIBS=$pkg_cv_GIT_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for A11Y" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for A11Y" >&5
+ $as_echo_n "checking for A11Y... " >&6; }
+ 
+ if test -n "$A11Y_CFLAGS"; then
+     pkg_cv_A11Y_CFLAGS="$A11Y_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atk\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "atk") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_A11Y_CFLAGS=`$PKG_CONFIG --cflags "atk" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -19154,11 +15808,11 @@
+     pkg_cv_A11Y_LIBS="$A11Y_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"atk\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"atk\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "atk") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_A11Y_LIBS=`$PKG_CONFIG --libs "atk" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -19184,7 +15838,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$A11Y_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (atk) were not met:
++	as_fn_error "Package requirements (atk) were not met:
+ 
+ $A11Y_PKG_ERRORS
+ 
+@@ -19194,33 +15848,11 @@
+ Alternatively, you may set the environment variables A11Y_CFLAGS
+ and A11Y_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (atk) were not met:
+-
+-$A11Y_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables A11Y_CFLAGS
+-and A11Y_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables A11Y_CFLAGS
+-and A11Y_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -19229,12 +15861,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	A11Y_CFLAGS=$pkg_cv_A11Y_CFLAGS
+ 	A11Y_LIBS=$pkg_cv_A11Y_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -19242,11 +15873,7 @@
+ 
+ 
+ have_xfree=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+  #include <X11/XF86keysym.h>
+ int
+@@ -19257,43 +15884,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   have_xfree=yes
+ 
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: checking for X11 XFree86 headers" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 XFree86 headers" >&5
+ $as_echo_n "checking for X11 XFree86 headers... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $have_xfree" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xfree" >&5
+ $as_echo "$have_xfree" >&6; }
+ if test x"$have_xfree" = "xyes" ; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_XFREE 1
+-_ACEOF
++$as_echo "#define HAVE_XFREE 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -19302,24 +15904,24 @@
+ 	default="no"
+ 
+ # Check whether --with-openldap was given.
+-if test "${with_openldap+set}" = set; then
++if test "${with_openldap+set}" = set; then :
+   withval=$with_openldap;
+ fi
+ 
+ 
+ # Check whether --with-static-ldap was given.
+-if test "${with_static_ldap+set}" = set; then
++if test "${with_static_ldap+set}" = set; then :
+   withval=$with_static_ldap;
+ fi
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for OpenLDAP" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenLDAP" >&5
+ $as_echo_n "checking for OpenLDAP... " >&6; }
+-if test "${ac_cv_with_openldap+set}" = set; then
++if test "${ac_cv_with_openldap+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_with_openldap="${with_openldap:=$default}"
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_with_openldap" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_with_openldap" >&5
+ $as_echo "$ac_cv_with_openldap" >&6; }
+ 	case $ac_cv_with_openldap in
+ 	no|"")
+@@ -19337,9 +15939,7 @@
+ 
+ 	if test "$with_openldap" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LDAP 1
+-_ACEOF
++$as_echo "#define HAVE_LDAP 1" >>confdefs.h
+ 
+ 
+ 		case $with_static_ldap in
+@@ -19351,19 +15951,15 @@
+ 			;;
+ 		esac
+ 
+-		{ $as_echo "$as_me:$LINENO: checking if OpenLDAP is version 2.x" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if OpenLDAP is version 2.x" >&5
+ $as_echo_n "checking if OpenLDAP is version 2.x... " >&6; }
+-if test "${ac_cv_openldap_version2+set}" = set; then
++if test "${ac_cv_openldap_version2+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ 			CPPFLAGS_save="$CPPFLAGS"
+ 			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 				#include "ldap.h"
+@@ -19373,7 +15969,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then
++  $EGREP "yes" >/dev/null 2>&1; then :
+   ac_cv_openldap_version2=yes
+ else
+   ac_cv_openldap_version2=no
+@@ -19383,26 +15979,20 @@
+ 			CPPFLAGS="$CPPFLAGS_save"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_openldap_version2" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_openldap_version2" >&5
+ $as_echo "$ac_cv_openldap_version2" >&6; }
+ 		if test "$ac_cv_openldap_version2" = no; then
+-			{ { $as_echo "$as_me:$LINENO: error: evolution requires OpenLDAP version >= 2" >&5
+-$as_echo "$as_me: error: evolution requires OpenLDAP version >= 2" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "evolution requires OpenLDAP version >= 2" "$LINENO" 5
+ 		fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
+ $as_echo_n "checking for res_query in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_res_query+set}" = set; then
++if test "${ac_cv_lib_resolv_res_query+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19420,58 +16010,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_resolv_res_query=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_resolv_res_query=no
++  ac_cv_lib_resolv_res_query=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
+ $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
+-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then
++if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
+   LDAP_LIBS="-lresolv"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
+ $as_echo_n "checking for bind in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_bind+set}" = set; then
++if test "${ac_cv_lib_socket_bind+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19489,58 +16050,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_socket_bind=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_socket_bind=no
++  ac_cv_lib_socket_bind=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
+ $as_echo "$ac_cv_lib_socket_bind" >&6; }
+-if test "x$ac_cv_lib_socket_bind" = x""yes; then
++if test "x$ac_cv_lib_socket_bind" = x""yes; then :
+   LDAP_LIBS="$LDAP_LIBS -lsocket"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+ $as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19558,58 +16090,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_nsl_gethostbyaddr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_gethostbyaddr=no
++  ac_cv_lib_nsl_gethostbyaddr=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then :
+   LDAP_LIBS="$LDAP_LIBS -lnsl"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for ber_get_tag in -llber" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_get_tag in -llber" >&5
+ $as_echo_n "checking for ber_get_tag in -llber... " >&6; }
+-if test "${ac_cv_lib_lber_ber_get_tag+set}" = set; then
++if test "${ac_cv_lib_lber_ber_get_tag+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llber $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19627,43 +16130,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_lber_ber_get_tag=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lber_ber_get_tag=no
++  ac_cv_lib_lber_ber_get_tag=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_get_tag" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_get_tag" >&5
+ $as_echo "$ac_cv_lib_lber_ber_get_tag" >&6; }
+-if test "x$ac_cv_lib_lber_ber_get_tag" = x""yes; then
++if test "x$ac_cv_lib_lber_ber_get_tag" = x""yes; then :
+ 
+ 			if test "$with_static_ldap" = "yes"; then
+ 				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
+@@ -19677,18 +16155,14 @@
+ 			else
+ 				LDAP_LIBS="-llber $LDAP_LIBS"
+ 			fi
+-			{ $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+ $as_echo_n "checking for ldap_open in -lldap... " >&6; }
+-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
++if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19706,43 +16180,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ldap_ldap_open=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ldap_ldap_open=no
++  ac_cv_lib_ldap_ldap_open=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+ $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then
++if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+ 
+ 					if test $with_static_ldap = "yes"; then
+ 						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+@@ -19761,9 +16210,7 @@
+ 
+ 
+ 		if test -z "$LDAP_LIBS"; then
+-			{ { $as_echo "$as_me:$LINENO: error: could not find OpenLDAP libraries" >&5
+-$as_echo "$as_me: error: could not find OpenLDAP libraries" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "could not find OpenLDAP libraries" "$LINENO" 5
+ 		fi
+ 
+ 
+@@ -19798,102 +16245,12 @@
+ LDAP_CFLAGS="$LDAP_CFLAGS -DLDAP_DEPRECATED"
+ CFLAGS="$CFLAGS $LDAP_CFLAGS"
+ LIBS="$LIBS $LDAP_LIBS"
+-
+ for ac_func in ldap_ntlm_bind
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "ldap_ntlm_bind" "ac_cv_func_ldap_ntlm_bind"
++if test "x$ac_cv_func_ldap_ntlm_bind" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_LDAP_NTLM_BIND 1
+ _ACEOF
+ 
+ fi
+@@ -19907,9 +16264,7 @@
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LDAP 1
+-_ACEOF
++$as_echo "#define HAVE_LDAP 1" >>confdefs.h
+ 
+  if true; then
+   ENABLE_LDAP_TRUE=
+@@ -19927,24 +16282,24 @@
+ 
+ 
+ # Check whether --with-sunldap was given.
+-if test "${with_sunldap+set}" = set; then
++if test "${with_sunldap+set}" = set; then :
+   withval=$with_sunldap;
+ fi
+ 
+ 
+ # Check whether --with-static-sunldap was given.
+-if test "${with_static_sunldap+set}" = set; then
++if test "${with_static_sunldap+set}" = set; then :
+   withval=$with_static_sunldap;
+ fi
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for SunLDAP" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SunLDAP" >&5
+ $as_echo_n "checking for SunLDAP... " >&6; }
+-if test "${ac_cv_with_sunldap+set}" = set; then
++if test "${ac_cv_with_sunldap+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_with_sunldap="${with_sunldap:=$default}"
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_with_sunldap" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_with_sunldap" >&5
+ $as_echo "$ac_cv_with_sunldap" >&6; }
+ 	case $ac_cv_with_sunldap in
+ 	no|"")
+@@ -19962,14 +16317,10 @@
+ 
+ 	if test "$with_sunldap" != no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LDAP 1
+-_ACEOF
++$as_echo "#define HAVE_LDAP 1" >>confdefs.h
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SUNLDAP 1
+-_ACEOF
++$as_echo "#define SUNLDAP 1" >>confdefs.h
+ 
+ 
+ 		case $with_static_sunldap in
+@@ -19981,19 +16332,15 @@
+ 			;;
+ 		esac
+ 
+-		{ $as_echo "$as_me:$LINENO: checking if SunLDAP is version 2.x" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if SunLDAP is version 2.x" >&5
+ $as_echo_n "checking if SunLDAP is version 2.x... " >&6; }
+-if test "${ac_cv_sunldap_version2+set}" = set; then
++if test "${ac_cv_sunldap_version2+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ 			CPPFLAGS_save="$CPPFLAGS"
+ 			CPPFLAGS="$CPPFLAGS $LDAP_CFLAGS"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 				#include "ldap.h"
+@@ -20003,7 +16350,7 @@
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "yes" >/dev/null 2>&1; then
++  $EGREP "yes" >/dev/null 2>&1; then :
+   ac_cv_sunldap_version2=yes
+ else
+   ac_cv_sunldap_version2=no
+@@ -20013,26 +16360,20 @@
+ 			CPPFLAGS="$CPPFLAGS_save"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sunldap_version2" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sunldap_version2" >&5
+ $as_echo "$ac_cv_sunldap_version2" >&6; }
+ 		if test "$ac_cv_sunldap_version2" = no; then
+-		       { { $as_echo "$as_me:$LINENO: error: evolution requires SunLDAP version >= 2" >&5
+-$as_echo "$as_me: error: evolution requires SunLDAP version >= 2" >&2;}
+-   { (exit 1); exit 1; }; }
++		       as_fn_error "evolution requires SunLDAP version >= 2" "$LINENO" 5
+ 		fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for res_query in -lresolv" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_query in -lresolv" >&5
+ $as_echo_n "checking for res_query in -lresolv... " >&6; }
+-if test "${ac_cv_lib_resolv_res_query+set}" = set; then
++if test "${ac_cv_lib_resolv_res_query+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lresolv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20050,58 +16391,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_resolv_res_query=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_resolv_res_query=no
++  ac_cv_lib_resolv_res_query=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_query" >&5
+ $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
+-if test "x$ac_cv_lib_resolv_res_query" = x""yes; then
++if test "x$ac_cv_lib_resolv_res_query" = x""yes; then :
+   LDAP_LIBS="-lresolv"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5
+ $as_echo_n "checking for bind in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_bind+set}" = set; then
++if test "${ac_cv_lib_socket_bind+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20119,58 +16431,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_socket_bind=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_socket_bind=no
++  ac_cv_lib_socket_bind=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5
+ $as_echo "$ac_cv_lib_socket_bind" >&6; }
+-if test "x$ac_cv_lib_socket_bind" = x""yes; then
++if test "x$ac_cv_lib_socket_bind" = x""yes; then :
+   LDAP_LIBS="$LDAP_LIBS -lsocket"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for gethostbyaddr in -lnsl" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyaddr in -lnsl" >&5
+ $as_echo_n "checking for gethostbyaddr in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyaddr+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20188,58 +16471,29 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_nsl_gethostbyaddr=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_gethostbyaddr=no
++  ac_cv_lib_nsl_gethostbyaddr=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyaddr" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyaddr" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyaddr" = x""yes; then :
+   LDAP_LIBS="$LDAP_LIBS -lnsl"
+ fi
+ 
+-		{ $as_echo "$as_me:$LINENO: checking for ldap_open in -lldap" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_open in -lldap" >&5
+ $as_echo_n "checking for ldap_open in -lldap... " >&6; }
+-if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then
++if test "${ac_cv_lib_ldap_ldap_open+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20257,43 +16511,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ldap_ldap_open=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ldap_ldap_open=no
++  ac_cv_lib_ldap_ldap_open=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_open" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_open" >&5
+ $as_echo "$ac_cv_lib_ldap_ldap_open" >&6; }
+-if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then
++if test "x$ac_cv_lib_ldap_ldap_open" = x""yes; then :
+ 
+ 			if test $with_static_sunldap = "yes"; then
+ 				LDAP_LIBS="$with_sunldap/lib/libldap.a $LDAP_LIBS"
+@@ -20301,18 +16530,14 @@
+ 				LDAP_LIBS="-lldap $LDAP_LIBS"
+ 			fi
+ 			if test `uname -s` != "SunOS" ; then
+-				{ $as_echo "$as_me:$LINENO: checking for ber_get_tag in -llber" >&5
++				{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ber_get_tag in -llber" >&5
+ $as_echo_n "checking for ber_get_tag in -llber... " >&6; }
+-if test "${ac_cv_lib_lber_ber_get_tag+set}" = set; then
++if test "${ac_cv_lib_lber_ber_get_tag+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llber $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20330,43 +16555,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_lber_ber_get_tag=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lber_ber_get_tag=no
++  ac_cv_lib_lber_ber_get_tag=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lber_ber_get_tag" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lber_ber_get_tag" >&5
+ $as_echo "$ac_cv_lib_lber_ber_get_tag" >&6; }
+-if test "x$ac_cv_lib_lber_ber_get_tag" = x""yes; then
++if test "x$ac_cv_lib_lber_ber_get_tag" = x""yes; then :
+ 
+ 					if test "$with_static_sunldap" = "yes"; then
+ 						LDAP_LIBS="$with_sunldap/lib/liblber.a $LDAP_LIBS"
+@@ -20392,9 +16592,7 @@
+ 
+ 
+ 		if test -z "$LDAP_LIBS"; then
+-			{ { $as_echo "$as_me:$LINENO: error: could not find SunLDAP libraries" >&5
+-$as_echo "$as_me: error: could not find SunLDAP libraries" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "could not find SunLDAP libraries" "$LINENO" 5
+ 		fi
+ 
+ 
+@@ -20436,7 +16634,7 @@
+ 
+ 
+ # Check whether --enable-nntp was given.
+-if test "${enable_nntp+set}" = set; then
++if test "${enable_nntp+set}" = set; then :
+   enableval=$enable_nntp; enable_nntp=$enableval
+ else
+   enable_nntp=yes
+@@ -20444,9 +16642,7 @@
+ 
+ if test "x$enable_nntp" = "xyes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_NNTP 1
+-_ACEOF
++$as_echo "#define ENABLE_NNTP 1" >>confdefs.h
+ 
+ 	msg_nntp=yes
+ else
+@@ -20462,9 +16658,7 @@
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HANDLE_LIBICAL_MEMORY 1
+-_ACEOF
++$as_echo "#define HANDLE_LIBICAL_MEMORY 1" >>confdefs.h
+ 
+ 
+ 
+@@ -20473,18 +16667,14 @@
+ 
+ 
+ 	PTHREAD_LIB=""
+-	{ $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
++if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20502,57 +16692,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_create=no
++  ac_cv_lib_pthread_pthread_create=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
++if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+   PTHREAD_LIB="-lpthread"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthreads" >&5
+ $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
+-if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then
++if test "${ac_cv_lib_pthreads_pthread_create+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthreads  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20570,57 +16731,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthreads_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthreads_pthread_create=no
++  ac_cv_lib_pthreads_pthread_create=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthreads_pthread_create" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_pthread_create" >&5
+ $as_echo "$ac_cv_lib_pthreads_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then
++if test "x$ac_cv_lib_pthreads_pthread_create" = x""yes; then :
+   PTHREAD_LIB="-lpthreads"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5
+ $as_echo_n "checking for pthread_create in -lc_r... " >&6; }
+-if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then
++if test "${ac_cv_lib_c_r_pthread_create+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lc_r  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20638,57 +16770,28 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_c_r_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_c_r_pthread_create=no
++  ac_cv_lib_c_r_pthread_create=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_c_r_pthread_create" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_r_pthread_create" >&5
+ $as_echo "$ac_cv_lib_c_r_pthread_create" >&6; }
+-if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then
++if test "x$ac_cv_lib_c_r_pthread_create" = x""yes; then :
+   PTHREAD_LIB="-lc_r"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for __pthread_attr_init_system in -lpthread" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __pthread_attr_init_system in -lpthread" >&5
+ $as_echo_n "checking for __pthread_attr_init_system in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread___pthread_attr_init_system+set}" = set; then
++if test "${ac_cv_lib_pthread___pthread_attr_init_system+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20706,130 +16809,24 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pthread___pthread_attr_init_system=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread___pthread_attr_init_system=no
++  ac_cv_lib_pthread___pthread_attr_init_system=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_attr_init_system" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread___pthread_attr_init_system" >&5
+ $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
+-if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then
++if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then :
+   PTHREAD_LIB="-lpthread"
+ else
+-  { $as_echo "$as_me:$LINENO: checking for pthread_create" >&5
+-$as_echo_n "checking for pthread_create... " >&6; }
+-if test "${ac_cv_func_pthread_create+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define pthread_create to an innocuous variant, in case <limits.h> declares pthread_create.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define pthread_create innocuous_pthread_create
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pthread_create (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef pthread_create
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char pthread_create ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_pthread_create || defined __stub___pthread_create
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return pthread_create ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_pthread_create=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_pthread_create=no
+-fi
++  ac_fn_c_check_func "$LINENO" "pthread_create" "ac_cv_func_pthread_create"
++if test "x$ac_cv_func_pthread_create" = x""yes; then :
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_pthread_create" >&5
+-$as_echo "$ac_cv_func_pthread_create" >&6; }
+ 
+ 
+ fi
+@@ -20853,124 +16850,28 @@
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_THREADS 1
+-_ACEOF
+-
++$as_echo "#define ENABLE_THREADS 1" >>confdefs.h
+ 
+ 
+ 
+ 
+ for ac_func in regexec
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char $ac_func ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=no"
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++do :
++  ac_fn_c_check_func "$LINENO" "regexec" "ac_cv_func_regexec"
++if test "x$ac_cv_func_regexec" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
++#define HAVE_REGEXEC 1
+ _ACEOF
+ 
+ else
+-  { $as_echo "$as_me:$LINENO: checking for regexec in -lregex" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for regexec in -lregex" >&5
+ $as_echo_n "checking for regexec in -lregex... " >&6; }
+-if test "${ac_cv_lib_regex_regexec+set}" = set; then
++if test "${ac_cv_lib_regex_regexec+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lregex  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20988,53 +16889,24 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_regex_regexec=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_regex_regexec=no
++  ac_cv_lib_regex_regexec=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_regex_regexec" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_regex_regexec" >&5
+ $as_echo "$ac_cv_lib_regex_regexec" >&6; }
+-if test "x$ac_cv_lib_regex_regexec" = x""yes; then
++if test "x$ac_cv_lib_regex_regexec" = x""yes; then :
+   REGEX_LIBS=-lregex
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_REGEXEC 1
+-_ACEOF
++$as_echo "#define HAVE_REGEXEC 1" >>confdefs.h
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: No regex library found" >&5
+-$as_echo "$as_me: error: No regex library found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "No regex library found" "$LINENO" 5
+ fi
+ 
+ fi
+@@ -21044,18 +16916,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GTKHTML" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKHTML" >&5
+ $as_echo_n "checking for GTKHTML... " >&6; }
+ 
+ if test -n "$GTKHTML_CFLAGS"; then
+     pkg_cv_GTKHTML_CFLAGS="$GTKHTML_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.27.90\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.27.90\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.27.90") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GTKHTML_CFLAGS=`$PKG_CONFIG --cflags "libgtkhtml-3.14 >= 3.27.90" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -21067,11 +16939,11 @@
+     pkg_cv_GTKHTML_LIBS="$GTKHTML_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.27.90\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgtkhtml-3.14 >= 3.27.90\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgtkhtml-3.14 >= 3.27.90") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GTKHTML_LIBS=`$PKG_CONFIG --libs "libgtkhtml-3.14 >= 3.27.90" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -21097,18 +16969,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GTKHTML_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgtkhtml-3.14 >= 3.27.90) were not met:
+-
+-$GTKHTML_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GTKHTML_CFLAGS
+-and GTKHTML_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgtkhtml-3.14 >= 3.27.90) were not met:
++	as_fn_error "Package requirements (libgtkhtml-3.14 >= 3.27.90) were not met:
+ 
+ $GTKHTML_PKG_ERRORS
+ 
+@@ -21118,12 +16979,11 @@
+ Alternatively, you may set the environment variables GTKHTML_CFLAGS
+ and GTKHTML_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -21132,22 +16992,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GTKHTML_CFLAGS
+-and GTKHTML_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	GTKHTML_CFLAGS=$pkg_cv_GTKHTML_CFLAGS
+ 	GTKHTML_LIBS=$pkg_cv_GTKHTML_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -21163,7 +17012,7 @@
+ 
+ 
+ # Check whether --enable-pilot-conduits was given.
+-if test "${enable_pilot_conduits+set}" = set; then
++if test "${enable_pilot_conduits+set}" = set; then :
+   enableval=$enable_pilot_conduits;
+ else
+   enable_pilot_conduits=no
+@@ -21172,18 +17021,18 @@
+ if test "x$enable_pilot_conduits" = "xyes"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GNOME_PILOT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNOME_PILOT" >&5
+ $as_echo_n "checking for GNOME_PILOT... " >&6; }
+ 
+ if test -n "$GNOME_PILOT_CFLAGS"; then
+     pkg_cv_GNOME_PILOT_CFLAGS="$GNOME_PILOT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.15") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GNOME_PILOT_CFLAGS=`$PKG_CONFIG --cflags "gnome-pilot-2.0 >= 2.0.15" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -21195,11 +17044,11 @@
+     pkg_cv_GNOME_PILOT_LIBS="$GNOME_PILOT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 >= 2.0.15\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 >= 2.0.15") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GNOME_PILOT_LIBS=`$PKG_CONFIG --libs "gnome-pilot-2.0 >= 2.0.15" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -21225,18 +17074,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNOME_PILOT_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-pilot-2.0 >= 2.0.15) were not met:
+-
+-$GNOME_PILOT_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GNOME_PILOT_CFLAGS
+-and GNOME_PILOT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gnome-pilot-2.0 >= 2.0.15) were not met:
++	as_fn_error "Package requirements (gnome-pilot-2.0 >= 2.0.15) were not met:
+ 
+ $GNOME_PILOT_PKG_ERRORS
+ 
+@@ -21246,22 +17084,11 @@
+ Alternatively, you may set the environment variables GNOME_PILOT_CFLAGS
+ and GNOME_PILOT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GNOME_PILOT_CFLAGS
+-and GNOME_PILOT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -21270,12 +17097,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	GNOME_PILOT_CFLAGS=$pkg_cv_GNOME_PILOT_CFLAGS
+ 	GNOME_PILOT_LIBS=$pkg_cv_GNOME_PILOT_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -21285,19 +17111,15 @@
+ 	LDFLAGS_save="$LDFLAGS"
+ 	LDFLAGS="$GNOME_PILOT_LIBS $LDFLAGS"
+ 
+-	{ $as_echo "$as_me:$LINENO: checking if pilot-link handles UTF-8 conversions" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if pilot-link handles UTF-8 conversions" >&5
+ $as_echo_n "checking if pilot-link handles UTF-8 conversions... " >&6; }
+-if test "${ac_cv_pilot_link_utf8+set}" = set; then
++if test "${ac_cv_pilot_link_utf8+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
++  if test "$cross_compiling" = yes; then :
+   ac_cv_pilot_link_utf8=no
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include <stdlib.h>
+ 		#include <string.h>
+@@ -21314,53 +17136,24 @@
+ 
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++if ac_fn_c_try_run "$LINENO"; then :
+   ac_cv_pilot_link_utf8=yes
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-ac_cv_pilot_link_utf8=no
++  ac_cv_pilot_link_utf8=no
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_pilot_link_utf8" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_pilot_link_utf8" >&5
+ $as_echo "$ac_cv_pilot_link_utf8" >&6; }
+ 
+ 	CFLAGS="$CFLAGS_save"
+ 	LDFLAGS="$LDFLAGS_save"
+ 
+ 	if test "$ac_cv_pilot_link_utf8" = no; then
+-		{ { $as_echo "$as_me:$LINENO: error: evolution requires pilot-link to have working UTF-8 conversion routines" >&5
+-$as_echo "$as_me: error: evolution requires pilot-link to have working UTF-8 conversion routines" >&2;}
+-   { (exit 1); exit 1; }; }
++		as_fn_error "evolution requires pilot-link to have working UTF-8 conversion routines" "$LINENO" 5
+ 	fi
+ fi
+  if test x$enable_pilot_conduits = xyes; then
+@@ -21378,7 +17171,7 @@
+ 
+ 
+ # Check whether --with-pisock was given.
+-if test "${with_pisock+set}" = set; then
++if test "${with_pisock+set}" = set; then :
+   withval=$with_pisock;
+ 	if test x$withval = xyes; then
+ 				0.11.4
+@@ -21386,15 +17179,13 @@
+ 		PISOCK_CFLAGS="-I$withval/include"
+ 		incdir="$withval/include"
+ 		PISOCK_LIBS="-L$withval/lib -lpisock -lpisync"
+-		{ $as_echo "$as_me:$LINENO: checking for existance of \"$withval\"/lib/libpisock.so" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for existance of \"$withval\"/lib/libpisock.so" >&5
+ $as_echo_n "checking for existance of \"$withval\"/lib/libpisock.so... " >&6; }
+ 		if test -r $withval/lib/libpisock.so; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		else
+-		{ { $as_echo "$as_me:$LINENO: error: Unable to find libpisock. Try  http://www.pilot-link.org." >&5
+-$as_echo "$as_me: error: Unable to find libpisock. Try  http://www.pilot-link.org." >&2;}
+-   { (exit 1); exit 1; }; }
++		as_fn_error "Unable to find libpisock. Try  http://www.pilot-link.org." "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -21402,432 +17193,32 @@
+ 
+ 
+ 	if test x$PISOCK_CFLAGS = x; then
+-		if test "${ac_cv_header_pi_version_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for pi-version.h" >&5
+-$as_echo_n "checking for pi-version.h... " >&6; }
+-if test "${ac_cv_header_pi_version_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pi_version_h" >&5
+-$as_echo "$ac_cv_header_pi_version_h" >&6; }
++		ac_fn_c_check_header_mongrel "$LINENO" "pi-version.h" "ac_cv_header_pi_version_h" "$ac_includes_default"
++if test "x$ac_cv_header_pi_version_h" = x""yes; then :
++  incdir="/usr/include"
+ else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking pi-version.h usability" >&5
+-$as_echo_n "checking pi-version.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <pi-version.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
++
++		ac_fn_c_check_header_mongrel "$LINENO" "libpisock/pi-version.h" "ac_cv_header_libpisock_pi_version_h" "$ac_includes_default"
++if test "x$ac_cv_header_libpisock_pi_version_h" = x""yes; then :
++  PISOCK_CFLAGS="-I/usr/include/libpisock"
++							piversion_include="libpisock/pi-version.h"
++							incdir="/usr/include/libpisock"
++
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking pi-version.h presence" >&5
+-$as_echo_n "checking pi-version.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <pi-version.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: pi-version.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: pi-version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: pi-version.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: pi-version.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------ ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
+-## ------------------------------------------------------------------------ ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for pi-version.h" >&5
+-$as_echo_n "checking for pi-version.h... " >&6; }
+-if test "${ac_cv_header_pi_version_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_pi_version_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pi_version_h" >&5
+-$as_echo "$ac_cv_header_pi_version_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_pi_version_h" = x""yes; then
+-  incdir="/usr/include"
+-else
+-
+-		if test "${ac_cv_header_libpisock_pi_version_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libpisock/pi-version.h" >&5
+-$as_echo_n "checking for libpisock/pi-version.h... " >&6; }
+-if test "${ac_cv_header_libpisock_pi_version_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpisock_pi_version_h" >&5
+-$as_echo "$ac_cv_header_libpisock_pi_version_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libpisock/pi-version.h usability" >&5
+-$as_echo_n "checking libpisock/pi-version.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <libpisock/pi-version.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libpisock/pi-version.h presence" >&5
+-$as_echo_n "checking libpisock/pi-version.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <libpisock/pi-version.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libpisock/pi-version.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libpisock/pi-version.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------ ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
+-## ------------------------------------------------------------------------ ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libpisock/pi-version.h" >&5
+-$as_echo_n "checking for libpisock/pi-version.h... " >&6; }
+-if test "${ac_cv_header_libpisock_pi_version_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libpisock_pi_version_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libpisock_pi_version_h" >&5
+-$as_echo "$ac_cv_header_libpisock_pi_version_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libpisock_pi_version_h" = x""yes; then
+-  PISOCK_CFLAGS="-I/usr/include/libpisock"
+-							piversion_include="libpisock/pi-version.h"
+-							incdir="/usr/include/libpisock"
+-
+-else
+-
+-		as_ac_Header=`$as_echo "ac_cv_header_$prefix/include/pi-version.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $prefix/include/pi-version.h" >&5
+-$as_echo_n "checking for $prefix/include/pi-version.h... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking $prefix/include/pi-version.h usability" >&5
+-$as_echo_n "checking $prefix/include/pi-version.h usability... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-#include <$prefix/include/pi-version.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_header_compiler=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_header_compiler=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+-$as_echo "$ac_header_compiler" >&6; }
+-
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $prefix/include/pi-version.h presence" >&5
+-$as_echo_n "checking $prefix/include/pi-version.h presence... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <$prefix/include/pi-version.h>
+-_ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
+-  ac_header_preproc=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-  ac_header_preproc=no
+-fi
+-
+-rm -f conftest.err conftest.$ac_ext
+-{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+-$as_echo "$ac_header_preproc" >&6; }
+-
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $prefix/include/pi-version.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $prefix/include/pi-version.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------------------------------------------------ ##
+-## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution ##
+-## ------------------------------------------------------------------------ ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $prefix/include/pi-version.h" >&5
+-$as_echo_n "checking for $prefix/include/pi-version.h... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  eval "$as_ac_Header=\$ac_header_preproc"
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-
+-fi
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
+-  PISOCK_CFLAGS="-I$prefix/include/libpisock"
+-								piversion_include="$prefix/include/pi-version.h"
+-								if test x$PISOCK_LIBDIR = x; then
+-									incdir="$prefix/include"
+-									PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync"
+-								fi
+-
+-else
+-  { { $as_echo "$as_me:$LINENO: error: Unable to find pi-version.h" >&5
+-$as_echo "$as_me: error: Unable to find pi-version.h" >&2;}
+-   { (exit 1); exit 1; }; }
++		as_ac_Header=`$as_echo "ac_cv_header_$prefix/include/pi-version.h" | $as_tr_sh`
++ac_fn_c_check_header_mongrel "$LINENO" "$prefix/include/pi-version.h" "$as_ac_Header" "$ac_includes_default"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
++  PISOCK_CFLAGS="-I$prefix/include/libpisock"
++								piversion_include="$prefix/include/pi-version.h"
++								if test x$PISOCK_LIBDIR = x; then
++									incdir="$prefix/include"
++									PISOCK_LIBS="-L$prefix/lib -lpisock -lpisync"
++								fi
++
++else
++  as_fn_error "Unable to find pi-version.h" "$LINENO" 5
+ fi
+ 
+ 
+@@ -21842,18 +17233,14 @@
+ 	fi
+ 
+ 	if test "x$PISOCK_LIBS" = "x"; then
+-		{ $as_echo "$as_me:$LINENO: checking for pi_accept in -lpisock" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pi_accept in -lpisock" >&5
+ $as_echo_n "checking for pi_accept in -lpisock... " >&6; }
+-if test "${ac_cv_lib_pisock_pi_accept+set}" = set; then
++if test "${ac_cv_lib_pisock_pi_accept+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpisock  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -21871,54 +17258,27 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_pisock_pi_accept=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pisock_pi_accept=no
++  ac_cv_lib_pisock_pi_accept=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pisock_pi_accept" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pisock_pi_accept" >&5
+ $as_echo "$ac_cv_lib_pisock_pi_accept" >&6; }
+-if test "x$ac_cv_lib_pisock_pi_accept" = x""yes; then
++if test "x$ac_cv_lib_pisock_pi_accept" = x""yes; then :
+    PISOCK_LIBS="-lpisock -lpisync"
+ else
+-   { { $as_echo "$as_me:$LINENO: error: Unable to find libpisock. Try http://www.pilot-link.org." >&5
+-$as_echo "$as_me: error: Unable to find libpisock. Try http://www.pilot-link.org." >&2;}
+-   { (exit 1); exit 1; }; }
++   as_fn_error "Unable to find libpisock. Try http://www.pilot-link.org." "$LINENO" 5
+ fi
+ 
+ 	fi
+ 
+ 	# Check whether --enable-pilotlinktest was given.
+-if test "${enable_pilotlinktest+set}" = set; then
++if test "${enable_pilotlinktest+set}" = set; then :
+   enableval=$enable_pilotlinktest; testplversion="$enableval"
+ else
+   testplversion=yes
+@@ -21942,23 +17302,19 @@
+ 	PILOT_LINK_VERSION="$pi_major.$pi_minor.$pi_micro$pi_patch"
+ 
+ 	if test x$testplversion = xyes; then
+-		{ $as_echo "$as_me:$LINENO: checking for pilot-link version >= 0.11.4" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pilot-link version >= 0.11.4" >&5
+ $as_echo_n "checking for pilot-link version >= 0.11.4... " >&6; }
+ 		pl_ma=`echo 0.11.4|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+ 		pl_mi=`echo 0.11.4|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+ 		pl_mc=`echo 0.11.4|sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+ 		CFLAGS_save="$CFLAGS"
+ 		CFLAGS="$CFLAGS $PISOCK_CFLAGS"
+-		if test "$cross_compiling" = yes; then
+-  { $as_echo "$as_me:$LINENO: WARNING: No action taken for crosscompile" >&5
++		if test "$cross_compiling" = yes; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No action taken for crosscompile" >&5
+ $as_echo "$as_me: WARNING: No action taken for crosscompile" >&2;}
+ 
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 			#include <$piversion_include>
+@@ -21978,45 +17334,16 @@
+ 			}
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  { $as_echo "$as_me:$LINENO: result: yes (found $PILOT_LINK_VERSION)" >&5
++if ac_fn_c_try_run "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (found $PILOT_LINK_VERSION)" >&5
+ $as_echo "yes (found $PILOT_LINK_VERSION)" >&6; }
+ else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-( exit $ac_status )
+-{ { $as_echo "$as_me:$LINENO: error: pilot-link >= 0.11.4 required" >&5
+-$as_echo "$as_me: error: pilot-link >= 0.11.4 required" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "pilot-link >= 0.11.4 required" "$LINENO" 5
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+ 		CFLAGS="$CFLAGS_save"
+ 	fi
+ 
+@@ -22039,9 +17366,7 @@
+ 
+ 	if test $PILOT_LINK_MINOR -ge 12; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define PILOT_LINK_0_12 /**/
+-_ACEOF
++$as_echo "#define PILOT_LINK_0_12 /**/" >>confdefs.h
+ 
+ 	fi
+ else
+@@ -22052,7 +17377,7 @@
+ 
+ 
+ # Check whether --with-krb5 was given.
+-if test "${with_krb5+set}" = set; then
++if test "${with_krb5+set}" = set; then :
+   withval=$with_krb5; with_krb5=$withval
+ else
+   with_krb5=no
+@@ -22060,7 +17385,7 @@
+ 
+ 
+ # Check whether --with-krb5-libs was given.
+-if test "${with_krb5_libs+set}" = set; then
++if test "${with_krb5_libs+set}" = set; then :
+   withval=$with_krb5_libs; with_krb5_libs=$withval
+ else
+   with_krb5_libs=$with_krb5/lib
+@@ -22068,7 +17393,7 @@
+ 
+ 
+ # Check whether --with-krb5-includes was given.
+-if test "${with_krb5_includes+set}" = set; then
++if test "${with_krb5_includes+set}" = set; then :
+   withval=$with_krb5_includes; with_krb5_includes=$withval
+ else
+   with_krb5_includes=""
+@@ -22076,7 +17401,7 @@
+ 
+ 
+ # Check whether --with-krb4 was given.
+-if test "${with_krb4+set}" = set; then
++if test "${with_krb4+set}" = set; then :
+   withval=$with_krb4; with_krb4=$withval
+ else
+   with_krb4=no
+@@ -22084,7 +17409,7 @@
+ 
+ 
+ # Check whether --with-krb4-libs was given.
+-if test "${with_krb4_libs+set}" = set; then
++if test "${with_krb4_libs+set}" = set; then :
+   withval=$with_krb4_libs; with_krb4_libs=$withval
+ else
+   with_krb4_libs=$with_krb4/lib
+@@ -22092,7 +17417,7 @@
+ 
+ 
+ # Check whether --with-krb4-includes was given.
+-if test "${with_krb4_includes+set}" = set; then
++if test "${with_krb4_includes+set}" = set; then :
+   withval=$with_krb4_includes; with_krb4_includes=$withval
+ else
+   with_krb4_includes=""
+@@ -22106,18 +17431,14 @@
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+ 	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
+ 	sunlibs="-lkrb5 -lgss"
+-	{ $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 5" >&5
+ $as_echo_n "checking for Kerberos 5... " >&6; }
+-if test "${ac_cv_lib_kerberos5+set}" = set; then
++if test "${ac_cv_lib_kerberos5+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ 		LIBS="$LIBS -L$with_krb5_libs $mitlibs"
+-		cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22135,39 +17456,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos5="$mitlibs"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+ 			LIBS="$LIBS_save -L$with_krb5_libs $heimlibs"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22185,39 +17479,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos5="$heimlibs"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+ 				LIBS="$LIBS_save -L$with_krb5_libs $sunlibs"
+-				cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22235,66 +17502,33 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos5="$sunlibs"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_kerberos5="no"
++  ac_cv_lib_kerberos5="no"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 		LIBS="$LIBS_save"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kerberos5" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kerberos5" >&5
+ $as_echo "$ac_cv_lib_kerberos5" >&6; }
+ 	if test "$ac_cv_lib_kerberos5" != "no"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB5 1
+-_ACEOF
++$as_echo "#define HAVE_KRB5 1" >>confdefs.h
+ 
+ 		if test "$ac_cv_lib_kerberos5" = "$mitlibs"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MIT_KRB5 1
+-_ACEOF
++$as_echo "#define HAVE_MIT_KRB5 1" >>confdefs.h
+ 
+ 			if test -z "$with_krb5_includes"; then
+ 				KRB5_CFLAGS="-I$with_krb5/include"
+@@ -22305,9 +17539,7 @@
+ 		else
+ 			if test "$ac_cv_lib_kerberos5" = "$heimlibs"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_HEIMDAL_KRB5 1
+-_ACEOF
++$as_echo "#define HAVE_HEIMDAL_KRB5 1" >>confdefs.h
+ 
+ 				if test -z "$with_krb5_includes"; then
+ 					KRB5_CFLAGS="-I$with_krb5/include/heimdal"
+@@ -22317,9 +17549,7 @@
+ 				msg_krb5="yes (Heimdal)"
+ 			else
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SUN_KRB5 1
+-_ACEOF
++$as_echo "#define HAVE_SUN_KRB5 1" >>confdefs.h
+ 
+ 				if test -z "$with_krb5_includes"; then
+ 					KRB5_CFLAGS="-I$with_krb5/include/kerberosv5"
+@@ -22332,122 +17562,32 @@
+ 		KRB5_LIBS="-L$with_krb5_libs $ac_cv_lib_kerberos5"
+ 	fi
+ else
+-	{ $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 5" >&5
+ $as_echo_n "checking for Kerberos 5... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: $with_krb5" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_krb5" >&5
+ $as_echo "$with_krb5" >&6; }
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for et/com_err.h" >&5
+-$as_echo_n "checking for et/com_err.h... " >&6; }
+-if test "${ac_cv_header_et_com_err_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-	#if HAVE_ET_COM_ERR_H
++ac_fn_c_check_header_compile "$LINENO" "et/com_err.h" "ac_cv_header_et_com_err_h" "	#if HAVE_ET_COM_ERR_H
+ 		#include <com_err.h>
+ 		#endif
+ 
++"
++if test "x$ac_cv_header_et_com_err_h" = x""yes; then :
+ 
+-#include <et/com_err.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_et_com_err_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_et_com_err_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_et_com_err_h" >&5
+-$as_echo "$ac_cv_header_et_com_err_h" >&6; }
+-if test "x$ac_cv_header_et_com_err_h" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ET_COM_ERR_H 1
+-_ACEOF
++$as_echo "#define HAVE_ET_COM_ERR_H 1" >>confdefs.h
+ 
+ fi
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for com_err.h" >&5
+-$as_echo_n "checking for com_err.h... " >&6; }
+-if test "${ac_cv_header_com_err_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-	#if HAVE_COM_ERR_H
++ac_fn_c_check_header_compile "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "	#if HAVE_COM_ERR_H
+ 		#include <com_err.h>
+ 		#endif
+ 
++"
++if test "x$ac_cv_header_com_err_h" = x""yes; then :
+ 
+-#include <com_err.h>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  ac_cv_header_com_err_h=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_com_err_h=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_com_err_h" >&5
+-$as_echo "$ac_cv_header_com_err_h" >&6; }
+-if test "x$ac_cv_header_com_err_h" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_COM_ERR_H 1
+-_ACEOF
++$as_echo "#define HAVE_COM_ERR_H 1" >>confdefs.h
+ 
+ fi
+ 
+@@ -22456,20 +17596,16 @@
+ msg_krb4="no"
+ if test "x${with_krb4}" != "xno"; then
+ 	LIBS_save="$LIBS"
+-	{ $as_echo "$as_me:$LINENO: checking for Kerberos 4" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 4" >&5
+ $as_echo_n "checking for Kerberos 4... " >&6; }
+-if test "${ac_cv_lib_kerberos4+set}" = set; then
++if test "${ac_cv_lib_kerberos4+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ 		ac_cv_lib_kerberos4="no"
+ 		mitcompatlibs="-lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"
+ 				LIBS="$LIBS_save -L$with_krb4_libs $mitcompatlibs"
+-		cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22487,46 +17623,15 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos4="$mitcompatlibs"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ 		if test "$ac_cv_lib_kerberos4" = "no"; then
+ 						LIBS="$LIBS_save -L$with_krb4_libs -lkrb -lcrypto -lcom_err -lroken"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22544,46 +17649,15 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos4="-lkrb -lcrypto -lcom_err -lroken"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 		fi
+ 		if test "$ac_cv_lib_kerberos4" = "no"; then
+ 						LIBS="$LIBS_save -L$with_krb4_libs -lkrb"
+-			cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++			cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22601,39 +17675,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos4="-lkrb"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+ 				LIBS="$LIBS_save -ldes"
+-				cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22651,55 +17698,24 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_kerberos4="-lkrb -ldes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 		fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_kerberos4" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kerberos4" >&5
+ $as_echo "$ac_cv_lib_kerberos4" >&6; }
+ 	LIBS="$LIBS_save"
+ 	if test "$ac_cv_lib_kerberos4" != "no"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_KRB4 1
+-_ACEOF
++$as_echo "#define HAVE_KRB4 1" >>confdefs.h
+ 
+ 		msg_krb4="yes"
+ 
+@@ -22717,11 +17733,7 @@
+ 
+ 		CFLAGS_save="$CFLAGS"
+ 		CFLAGS="$CFLAGS $KRB4_CFLAGS"
+-		cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 	#include "krb.h"
+ 			int krb_sendauth;
+@@ -22735,43 +17747,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define NEED_KRB_SENDAUTH_PROTO 1
+-_ACEOF
+-
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_compile "$LINENO"; then :
+ 
++$as_echo "#define NEED_KRB_SENDAUTH_PROTO 1" >>confdefs.h
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 		CFLAGS="$CFLAGS_save"
+ 	fi
+ else
+-	{ $as_echo "$as_me:$LINENO: checking for Kerberos 4" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Kerberos 4" >&5
+ $as_echo_n "checking for Kerberos 4... " >&6; }
+-	{ $as_echo "$as_me:$LINENO: result: ${with_krb4}" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_krb4}" >&5
+ $as_echo "${with_krb4}" >&6; }
+ fi
+ 
+@@ -22784,7 +17771,7 @@
+ MONO_CFLAGS=
+ MONO_LIBS=
+ # Check whether --enable-mono was given.
+-if test "${enable_mono+set}" = set; then
++if test "${enable_mono+set}" = set; then :
+   enableval=$enable_mono; enable_mono=$enableval
+ else
+   enable_mono=no
+@@ -22793,18 +17780,18 @@
+ if test "x${enable_mono}" = "xyes"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for MONO" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MONO" >&5
+ $as_echo_n "checking for MONO... " >&6; }
+ 
+ if test -n "$MONO_CFLAGS"; then
+     pkg_cv_MONO_CFLAGS="$MONO_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"mono\"\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"mono\"\""; } >&5
+   ($PKG_CONFIG --exists --print-errors ""mono"") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_MONO_CFLAGS=`$PKG_CONFIG --cflags ""mono"" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -22816,11 +17803,11 @@
+     pkg_cv_MONO_LIBS="$MONO_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\"mono\"\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\"mono\"\""; } >&5
+   ($PKG_CONFIG --exists --print-errors ""mono"") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_MONO_LIBS=`$PKG_CONFIG --libs ""mono"" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -22846,18 +17833,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MONO_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (\"mono\") were not met:
+-
+-$MONO_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables MONO_CFLAGS
+-and MONO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (\"mono\") were not met:
++	as_fn_error "Package requirements (\"mono\") were not met:
+ 
+ $MONO_PKG_ERRORS
+ 
+@@ -22867,22 +17843,11 @@
+ Alternatively, you may set the environment variables MONO_CFLAGS
+ and MONO_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables MONO_CFLAGS
+-and MONO_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -22891,19 +17856,16 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	MONO_CFLAGS=$pkg_cv_MONO_CFLAGS
+ 	MONO_LIBS=$pkg_cv_MONO_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_MONO 1
+-_ACEOF
++$as_echo "#define ENABLE_MONO 1" >>confdefs.h
+ 
+ 	MONO_PLUGIN="mono"
+ fi
+@@ -22912,7 +17874,7 @@
+ 
+ 
+ # Check whether --enable-python was given.
+-if test "${enable_python+set}" = set; then
++if test "${enable_python+set}" = set; then :
+   enableval=$enable_python; enable_python=$enableval
+ else
+   enable_python=no
+@@ -22922,9 +17884,9 @@
+ if test "x${enable_python}" = "xyes"; then
+ 	# Extract the first word of "python", so it can be a program name with args.
+ set dummy python; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_pythonpath+set}" = set; then
++if test "${ac_cv_path_pythonpath+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $pythonpath in
+@@ -22937,14 +17899,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_pythonpath="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -22952,16 +17914,16 @@
+ fi
+ pythonpath=$ac_cv_path_pythonpath
+ if test -n "$pythonpath"; then
+-  { $as_echo "$as_me:$LINENO: result: $pythonpath" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pythonpath" >&5
+ $as_echo "$pythonpath" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+ 	if test "_$pythonpath" != _ ; then
+-		{ $as_echo "$as_me:$LINENO: checking for python compile flags" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for python compile flags" >&5
+ $as_echo_n "checking for python compile flags... " >&6; }
+ 		PY_PREFIX=`$pythonpath -c 'import sys ; print sys.prefix'`
+ 		PY_EXEC_PREFIX=`$pythonpath -c 'import sys ; print sys.exec_prefix'`
+@@ -22971,14 +17933,12 @@
+ 		if test -f $PY_PREFIX/include/python$PY_VERSION/Python.h -a "$PY_MAJOR" = "2."; then
+ 		   	PY_LIBS="-lpython$PY_VERSION -L$PY_EXEC_PREFIX/lib/python$PY_VERSION/config"
+ 			PY_INCLUDES="-I$PY_PREFIX/include/python$PY_VERSION"
+-			{ $as_echo "$as_me:$LINENO: result: ok" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+ 			python_package="python-devel"
+ 			PYTHON_PLUGIN="python"
+ 		else
+-			{ { $as_echo "$as_me:$LINENO: error: Can't find Python.h" >&5
+-$as_echo "$as_me: error: Can't find Python.h" >&2;}
+-   { (exit 1); exit 1; }; }
++			as_fn_error "Can't find Python.h" "$LINENO" 5
+ 			PY_LIBS=""
+ 			PY_INCLUDES=""
+ 			python_package=""
+@@ -22995,7 +17955,7 @@
+ 
+ 
+ # Check whether --enable-nss was given.
+-if test "${enable_nss+set}" = set; then
++if test "${enable_nss+set}" = set; then :
+   enableval=$enable_nss; enable_nss=$enableval
+ else
+   enable_nss=yes
+@@ -23003,7 +17963,7 @@
+ 
+ 
+ # Check whether --enable-smime was given.
+-if test "${enable_smime+set}" = set; then
++if test "${enable_smime+set}" = set; then :
+   enableval=$enable_smime; enable_smime=$enableval
+ else
+   enable_smime=yes
+@@ -23012,28 +17972,28 @@
+ 
+ 
+ # Check whether --with-nspr-includes was given.
+-if test "${with_nspr_includes+set}" = set; then
++if test "${with_nspr_includes+set}" = set; then :
+   withval=$with_nspr_includes;
+ fi
+ 
+ 
+ 
+ # Check whether --with-nspr-libs was given.
+-if test "${with_nspr_libs+set}" = set; then
++if test "${with_nspr_libs+set}" = set; then :
+   withval=$with_nspr_libs;
+ fi
+ 
+ 
+ 
+ # Check whether --with-nss-includes was given.
+-if test "${with_nss_includes+set}" = set; then
++if test "${with_nss_includes+set}" = set; then :
+   withval=$with_nss_includes;
+ fi
+ 
+ 
+ 
+ # Check whether --with-nss-libs was given.
+-if test "${with_nss_libs+set}" = set; then
++if test "${with_nss_libs+set}" = set; then :
+   withval=$with_nss_libs;
+ fi
+ 
+@@ -23046,24 +18006,24 @@
+ 	fi
+ 
+ 	if test "x${check_manually}" = "xno"; then
+-		{ $as_echo "$as_me:$LINENO: checking Mozilla NSPR pkg-config module name" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Mozilla NSPR pkg-config module name" >&5
+ $as_echo_n "checking Mozilla NSPR pkg-config module name... " >&6; }
+ 		mozilla_nspr_pcs="nspr mozilla-nspr firefox-nspr xulrunner-nspr seamonkey-nspr"
+ 		for pc in $mozilla_nspr_pcs; do
+ 			if $PKG_CONFIG --exists $pc; then
+-				{ $as_echo "$as_me:$LINENO: result: $pc" >&5
++				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pc" >&5
+ $as_echo "$pc" >&6; }
+ 				mozilla_nspr=$pc
+ 				break;
+ 			fi
+ 		done
+ 
+-		{ $as_echo "$as_me:$LINENO: checking Mozilla NSS pkg-config module name" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Mozilla NSS pkg-config module name" >&5
+ $as_echo_n "checking Mozilla NSS pkg-config module name... " >&6; }
+ 		mozilla_nss_pcs="nss mozilla-nss firefox-nss xulrunner-nss seamonkey-nss"
+ 		for pc in $mozilla_nss_pcs; do
+ 			if $PKG_CONFIG --exists $pc; then
+-				{ $as_echo "$as_me:$LINENO: result: $pc" >&5
++				{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pc" >&5
+ $as_echo "$pc" >&6; }
+ 				mozilla_nss=$pc
+ 				break;
+@@ -23074,21 +18034,15 @@
+ 			msg_ssl="yes (Mozilla NSS)"
+ 			if test "x$enable_smime" = "xyes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_SMIME 1
+-_ACEOF
++$as_echo "#define ENABLE_SMIME 1" >>confdefs.h
+ 
+ 				msg_smime="yes (Mozilla NSS)"
+ 			fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NSS 1
+-_ACEOF
++$as_echo "#define HAVE_NSS 1" >>confdefs.h
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SSL 1
+-_ACEOF
++$as_echo "#define HAVE_SSL 1" >>confdefs.h
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23112,72 +18066,24 @@
+ 		if test "x${with_nspr_includes}" != "xno"; then
+ 			CPPFLAGS_save="$CPPFLAGS"
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nspr4 includes in $with_nspr_includes" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nspr4 includes in $with_nspr_includes" >&5
+ $as_echo_n "checking for Mozilla nspr4 includes in $with_nspr_includes... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: \"\"" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"\"" >&5
+ $as_echo "\"\"" >&6; }
+ 
+ 			CPPFLAGS="$CPPFLAGS -I$with_nspr_includes"
+-
+-
+-for ac_header in nspr.h prio.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
++			for ac_header in nspr.h prio.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+ 				#if HAVE_NSPR_H
+ 				#include <nspr.h>
+ 				#include <prio.h>
+ 				#endif
+ 
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23193,9 +18099,9 @@
+ 				MANUAL_NSPR_CFLAGS="-I$with_nspr_includes"
+ 			fi
+ 		else
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nspr4 includes" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nspr4 includes" >&5
+ $as_echo_n "checking for Mozilla nspr4 includes... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: no" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		fi
+ 
+@@ -23206,13 +18112,9 @@
+ 
+ 			if test "$enable_nss" = "static"; then
+ 				if test -z "${with_nspr_libs}"; then
+-					{ { $as_echo "$as_me:$LINENO: error: Static linkage requested, but path to nspr libraries not set.
+-					Please specify the path to libnspr4.a
+-					Example: --with-nspr-libs=/usr/lib" >&5
+-$as_echo "$as_me: error: Static linkage requested, but path to nspr libraries not set.
++					as_fn_error "Static linkage requested, but path to nspr libraries not set.
+ 					Please specify the path to libnspr4.a
+-					Example: --with-nspr-libs=/usr/lib" >&2;}
+-   { (exit 1); exit 1; }; }
++					Example: --with-nspr-libs=/usr/lib" "$LINENO" 5
+ 				else
+ 					nsprlibs="$DL_LIB $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+ 				fi
+@@ -23220,9 +18122,9 @@
+ 				nsprlibs="$DL_LIB -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+ 			fi
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nspr libraries" >&5
+ $as_echo_n "checking for Mozilla nspr libraries... " >&6; }
+-if test "${ac_cv_moz_nspr_libs+set}" = set; then
++if test "${ac_cv_moz_nspr_libs+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+@@ -23237,11 +18139,7 @@
+ 		       			LDFLAGS="$LDFLAGS"
+ 				fi
+ 
+-				cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23259,44 +18157,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_moz_nspr_libs="yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_moz_nspr_libs="no"
++  ac_cv_moz_nspr_libs="no"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 				CFLAGS="$CFLAGS_save"
+ 				LDFLAGS="$LDFLAGS_save"
+ 	 			LIBS="$LIBS_save"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_moz_nspr_libs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_moz_nspr_libs" >&5
+ $as_echo "$ac_cv_moz_nspr_libs" >&6; }
+ 			if test "x$ac_cv_moz_nspr_libs" != "xno"; then
+ 				have_nspr_libs="yes"
+@@ -23305,18 +18178,18 @@
+ 				MANUAL_NSPR_CLFAGS=""
+ 			fi
+ 		else
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nspr4 libraries" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nspr4 libraries" >&5
+ $as_echo_n "checking for Mozilla nspr4 libraries... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: no" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		fi
+ 
+ 		if test "x${with_nss_includes}" != "xno" -a "x${have_nspr_libs}" != "xno"; then
+ 			CPPFLAGS_save="$CPPFLAGS"
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nss3 includes in $with_nss_includes" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nss3 includes in $with_nss_includes" >&5
+ $as_echo_n "checking for Mozilla nss3 includes in $with_nss_includes... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: \"\"" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: \"\"" >&5
+ $as_echo "\"\"" >&6; }
+ 
+ 			if test "x${with_nspr_includes}" != "x"; then
+@@ -23325,68 +18198,19 @@
+ 				CPPFLAGS="$CPPFLAGS -I$with_nss_includes"
+ 			fi
+ 
+-
+-
+-
+-for ac_header in nss.h ssl.h smime.h
+-do
+-as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+-$as_echo_n "checking for $ac_header... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
++			for ac_header in nss.h ssl.h smime.h
++do :
++  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
++ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+ 					#if HAVE_NSPR_H
+ 					#include <nss.h>
+ 					#include <ssl.h>
+ 					#include <smime.h>
+ 					#endif
+ 
+-
+-#include <$ac_header>
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
+-  eval "$as_ac_Header=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Header=no"
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-ac_res=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+-$as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Header'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++"
++eval as_val=\$$as_ac_Header
++   if test "x$as_val" = x""yes; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -23408,9 +18232,9 @@
+ 				MANUAL_NSPR_LIBS=""
+ 			fi
+ 		else
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nss3 includes" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nss3 includes" >&5
+ $as_echo_n "checking for Mozilla nss3 includes... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: no" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		fi
+ 
+@@ -23419,13 +18243,9 @@
+ 
+ 			if test "$enable_nss" = "static"; then
+ 		    		if test -z "${with_nss_libs}"; then
+-					{ { $as_echo "$as_me:$LINENO: error: Static linkage requested, but path to nss libraries not set.
+-					Please specify the path to libnss3.a
+-					Example: --with-nspr-libs=/usr/lib/mozilla" >&5
+-$as_echo "$as_me: error: Static linkage requested, but path to nss libraries not set.
++					as_fn_error "Static linkage requested, but path to nss libraries not set.
+ 					Please specify the path to libnss3.a
+-					Example: --with-nspr-libs=/usr/lib/mozilla" >&2;}
+-   { (exit 1); exit 1; }; }
++					Example: --with-nspr-libs=/usr/lib/mozilla" "$LINENO" 5
+ 				else
+ 					nsslibs="-ldb1 $with_nss_libs/libnssckfw.a $with_nss_libs/libasn1.a $with_nss_libs/libcrmf.a $with_nss_libs/libswfci.a $with_nss_libs/libjar.a $with_nss_libs/libpkcs12.a $with_nss_libs/libpkcs7.a $with_nss_libs/libpki1.a $with_nss_libs/libsmime.a $with_nss_libs/libssl.a $with_nss_libs/libnss.a $with_nss_libs/libpk11wrap.a $with_nss_libs/libsoftokn.a $with_nss_libs/libfreebl.a $with_nss_libs/libnsspki.a $with_nss_libs/libnssdev.a $with_nss_libs/libcryptohi.a $with_nss_libs/libcerthi.a $with_nss_libs/libcertdb.a $with_nss_libs/libsecutil.a $with_nss_libs/libnssb.a"
+ 					case "$host" in
+@@ -23438,20 +18258,16 @@
+ 		 		nsslibs="-lssl3 -lsmime3 -lnss3"
+ 			fi
+ 
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nss libraries" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nss libraries" >&5
+ $as_echo_n "checking for Mozilla nss libraries... " >&6; }
+-if test "${ac_cv_moz_nss_libs+set}" = set; then
++if test "${ac_cv_moz_nss_libs+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+ 
+ 	 			LIBS_save="$LIBS"
+ 				LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+ 		      		LIBS="$nsslibs $nsprlibs"
+-				cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++				cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23469,46 +18285,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_moz_nss_libs="yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_moz_nss_libs="no"
++  ac_cv_moz_nss_libs="no"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 				if test "$ac_cv_moz_nss_libs" = no; then
+ 					nsslibs="-lssl3 -lsmime3 -lnss3"
+ 					LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs"
+-					cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++					cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23526,53 +18313,24 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_moz_nss_libs="yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_moz_nss_libs="no"
++  ac_cv_moz_nss_libs="no"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ 				fi
+ 				LDFLAGS="$LDFLAGS_save"
+ 	 			LIBS="$LIBS_save"
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_moz_nss_libs" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_moz_nss_libs" >&5
+ $as_echo "$ac_cv_moz_nss_libs" >&6; }
+ 			if test "$ac_cv_moz_nss_libs" != no; then
+-				cat >>confdefs.h <<\_ACEOF
+-#define HAVE_NSS 1
+-_ACEOF
++				$as_echo "#define HAVE_NSS 1" >>confdefs.h
+ 
+-				cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SSL 1
+-_ACEOF
++				$as_echo "#define HAVE_SSL 1" >>confdefs.h
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -23586,9 +18344,7 @@
+ 				fi
+ 								if test "$enable_smime" = "yes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_SMIME 1
+-_ACEOF
++$as_echo "#define ENABLE_SMIME 1" >>confdefs.h
+ 
+ 					msg_smime="yes (Mozilla NSS)"
+ 				fi
+@@ -23599,9 +18355,9 @@
+ 				MANUAL_NSPR_LIBS=""
+ 			fi
+ 		else
+-			{ $as_echo "$as_me:$LINENO: checking for Mozilla nss libraries" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla nss libraries" >&5
+ $as_echo_n "checking for Mozilla nss libraries... " >&6; }
+-			{ $as_echo "$as_me:$LINENO: result: no" >&5
++			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		fi
+ 
+@@ -23624,34 +18380,34 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking if we should build the weather calendar plugin" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if we should build the weather calendar plugin" >&5
+ $as_echo_n "checking if we should build the weather calendar plugin... " >&6; }
+ 
+ # Check whether --with-weather was given.
+-if test "${with_weather+set}" = set; then
++if test "${with_weather+set}" = set; then :
+   withval=$with_weather; use_gweather=$withval
+ else
+   use_gweather=yes
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: result: $use_gweather" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $use_gweather" >&5
+ $as_echo "$use_gweather" >&6; }
+ 
+ if test $use_gweather = yes; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBGWEATHER" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGWEATHER" >&5
+ $as_echo_n "checking for LIBGWEATHER... " >&6; }
+ 
+ if test -n "$LIBGWEATHER_CFLAGS"; then
+     pkg_cv_LIBGWEATHER_CFLAGS="$LIBGWEATHER_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -23663,11 +18419,11 @@
+     pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -23693,19 +18449,15 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBGWEATHER_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
+-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
+-   { (exit 1); exit 1; }; }
++                as_fn_error "The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5
+-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." "$LINENO" 5
+ else
+ 	LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS
+ 	LIBGWEATHER_LIBS=$pkg_cv_LIBGWEATHER_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	CALENDAR_WEATHER="calendar-weather"
+ fi
+@@ -23714,7 +18466,7 @@
+ fi
+ 
+ # Check whether --enable-exchange was given.
+-if test "${enable_exchange+set}" = set; then
++if test "${enable_exchange+set}" = set; then :
+   enableval=$enable_exchange; enable_exchange=$enableval
+ else
+   enable_exchange=yes
+@@ -23746,9 +18498,9 @@
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_KILL_PROCESS_CMD+set}" = set; then
++if test "${ac_cv_path_KILL_PROCESS_CMD+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $KILL_PROCESS_CMD in
+@@ -23761,14 +18513,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_KILL_PROCESS_CMD="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -23776,10 +18528,10 @@
+ fi
+ KILL_PROCESS_CMD=$ac_cv_path_KILL_PROCESS_CMD
+ if test -n "$KILL_PROCESS_CMD"; then
+-  { $as_echo "$as_me:$LINENO: result: $KILL_PROCESS_CMD" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $KILL_PROCESS_CMD" >&5
+ $as_echo "$KILL_PROCESS_CMD" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -23790,7 +18542,7 @@
+ 	;;
+ esac
+ if test -z "$KILL_PROCESS_CMD"; then
+-	{ $as_echo "$as_me:$LINENO: WARNING: Could not find a command to kill a process by name" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a command to kill a process by name" >&5
+ $as_echo "$as_me: WARNING: Could not find a command to kill a process by name" >&2;}
+ else
+ 
+@@ -23801,7 +18553,7 @@
+ fi
+ 
+ # Check whether --enable-glibtest was given.
+-if test "${enable_glibtest+set}" = set; then
++if test "${enable_glibtest+set}" = set; then :
+   enableval=$enable_glibtest;
+ else
+   enable_glibtest=yes
+@@ -23836,9 +18588,9 @@
+ 	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
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -23851,14 +18603,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -23866,10 +18618,10 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -23879,9 +18631,9 @@
+   ac_pt_PKG_CONFIG=$PKG_CONFIG
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ac_pt_PKG_CONFIG in
+@@ -23894,14 +18646,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   ;;
+@@ -23909,10 +18661,10 @@
+ fi
+ ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+ if test -n "$ac_pt_PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+ $as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -23921,7 +18673,7 @@
+   else
+     case $cross_compiling:$ac_tool_warned in
+ yes:)
+-{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -23934,13 +18686,13 @@
+ fi
+ if test -n "$PKG_CONFIG"; then
+ 	_pkg_min_version=0.16
+-	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+ $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+ 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+@@ -23955,7 +18707,7 @@
+   fi
+ 
+   min_glib_version=2.0.0
+-  { $as_echo "$as_me:$LINENO: checking for GLIB - version >= $min_glib_version" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5
+ $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; }
+ 
+   if test x$PKG_CONFIG != xno ; then
+@@ -23991,14 +18743,10 @@
+       CFLAGS="$CFLAGS $GLIB_CFLAGS"
+       LIBS="$GLIB_LIBS $LIBS"
+       rm -f conf.glibtest
+-      if test "$cross_compiling" = yes; then
++      if test "$cross_compiling" = yes; then :
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <glib.h>
+@@ -24073,52 +18821,25 @@
+ }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_run "$LINENO"; then :
+ 
+-( exit $ac_status )
+-no_glib=yes
++else
++  no_glib=yes
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+   fi
+   if test "x$no_glib" = x ; then
+-     { $as_echo "$as_me:$LINENO: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
++     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&5
+ $as_echo "yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)" >&6; }
+      :
+   else
+-     { $as_echo "$as_me:$LINENO: result: no" >&5
++     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+      if test "$PKG_CONFIG" = "no" ; then
+        echo "*** A new enough version of pkg-config was not found."
+@@ -24132,11 +18853,7 @@
+           ac_save_LIBS="$LIBS"
+           CFLAGS="$CFLAGS $GLIB_CFLAGS"
+           LIBS="$LIBS $GLIB_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <glib.h>
+@@ -24150,27 +18867,7 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding GLIB or finding the wrong"
+           echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your"
+@@ -24181,16 +18878,11 @@
+           echo "*** If you have an old version installed, it is best to remove it, although"
+           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 echo "*** The test program failed to compile or link. See the file config.log for the"
++   echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means GLIB is incorrectly installed."
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi
+@@ -24214,12 +18906,12 @@
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for X" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+ $as_echo_n "checking for X... " >&6; }
+ 
+ 
+ # Check whether --with-x was given.
+-if test "${with_x+set}" = set; then
++if test "${with_x+set}" = set; then :
+   withval=$with_x;
+ fi
+ 
+@@ -24229,10 +18921,8 @@
+   have_x=disabled
+ else
+   case $x_includes,$x_libraries in #(
+-    *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5
+-$as_echo "$as_me: error: cannot use X directory names containing '" >&2;}
+-   { (exit 1); exit 1; }; };; #(
+-    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then
++    *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #(
++    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   # One or both of the vars are not set, and there is no cached value.
+@@ -24280,21 +18970,25 @@
+ # Check X11 before X11Rn because it is often a symlink to the current release.
+ ac_x_header_dirs='
+ /usr/X11/include
++/usr/X11R7/include
+ /usr/X11R6/include
+ /usr/X11R5/include
+ /usr/X11R4/include
+ 
+ /usr/include/X11
++/usr/include/X11R7
+ /usr/include/X11R6
+ /usr/include/X11R5
+ /usr/include/X11R4
+ 
+ /usr/local/X11/include
++/usr/local/X11R7/include
+ /usr/local/X11R6/include
+ /usr/local/X11R5/include
+ /usr/local/X11R4/include
+ 
+ /usr/local/include/X11
++/usr/local/include/X11R7
+ /usr/local/include/X11R6
+ /usr/local/include/X11R5
+ /usr/local/include/X11R4
+@@ -24316,37 +19010,14 @@
+ if test "$ac_x_includes" = no; then
+   # Guess where to find include files, by looking for Xlib.h.
+   # First, try using that file with no special directory specified.
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+ _ACEOF
+-if { (ac_try="$ac_cpp conftest.$ac_ext"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null && {
+-	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
++if ac_fn_c_try_cpp "$LINENO"; then :
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+   for ac_dir in $ac_x_header_dirs; do
+   if test -r "$ac_dir/X11/Xlib.h"; then
+     ac_x_includes=$ac_dir
+@@ -24354,7 +19025,6 @@
+   fi
+ done
+ fi
+-
+ rm -f conftest.err conftest.$ac_ext
+ fi # $ac_x_includes = no
+ 
+@@ -24364,11 +19034,7 @@
+   # Don't add to $LIBS permanently.
+   ac_save_LIBS=$LIBS
+   LIBS="-lX11 $LIBS"
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <X11/Xlib.h>
+ int
+@@ -24379,35 +19045,12 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   LIBS=$ac_save_LIBS
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	LIBS=$ac_save_LIBS
++  LIBS=$ac_save_LIBS
+ for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
+ do
+   # Don't even attempt the hair of trying to link an X program!
+@@ -24419,10 +19062,8 @@
+   done
+ done
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi # $ac_x_libraries = no
+ 
+ case $ac_x_includes,$ac_x_libraries in #(
+@@ -24443,7 +19084,7 @@
+ fi # $with_x != no
+ 
+ if test "$have_x" != yes; then
+-  { $as_echo "$as_me:$LINENO: result: $have_x" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5
+ $as_echo "$have_x" >&6; }
+   no_x=yes
+ else
+@@ -24454,24 +19095,24 @@
+   ac_cv_have_x="have_x=yes\
+ 	ac_x_includes='$x_includes'\
+ 	ac_x_libraries='$x_libraries'"
+-  { $as_echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5
+ $as_echo "libraries $x_libraries, headers $x_includes" >&6; }
+ fi
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for X" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5
+ $as_echo_n "checking for X... " >&6; }
+ 
+ if test -n "$X_CFLAGS"; then
+     pkg_cv_X_CFLAGS="$X_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_X_CFLAGS=`$PKG_CONFIG --cflags "x11" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -24483,11 +19124,11 @@
+     pkg_cv_X_LIBS="$X_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"x11\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "x11") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_X_LIBS=`$PKG_CONFIG --libs "x11" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -24513,15 +19154,13 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$X_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 
+ if test "$no_x" = yes; then
+   # Not all programs may use this symbol, but it does not hurt to define it.
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define X_DISPLAY_MISSING 1
+-_ACEOF
++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+ 
+   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+ else
+@@ -24534,16 +19173,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 . . . .
+-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+ $as_echo_n "checking whether -R must be followed by a space... " >&6; }
+     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.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -24554,40 +19189,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+        X_LIBS="$X_LIBS -R$x_libraries"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-       cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  LIBS="$ac_xsave_LIBS -R $x_libraries"
++       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -24598,46 +19206,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+     ac_c_werror_flag=$ac_xsave_c_werror_flag
+     LIBS=$ac_xsave_LIBS
+   fi
+@@ -24653,11 +19234,7 @@
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24675,44 +19252,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24730,59 +19280,30 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dnet_dnet_ntoa=no
++  ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24800,52 +19321,25 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dnet_stub_dnet_ntoa=no
++  ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+     fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_xsave_LIBS"
+ 
+     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+@@ -24856,105 +19350,20 @@
+     # 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.
+-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+-$as_echo_n "checking for gethostbyname... " >&6; }
+-if test "${ac_cv_func_gethostbyname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define gethostbyname innocuous_gethostbyname
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char gethostbyname (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef gethostbyname
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return gethostbyname ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_gethostbyname=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_gethostbyname=no
+-fi
++    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+ 
+     if test $ac_cv_func_gethostbyname = no; then
+-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24972,59 +19381,30 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_gethostbyname=no
++  ac_cv_lib_nsl_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25042,43 +19422,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_bsd_gethostbyname=no
++  ac_cv_lib_bsd_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+ 
+@@ -25092,105 +19447,20 @@
+     # 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.
+-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
+-$as_echo_n "checking for connect... " >&6; }
+-if test "${ac_cv_func_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define connect innocuous_connect
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char connect (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef connect
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char connect ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_connect || defined __stub___connect
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return connect ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_connect=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+ 
+-	ac_cv_func_connect=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+-
+     if test $ac_cv_func_connect = no; then
+-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25208,148 +19478,38 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_socket_connect=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_socket_connect=no
++  ac_cv_lib_socket_connect=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char remove (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef remove
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char remove ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_remove || defined __stub___remove
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return remove ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_remove=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_remove=no
+-fi
++    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+ 
+     if test $ac_cv_func_remove = no; then
+-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
+ $as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lposix  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25367,148 +19527,38 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_posix_remove=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_posix_remove=no
++  ac_cv_lib_posix_remove=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
+ $as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+ 
+     fi
+ 
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+-$as_echo_n "checking for shmat... " >&6; }
+-if test "${ac_cv_func_shmat+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shmat innocuous_shmat
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shmat (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shmat
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char shmat ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shmat || defined __stub___shmat
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return shmat ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_shmat=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
+ 
+-	ac_cv_func_shmat=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-$as_echo "$ac_cv_func_shmat" >&6; }
+-
+     if test $ac_cv_func_shmat = no; then
+-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
+-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25526,43 +19576,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ipc_shmat=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ipc_shmat=no
++  ac_cv_lib_ipc_shmat=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+ 
+@@ -25578,18 +19603,14 @@
+   # 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
+-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25607,43 +19628,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ICE_IceConnectionNumber=no
++  ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+ 
+@@ -25656,18 +19652,14 @@
+ 	evolution_save_libs="$LIBS"
+ 	CFLAGS="$X_CFLAGS"
+ 	LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-	{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
+ $as_echo_n "checking for XFree in -lX11... " >&6; }
+-if test "${ac_cv_lib_X11_XFree+set}" = set; then
++if test "${ac_cv_lib_X11_XFree+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25685,48 +19677,21 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_X11_XFree=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_X11_XFree=no
++  ac_cv_lib_X11_XFree=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
+ $as_echo "$ac_cv_lib_X11_XFree" >&6; }
+-if test "x$ac_cv_lib_X11_XFree" = x""yes; then
++if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
+   :
+ else
+-  { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
+-$as_echo "$as_me: error: libX11 not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "libX11 not found" "$LINENO" 5
+ fi
+ 
+ 	CFLAGS="$evolution_save_cflags"
+@@ -25739,9 +19704,7 @@
+ if test "$no_x" = yes; then
+   # Not all programs may use this symbol, but it does not hurt to define it.
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define X_DISPLAY_MISSING 1
+-_ACEOF
++$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h
+ 
+   X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
+ else
+@@ -25754,16 +19717,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 . . . .
+-    { $as_echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5
+ $as_echo_n "checking whether -R must be followed by a space... " >&6; }
+     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.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -25774,40 +19733,13 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+        X_LIBS="$X_LIBS -R$x_libraries"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	LIBS="$ac_xsave_LIBS -R $x_libraries"
+-       cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  LIBS="$ac_xsave_LIBS -R $x_libraries"
++       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ int
+@@ -25818,46 +19750,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  { $as_echo "$as_me:$LINENO: result: yes" >&5
++if ac_fn_c_try_link "$LINENO"; then :
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	  X_LIBS="$X_LIBS -R $x_libraries"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	{ $as_echo "$as_me:$LINENO: result: neither works" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5
+ $as_echo "neither works" >&6; }
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+     ac_c_werror_flag=$ac_xsave_c_werror_flag
+     LIBS=$ac_xsave_LIBS
+   fi
+@@ -25873,11 +19778,7 @@
+     # libraries were built with DECnet support.  And Karl Berry says
+     # the Alpha needs dnet_stub (dnet does not exist).
+     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25895,44 +19796,17 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  :
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_link "$LINENO"; then :
+ 
+-	{ $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
++else
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
+-if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25950,59 +19824,30 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dnet_dnet_ntoa=no
++  ac_cv_lib_dnet_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
+ fi
+ 
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+-      { $as_echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5
+ $as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; }
+-if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
++if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ldnet_stub  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26020,52 +19865,25 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_dnet_stub_dnet_ntoa=no
++  ac_cv_lib_dnet_stub_dnet_ntoa=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+ $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
+-if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then
++if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
+ fi
+ 
+     fi
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+     LIBS="$ac_xsave_LIBS"
+ 
+     # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
+@@ -26076,105 +19894,20 @@
+     # 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.
+-    { $as_echo "$as_me:$LINENO: checking for gethostbyname" >&5
+-$as_echo_n "checking for gethostbyname... " >&6; }
+-if test "${ac_cv_func_gethostbyname+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define gethostbyname innocuous_gethostbyname
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char gethostbyname (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
++    ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
++if test "x$ac_cv_func_gethostbyname" = x""yes; then :
+ 
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef gethostbyname
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char gethostbyname ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_gethostbyname || defined __stub___gethostbyname
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return gethostbyname ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_gethostbyname=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_gethostbyname=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5
+-$as_echo "$ac_cv_func_gethostbyname" >&6; }
+-
+     if test $ac_cv_func_gethostbyname = no; then
+-      { $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26192,59 +19925,30 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_gethostbyname=no
++  ac_cv_lib_nsl_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
+ fi
+ 
+       if test $ac_cv_lib_nsl_gethostbyname = no; then
+-	{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5
+ $as_echo_n "checking for gethostbyname in -lbsd... " >&6; }
+-if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
++if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lbsd  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26262,43 +19966,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_bsd_gethostbyname=no
++  ac_cv_lib_bsd_gethostbyname=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5
+ $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then
++if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
+ fi
+ 
+@@ -26312,105 +19991,20 @@
+     # 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.
+-    { $as_echo "$as_me:$LINENO: checking for connect" >&5
+-$as_echo_n "checking for connect... " >&6; }
+-if test "${ac_cv_func_connect+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define connect to an innocuous variant, in case <limits.h> declares connect.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define connect innocuous_connect
++    ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect"
++if test "x$ac_cv_func_connect" = x""yes; then :
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char connect (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef connect
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char connect ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_connect || defined __stub___connect
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return connect ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_connect=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_connect=no
+-fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5
+-$as_echo "$ac_cv_func_connect" >&6; }
+ 
+     if test $ac_cv_func_connect = no; then
+-      { $as_echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5
+ $as_echo_n "checking for connect in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_connect+set}" = set; then
++if test "${ac_cv_lib_socket_connect+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26428,235 +20022,39 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_socket_connect=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_socket_connect=no
++  ac_cv_lib_socket_connect=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5
+ $as_echo "$ac_cv_lib_socket_connect" >&6; }
+-if test "x$ac_cv_lib_socket_connect" = x""yes; then
++if test "x$ac_cv_lib_socket_connect" = x""yes; then :
+   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
+ fi
+ 
+     fi
+ 
+     # Guillermo Gomez says -lposix is necessary on A/UX.
+-    { $as_echo "$as_me:$LINENO: checking for remove" >&5
+-$as_echo_n "checking for remove... " >&6; }
+-if test "${ac_cv_func_remove+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-/* Define remove to an innocuous variant, in case <limits.h> declares remove.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define remove innocuous_remove
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char remove (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef remove
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char remove ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_remove || defined __stub___remove
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return remove ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_remove=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++    ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove"
++if test "x$ac_cv_func_remove" = x""yes; then :
+ 
+-	ac_cv_func_remove=no
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5
+-$as_echo "$ac_cv_func_remove" >&6; }
+-
+     if test $ac_cv_func_remove = no; then
+-      { $as_echo "$as_me:$LINENO: checking for remove in -lposix" >&5
+-$as_echo_n "checking for remove in -lposix... " >&6; }
+-if test "${ac_cv_lib_posix_remove+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lposix  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char remove ();
+-int
+-main ()
+-{
+-return remove ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_lib_posix_remove=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_posix_remove=no
+-fi
+-
+-rm -rf conftest.dSYM
+-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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
+-$as_echo "$ac_cv_lib_posix_remove" >&6; }
+-if test "x$ac_cv_lib_posix_remove" = x""yes; then
+-  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+-fi
+-
+-    fi
+-
+-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+-    { $as_echo "$as_me:$LINENO: checking for shmat" >&5
+-$as_echo_n "checking for shmat... " >&6; }
+-if test "${ac_cv_func_shmat+set}" = set; then
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5
++$as_echo_n "checking for remove in -lposix... " >&6; }
++if test "${ac_cv_lib_posix_remove+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lposix  $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+-/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define shmat innocuous_shmat
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shmat (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef shmat
+ 
+ /* Override any GCC internal prototype to avoid an error.
+    Use char because int might match the return type of a GCC
+@@ -26664,71 +20062,47 @@
+ #ifdef __cplusplus
+ extern "C"
+ #endif
+-char shmat ();
+-/* The GNU C library defines this for functions which it implements
+-    to always fail with ENOSYS.  Some functions are actually named
+-    something starting with __ and the normal name is an alias.  */
+-#if defined __stub_shmat || defined __stub___shmat
+-choke me
+-#endif
+-
++char remove ();
+ int
+ main ()
+ {
+-return shmat ();
++return remove ();
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  ac_cv_func_shmat=yes
++if ac_fn_c_try_link "$LINENO"; then :
++  ac_cv_lib_posix_remove=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_shmat=no
++  ac_cv_lib_posix_remove=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5
++$as_echo "$ac_cv_lib_posix_remove" >&6; }
++if test "x$ac_cv_lib_posix_remove" = x""yes; then :
++  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
+ fi
+ 
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++    fi
++
++    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
++    ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat"
++if test "x$ac_cv_func_shmat" = x""yes; then :
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5
+-$as_echo "$ac_cv_func_shmat" >&6; }
+ 
+     if test $ac_cv_func_shmat = no; then
+-      { $as_echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5
+ $as_echo_n "checking for shmat in -lipc... " >&6; }
+-if test "${ac_cv_lib_ipc_shmat+set}" = set; then
++if test "${ac_cv_lib_ipc_shmat+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lipc  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26746,43 +20120,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ipc_shmat=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ipc_shmat=no
++  ac_cv_lib_ipc_shmat=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5
+ $as_echo "$ac_cv_lib_ipc_shmat" >&6; }
+-if test "x$ac_cv_lib_ipc_shmat" = x""yes; then
++if test "x$ac_cv_lib_ipc_shmat" = x""yes; then :
+   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
+ fi
+ 
+@@ -26798,18 +20147,14 @@
+   # 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
+-  { $as_echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5
+ $as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; }
+-if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
++if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26827,43 +20172,18 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ICE_IceConnectionNumber=no
++  ac_cv_lib_ICE_IceConnectionNumber=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+ $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
+-if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then
++if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then :
+   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
+ fi
+ 
+@@ -26876,18 +20196,14 @@
+ 	evolution_save_libs="$LIBS"
+ 	CFLAGS="$X_CFLAGS"
+ 	LIBS="$X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS"
+-	{ $as_echo "$as_me:$LINENO: checking for XFree in -lX11" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XFree in -lX11" >&5
+ $as_echo_n "checking for XFree in -lX11... " >&6; }
+-if test "${ac_cv_lib_X11_XFree+set}" = set; then
++if test "${ac_cv_lib_X11_XFree+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lX11  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26905,48 +20221,21 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+   ac_cv_lib_X11_XFree=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_X11_XFree=no
++  ac_cv_lib_X11_XFree=no
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XFree" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XFree" >&5
+ $as_echo "$ac_cv_lib_X11_XFree" >&6; }
+-if test "x$ac_cv_lib_X11_XFree" = x""yes; then
++if test "x$ac_cv_lib_X11_XFree" = x""yes; then :
+   :
+ else
+-  { { $as_echo "$as_me:$LINENO: error: libX11 not found" >&5
+-$as_echo "$as_me: error: libX11 not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "libX11 not found" "$LINENO" 5
+ fi
+ 
+ 	CFLAGS="$evolution_save_cflags"
+@@ -26957,7 +20246,7 @@
+ else
+ 	X_CFLAGS=$pkg_cv_X_CFLAGS
+ 	X_LIBS=$pkg_cv_X_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -26965,7 +20254,8 @@
+ 
+ evolution_save_cflags="$CFLAGS"
+ CFLAGS=`$PKG_CONFIG --cflags gtk+-2.0`
+-cat >conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h.  */
+ 
+ 	#include <gdkconfig.h>
+ 	int main(void){
+@@ -26975,32 +20265,11 @@
+ 	return 0;
+ 	}
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   GDK_BACKEND_X11=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	GDK_BACKEND_X11=no
++  GDK_BACKEND_X11=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ CFLAGS="$evolution_save_cflags"
+@@ -27008,7 +20277,7 @@
+ 
+ 
+ # Check whether --with-orbit-prefix was given.
+-if test "${with_orbit_prefix+set}" = set; then
++if test "${with_orbit_prefix+set}" = set; then :
+   withval=$with_orbit_prefix; orbit_config_prefix="$withval"
+ else
+   orbit_config_prefix=""
+@@ -27016,14 +20285,14 @@
+ 
+ 
+ # Check whether --with-orbit-exec-prefix was given.
+-if test "${with_orbit_exec_prefix+set}" = set; then
++if test "${with_orbit_exec_prefix+set}" = set; then :
+   withval=$with_orbit_exec_prefix; orbit_config_exec_prefix="$withval"
+ else
+   orbit_config_exec_prefix=""
+ fi
+ 
+ # Check whether --enable-orbittest was given.
+-if test "${enable_orbittest+set}" = set; then
++if test "${enable_orbittest+set}" = set; then :
+   enableval=$enable_orbittest;
+ else
+   enable_orbittest=yes
+@@ -27060,9 +20329,9 @@
+ 
+   # Extract the first word of "pkg-config", so it can be a program name with args.
+ set dummy pkg-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
++if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $PKG_CONFIG in
+@@ -27075,14 +20344,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+@@ -27091,19 +20360,19 @@
+ fi
+ PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+ if test -n "$PKG_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+ $as_echo "$PKG_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+   # Extract the first word of "orbit2-config", so it can be a program name with args.
+ set dummy orbit2-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then
++if test "${ac_cv_path_ORBIT_CONFIG+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ORBIT_CONFIG in
+@@ -27116,14 +20385,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ORBIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_ORBIT_CONFIG" && ac_cv_path_ORBIT_CONFIG="no"
+@@ -27132,16 +20401,16 @@
+ fi
+ ORBIT_CONFIG=$ac_cv_path_ORBIT_CONFIG
+ if test -n "$ORBIT_CONFIG"; then
+-  { $as_echo "$as_me:$LINENO: result: $ORBIT_CONFIG" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ORBIT_CONFIG" >&5
+ $as_echo "$ORBIT_CONFIG" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+   min_orbit_version=2.9.8
+-  { $as_echo "$as_me:$LINENO: checking for ORBit - version >= $min_orbit_version" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ORBit - version >= $min_orbit_version" >&5
+ $as_echo_n "checking for ORBit - version >= $min_orbit_version... " >&6; }
+   no_orbit=""
+   if test "$ORBIT_CONFIG" = "no" ; then
+@@ -27171,14 +20440,10 @@
+       CFLAGS="$CFLAGS $ORBIT_CFLAGS"
+       LIBS="$ORBIT_LIBS $LIBS"
+       rm -f conf.orbittest
+-      if test "$cross_compiling" = yes; then
++      if test "$cross_compiling" = yes; then :
+   echo $ac_n "cross compiling; assumed OK... $ac_c"
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <orbit/orbit.h>
+@@ -27256,52 +20521,25 @@
+ }
+ 
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+-  { (case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_try") 2>&5
+-  ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  :
+-else
+-  $as_echo "$as_me: program exited with status $ac_status" >&5
+-$as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++if ac_fn_c_try_run "$LINENO"; then :
+ 
+-( exit $ac_status )
+-no_orbit=yes
++else
++  no_orbit=yes
+ fi
+-rm -rf conftest.dSYM
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++  conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ 
+-
+        CFLAGS="$ac_save_CFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+   fi
+   if test "x$no_orbit" = x ; then
+-     { $as_echo "$as_me:$LINENO: result: yes" >&5
++     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+      :
+   else
+-     { $as_echo "$as_me:$LINENO: result: no" >&5
++     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+      if test "$ORBIT_CONFIG" = "no" ; then
+        echo "*** The orbit2-config script installed by ORBIT could not be found"
+@@ -27315,11 +20553,7 @@
+           echo "*** Could not run ORBIT test program, checking why..."
+           CFLAGS="$CFLAGS $ORBIT_CFLAGS"
+           LIBS="$LIBS $ORBIT_LIBS"
+-          cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ #include <orbit/orbit.h>
+@@ -27333,27 +20567,7 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_link") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
++if ac_fn_c_try_link "$LINENO"; then :
+    echo "*** The test program compiled, but did not run. This usually means"
+           echo "*** that the run-time linker is not finding ORBit or finding the wrong"
+           echo "*** version of ORBit. If it is not finding ORBit, you'll need to set your"
+@@ -27369,18 +20583,13 @@
+           echo "***"
+           echo "***    rpm --erase --nodeps orbit orbit-devel"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	 echo "*** The test program failed to compile or link. See the file config.log for the"
++   echo "*** The test program failed to compile or link. See the file config.log for the"
+           echo "*** exact error that occured. This usually means ORBIT was incorrectly installed"
+           echo "*** or that you have moved ORBit since it was installed. In the latter case, you"
+           echo "*** may want to edit the orbit2-config script: $ORBIT_CONFIG"
+ fi
+-
+-rm -rf conftest.dSYM
+-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+-      conftest$ac_exeext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
+           CFLAGS="$ac_save_CFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi
+@@ -27392,9 +20601,9 @@
+ 
+   # Extract the first word of "orbit-idl-2", so it can be a program name with args.
+ set dummy orbit-idl-2; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_ORBIT_IDL+set}" = set; then
++if test "${ac_cv_path_ORBIT_IDL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $ORBIT_IDL in
+@@ -27407,14 +20616,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_ORBIT_IDL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_ORBIT_IDL" && ac_cv_path_ORBIT_IDL=":"
+@@ -27423,10 +20632,10 @@
+ fi
+ ORBIT_IDL=$ac_cv_path_ORBIT_IDL
+ if test -n "$ORBIT_IDL"; then
+-  { $as_echo "$as_me:$LINENO: result: $ORBIT_IDL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ORBIT_IDL" >&5
+ $as_echo "$ORBIT_IDL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -27437,10 +20646,10 @@
+   rm -f conf.orbittest
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for CORBA include paths" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CORBA include paths" >&5
+ $as_echo_n "checking for CORBA include paths... " >&6; }
+ IDL_INCLUDES="-I "`${PKG_CONFIG} --variable=idldir libbonobo-2.0`" -I "`${PKG_CONFIG} --variable=idldir bonobo-activation-2.0`" -I "`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2`
+-{ $as_echo "$as_me:$LINENO: result: $IDL_INCLUDES" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $IDL_INCLUDES" >&5
+ $as_echo "$IDL_INCLUDES" >&6; }
+ 
+ 
+@@ -27455,18 +20664,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for HAL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HAL" >&5
+ $as_echo_n "checking for HAL... " >&6; }
+ 
+ if test -n "$HAL_CFLAGS"; then
+     pkg_cv_HAL_CFLAGS="$HAL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.4\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.4\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "hal >= 0.5.4") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_HAL_CFLAGS=`$PKG_CONFIG --cflags "hal >= 0.5.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27478,11 +20687,11 @@
+     pkg_cv_HAL_LIBS="$HAL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.4\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hal >= 0.5.4\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "hal >= 0.5.4") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_HAL_LIBS=`$PKG_CONFIG --libs "hal >= 0.5.4" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27508,7 +20717,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$HAL_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+                 HAVE_HAL="no"
+ elif test $pkg_failed = untried; then
+@@ -27516,15 +20725,13 @@
+ else
+ 	HAL_CFLAGS=$pkg_cv_HAL_CFLAGS
+ 	HAL_LIBS=$pkg_cv_HAL_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	HAVE_HAL="yes"
+ fi
+ if test "x$HAVE_HAL" = "xyes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_HAL 1
+-_ACEOF
++$as_echo "#define HAVE_HAL 1" >>confdefs.h
+ 
+ 	HAL_REQUIREMENT="hal"
+ 	IPOD_SYNC="ipod-sync"
+@@ -27533,13 +20740,9 @@
+ 	IPOD_SYNC=""
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for yTNEF" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for yTNEF" >&5
+ $as_echo_n "checking for yTNEF... " >&6; }
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		#include <stdio.h>
+@@ -27554,44 +20757,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   tnef_ok=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	tnef_ok=no
++  tnef_ok=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ if test "$tnef_ok" = "yes"; then
+-	{ $as_echo "$as_me:$LINENO: result: yes" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	TNEF_ATTACHMENTS="tnef-attachments"
+ 	TNEF_CFLAGS="-DHAVE_YTNEF_H"
+ else
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+ 		#include <stdio.h>
+@@ -27606,40 +20784,19 @@
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+-$as_echo "$ac_try_echo") >&5
+-  (eval "$ac_compile") 2>conftest.er1
+-  ac_status=$?
+-  grep -v '^ *+' conftest.er1 >conftest.err
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && {
+-	 test -z "$ac_c_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
++if ac_fn_c_try_compile "$LINENO"; then :
+   tnef_ok=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	tnef_ok=no
++  tnef_ok=no
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 	if test "$tnef_ok" = "yes"; then
+-		{ $as_echo "$as_me:$LINENO: result: yes" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 		TNEF_ATTACHMENTS="tnef-attachments"
+ 		TNEF_CFLAGS="-DHAVE_LIBYTNEF_YTNEF_H"
+ 	else
+-		{ $as_echo "$as_me:$LINENO: result: no" >&5
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 		TNEF_ATTACHMENTS=""
+ 		TNEF_CFLAGS=""
+@@ -27648,31 +20805,31 @@
+ 
+ 
+ # Check whether --enable-dbus was given.
+-if test "${enable_dbus+set}" = set; then
++if test "${enable_dbus+set}" = set; then :
+   enableval=$enable_dbus; enable_dbus=$enableval
+ else
+   enable_dbus=yes
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking if dbus support is enabled" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if dbus support is enabled" >&5
+ $as_echo_n "checking if dbus support is enabled... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $enable_dbus" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_dbus" >&5
+ $as_echo "$enable_dbus" >&6; }
+ if test "$enable_dbus" = "yes"; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for DBUS_GLIB" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS_GLIB" >&5
+ $as_echo_n "checking for DBUS_GLIB... " >&6; }
+ 
+ if test -n "$DBUS_GLIB_CFLAGS"; then
+     pkg_cv_DBUS_GLIB_CFLAGS="$DBUS_GLIB_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_DBUS_GLIB_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.74" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27684,11 +20841,11 @@
+     pkg_cv_DBUS_GLIB_LIBS="$DBUS_GLIB_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-glib-1 >= 0.74\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "dbus-glib-1 >= 0.74") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_DBUS_GLIB_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.74" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27714,46 +20871,33 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$DBUS_GLIB_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { { $as_echo "$as_me:$LINENO: error: DBUS respectively dbus-glib not found! (or version < 0.74)!
++                as_fn_error "DBUS respectively dbus-glib not found! (or version < 0.74)!
+ 	If you want to disable DBUS, please append --disable-dbus to configure!
+-	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" >&5
+-$as_echo "$as_me: error: DBUS respectively dbus-glib not found! (or version < 0.74)!
+-	If you want to disable DBUS, please append --disable-dbus to configure!
+-	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" >&2;}
+-   { (exit 1); exit 1; }; }
++	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: DBUS respectively dbus-glib not found! (or version < 0.74)!
+-	If you want to disable DBUS, please append --disable-dbus to configure!
+-	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" >&5
+-$as_echo "$as_me: error: DBUS respectively dbus-glib not found! (or version < 0.74)!
++	as_fn_error "DBUS respectively dbus-glib not found! (or version < 0.74)!
+ 	If you want to disable DBUS, please append --disable-dbus to configure!
+-	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" >&2;}
+-   { (exit 1); exit 1; }; }
++	DBUS is required for NetworkManager - NetworkManager support will then be disabled, too!" "$LINENO" 5
+ else
+ 	DBUS_GLIB_CFLAGS=$pkg_cv_DBUS_GLIB_CFLAGS
+ 	DBUS_GLIB_LIBS=$pkg_cv_DBUS_GLIB_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	DBUS_SUPPORT="yes"
+ fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DBUS_SUPPORT 1
+-_ACEOF
++$as_echo "#define DBUS_SUPPORT 1" >>confdefs.h
+ 
+ 
+ 
+ 
+ elif test "$enable_dbus" = "no" -a "$enable_nm" = "yes"; then
+-	{ { $as_echo "$as_me:$LINENO: error: DBUS disabled and NetworkManager enabled - this won't work!
+-	Disable NetworkManager (append --disable-nm to configure)!" >&5
+-$as_echo "$as_me: error: DBUS disabled and NetworkManager enabled - this won't work!
+-	Disable NetworkManager (append --disable-nm to configure)!" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "DBUS disabled and NetworkManager enabled - this won't work!
++	Disable NetworkManager (append --disable-nm to configure)!" "$LINENO" 5
+ else
+-	{ $as_echo "$as_me:$LINENO: WARNING: DBUS support disabled!" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: DBUS support disabled!" >&5
+ $as_echo "$as_me: WARNING: DBUS support disabled!" >&2;}
+ 	DBUS_SUPPORT="no"
+ fi
+@@ -27767,31 +20911,31 @@
+ 
+ 
+ # Check whether --enable-nm was given.
+-if test "${enable_nm+set}" = set; then
++if test "${enable_nm+set}" = set; then :
+   enableval=$enable_nm; enable_nm=$enableval
+ else
+   enable_nm=yes
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking if NetworkManager support is enabled" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if NetworkManager support is enabled" >&5
+ $as_echo_n "checking if NetworkManager support is enabled... " >&6; }
+-{ $as_echo "$as_me:$LINENO: result: $enable_nm" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_nm" >&5
+ $as_echo "$enable_nm" >&6; }
+ if test "$enable_nm" = yes; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for NM" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NM" >&5
+ $as_echo_n "checking for NM... " >&6; }
+ 
+ if test -n "$NM_CFLAGS"; then
+     pkg_cv_NM_CFLAGS="$NM_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_NM_CFLAGS=`$PKG_CONFIG --cflags "NetworkManager >= 0.7" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27803,11 +20947,11 @@
+     pkg_cv_NM_LIBS="$NM_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"NetworkManager >= 0.7\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "NetworkManager >= 0.7") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_NM_LIBS=`$PKG_CONFIG --libs "NetworkManager >= 0.7" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27833,30 +20977,22 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$NM_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                { { $as_echo "$as_me:$LINENO: error: NetworkManager not found (or version < 0.7)!
+-	If you want to disable NetworkManager, please append --disable-nm to configure!" >&5
+-$as_echo "$as_me: error: NetworkManager not found (or version < 0.7)!
+-	If you want to disable NetworkManager, please append --disable-nm to configure!" >&2;}
+-   { (exit 1); exit 1; }; }
++                as_fn_error "NetworkManager not found (or version < 0.7)!
++	If you want to disable NetworkManager, please append --disable-nm to configure!" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: NetworkManager not found (or version < 0.7)!
+-	If you want to disable NetworkManager, please append --disable-nm to configure!" >&5
+-$as_echo "$as_me: error: NetworkManager not found (or version < 0.7)!
+-	If you want to disable NetworkManager, please append --disable-nm to configure!" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "NetworkManager not found (or version < 0.7)!
++	If you want to disable NetworkManager, please append --disable-nm to configure!" "$LINENO" 5
+ else
+ 	NM_CFLAGS=$pkg_cv_NM_CFLAGS
+ 	NM_LIBS=$pkg_cv_NM_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	NM_SUPPORT="yes"
+ fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define NM_SUPPORT 1
+-_ACEOF
++$as_echo "#define NM_SUPPORT 1" >>confdefs.h
+ 
+ 
+ 
+@@ -27877,18 +21013,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CAMEL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAMEL" >&5
+ $as_echo_n "checking for CAMEL... " >&6; }
+ 
+ if test -n "$CAMEL_CFLAGS"; then
+     pkg_cv_CAMEL_CFLAGS="$CAMEL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_CFLAGS=`$PKG_CONFIG --cflags "camel-provider-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27900,11 +21036,11 @@
+     pkg_cv_CAMEL_LIBS="$CAMEL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_LIBS=`$PKG_CONFIG --libs "camel-provider-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -27930,18 +21066,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CAMEL_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (camel-provider-$EDS_PACKAGE) were not met:
+-
+-$CAMEL_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CAMEL_CFLAGS
+-and CAMEL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (camel-provider-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (camel-provider-$EDS_PACKAGE) were not met:
+ 
+ $CAMEL_PKG_ERRORS
+ 
+@@ -27951,22 +21076,11 @@
+ Alternatively, you may set the environment variables CAMEL_CFLAGS
+ and CAMEL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables CAMEL_CFLAGS
+-and CAMEL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -27975,12 +21089,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	CAMEL_CFLAGS=$pkg_cv_CAMEL_CFLAGS
+ 	CAMEL_LIBS=$pkg_cv_CAMEL_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -27993,18 +21106,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CAMEL_GROUPWISE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAMEL_GROUPWISE" >&5
+ $as_echo_n "checking for CAMEL_GROUPWISE... " >&6; }
+ 
+ if test -n "$CAMEL_GROUPWISE_CFLAGS"; then
+     pkg_cv_CAMEL_GROUPWISE_CFLAGS="$CAMEL_GROUPWISE_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE libegroupwise-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE libegroupwise-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_GROUPWISE_CFLAGS=`$PKG_CONFIG --cflags "camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28016,11 +21129,11 @@
+     pkg_cv_CAMEL_GROUPWISE_LIBS="$CAMEL_GROUPWISE_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE libegroupwise-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE libegroupwise-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_GROUPWISE_LIBS=`$PKG_CONFIG --libs "camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28046,18 +21159,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CAMEL_GROUPWISE_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE) were not met:
+-
+-$CAMEL_GROUPWISE_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CAMEL_GROUPWISE_CFLAGS
+-and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE) were not met:
+ 
+ $CAMEL_GROUPWISE_PKG_ERRORS
+ 
+@@ -28067,22 +21169,11 @@
+ Alternatively, you may set the environment variables CAMEL_GROUPWISE_CFLAGS
+ and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables CAMEL_GROUPWISE_CFLAGS
+-and CAMEL_GROUPWISE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28091,12 +21182,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	CAMEL_GROUPWISE_CFLAGS=$pkg_cv_CAMEL_GROUPWISE_CFLAGS
+ 	CAMEL_GROUPWISE_LIBS=$pkg_cv_CAMEL_GROUPWISE_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28110,18 +21200,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for MOZILLA_NSS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MOZILLA_NSS" >&5
+ $as_echo_n "checking for MOZILLA_NSS... " >&6; }
+ 
+ if test -n "$MOZILLA_NSS_CFLAGS"; then
+     pkg_cv_MOZILLA_NSS_CFLAGS="$MOZILLA_NSS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozilla_nss\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$mozilla_nss\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "$mozilla_nss") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_MOZILLA_NSS_CFLAGS=`$PKG_CONFIG --cflags "$mozilla_nss" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28133,11 +21223,11 @@
+     pkg_cv_MOZILLA_NSS_LIBS="$MOZILLA_NSS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$mozilla_nss\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$mozilla_nss\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "$mozilla_nss") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_MOZILLA_NSS_LIBS=`$PKG_CONFIG --libs "$mozilla_nss" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28163,18 +21253,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$MOZILLA_NSS_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($mozilla_nss) were not met:
+-
+-$MOZILLA_NSS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables MOZILLA_NSS_CFLAGS
+-and MOZILLA_NSS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($mozilla_nss) were not met:
++	as_fn_error "Package requirements ($mozilla_nss) were not met:
+ 
+ $MOZILLA_NSS_PKG_ERRORS
+ 
+@@ -28184,22 +21263,11 @@
+ Alternatively, you may set the environment variables MOZILLA_NSS_CFLAGS
+ and MOZILLA_NSS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables MOZILLA_NSS_CFLAGS
+-and MOZILLA_NSS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28208,12 +21276,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	MOZILLA_NSS_CFLAGS=$pkg_cv_MOZILLA_NSS_CFLAGS
+ 	MOZILLA_NSS_LIBS=$pkg_cv_MOZILLA_NSS_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28230,18 +21297,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CERT_UI" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CERT_UI" >&5
+ $as_echo_n "checking for CERT_UI... " >&6; }
+ 
+ if test -n "$CERT_UI_CFLAGS"; then
+     pkg_cv_CERT_UI_CFLAGS="$CERT_UI_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE libglade-2.0 gthread-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE libglade-2.0 gthread-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CERT_UI_CFLAGS=`$PKG_CONFIG --cflags "libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28253,11 +21320,11 @@
+     pkg_cv_CERT_UI_LIBS="$CERT_UI_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE libglade-2.0 gthread-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE libglade-2.0 gthread-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CERT_UI_LIBS=`$PKG_CONFIG --libs "libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28283,43 +21350,21 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CERT_UI_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0) were not met:
+-
+-$CERT_UI_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CERT_UI_CFLAGS
+-and CERT_UI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0) were not met:
++	as_fn_error "Package requirements (libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0) were not met:
+ 
+ $CERT_UI_PKG_ERRORS
+ 
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CERT_UI_CFLAGS
+-and CERT_UI_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
+-elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
+ 
+ Alternatively, you may set the environment variables CERT_UI_CFLAGS
+ and CERT_UI_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++" "$LINENO" 5
++elif test $pkg_failed = untried; then
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28328,12 +21373,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	CERT_UI_CFLAGS=$pkg_cv_CERT_UI_CFLAGS
+ 	CERT_UI_LIBS=$pkg_cv_CERT_UI_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28346,18 +21390,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for E_NAME" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_NAME" >&5
+ $as_echo_n "checking for E_NAME... " >&6; }
+ 
+ if test -n "$E_NAME_CFLAGS"; then
+     pkg_cv_E_NAME_CFLAGS="$E_NAME_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_NAME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libbonoboui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28369,11 +21413,11 @@
+     pkg_cv_E_NAME_LIBS="$E_NAME_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_NAME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libbonoboui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28399,18 +21443,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$E_NAME_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
+-
+-$E_NAME_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables E_NAME_CFLAGS
+-and E_NAME_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
++	as_fn_error "Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
+ 
+ $E_NAME_PKG_ERRORS
+ 
+@@ -28420,22 +21453,11 @@
+ Alternatively, you may set the environment variables E_NAME_CFLAGS
+ and E_NAME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables E_NAME_CFLAGS
+-and E_NAME_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28444,12 +21466,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	E_NAME_CFLAGS=$pkg_cv_E_NAME_CFLAGS
+ 	E_NAME_LIBS=$pkg_cv_E_NAME_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28469,18 +21490,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for E_UTIL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_UTIL" >&5
+ $as_echo_n "checking for E_UTIL... " >&6; }
+ 
+ if test -n "$E_UTIL_CFLAGS"; then
+     pkg_cv_E_UTIL_CFLAGS="$E_UTIL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE camel-\$EDS_PACKAGE \$mozilla_nspr\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE camel-\$EDS_PACKAGE \$mozilla_nspr\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_UTIL_CFLAGS=`$PKG_CONFIG --cflags "libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28492,11 +21513,11 @@
+     pkg_cv_E_UTIL_LIBS="$E_UTIL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE camel-\$EDS_PACKAGE \$mozilla_nspr\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE camel-\$EDS_PACKAGE \$mozilla_nspr\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_UTIL_LIBS=`$PKG_CONFIG --libs "libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28522,18 +21543,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$E_UTIL_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr) were not met:
+-
+-$E_UTIL_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables E_UTIL_CFLAGS
+-and E_UTIL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr) were not met:
++	as_fn_error "Package requirements (libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-desktop-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE $mozilla_nspr) were not met:
+ 
+ $E_UTIL_PKG_ERRORS
+ 
+@@ -28543,12 +21553,11 @@
+ Alternatively, you may set the environment variables E_UTIL_CFLAGS
+ and E_UTIL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28557,22 +21566,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables E_UTIL_CFLAGS
+-and E_UTIL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	E_UTIL_CFLAGS=$pkg_cv_E_UTIL_CFLAGS
+ 	E_UTIL_LIBS=$pkg_cv_E_UTIL_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28585,18 +21583,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for TZDIALOG" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TZDIALOG" >&5
+ $as_echo_n "checking for TZDIALOG... " >&6; }
+ 
+ if test -n "$TZDIALOG_CFLAGS"; then
+     pkg_cv_TZDIALOG_CFLAGS="$TZDIALOG_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_TZDIALOG_CFLAGS=`$PKG_CONFIG --cflags "libecal-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28608,11 +21606,11 @@
+     pkg_cv_TZDIALOG_LIBS="$TZDIALOG_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libecal-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libecal-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_TZDIALOG_LIBS=`$PKG_CONFIG --libs "libecal-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28638,18 +21636,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$TZDIALOG_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libecal-$EDS_PACKAGE) were not met:
+-
+-$TZDIALOG_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables TZDIALOG_CFLAGS
+-and TZDIALOG_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libecal-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libecal-$EDS_PACKAGE) were not met:
+ 
+ $TZDIALOG_PKG_ERRORS
+ 
+@@ -28659,22 +21646,11 @@
+ Alternatively, you may set the environment variables TZDIALOG_CFLAGS
+ and TZDIALOG_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables TZDIALOG_CFLAGS
+-and TZDIALOG_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28683,12 +21659,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	TZDIALOG_CFLAGS=$pkg_cv_TZDIALOG_CFLAGS
+ 	TZDIALOG_LIBS=$pkg_cv_TZDIALOG_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28701,18 +21676,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for E_WIDGETS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for E_WIDGETS" >&5
+ $as_echo_n "checking for E_WIDGETS... " >&6; }
+ 
+ if test -n "$E_WIDGETS_CFLAGS"; then
+     pkg_cv_E_WIDGETS_CFLAGS="$E_WIDGETS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_WIDGETS_CFLAGS=`$PKG_CONFIG --cflags "libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28724,11 +21699,11 @@
+     pkg_cv_E_WIDGETS_LIBS="$E_WIDGETS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-\$EDS_PACKAGE libedataserver-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_E_WIDGETS_LIBS=`$PKG_CONFIG --libs "libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28754,18 +21729,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$E_WIDGETS_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE) were not met:
+-
+-$E_WIDGETS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables E_WIDGETS_CFLAGS
+-and E_WIDGETS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libbonoboui-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE) were not met:
+ 
+ $E_WIDGETS_PKG_ERRORS
+ 
+@@ -28775,22 +21739,11 @@
+ Alternatively, you may set the environment variables E_WIDGETS_CFLAGS
+ and E_WIDGETS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables E_WIDGETS_CFLAGS
+-and E_WIDGETS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28799,12 +21752,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	E_WIDGETS_CFLAGS=$pkg_cv_E_WIDGETS_CFLAGS
+ 	E_WIDGETS_LIBS=$pkg_cv_E_WIDGETS_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28817,18 +21769,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for IMPORTERS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for IMPORTERS" >&5
+ $as_echo_n "checking for IMPORTERS... " >&6; }
+ 
+ if test -n "$IMPORTERS_CFLAGS"; then
+     pkg_cv_IMPORTERS_CFLAGS="$IMPORTERS_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE camel-provider-\$EDS_PACKAGE camel-\$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE camel-provider-\$EDS_PACKAGE camel-\$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_IMPORTERS_CFLAGS=`$PKG_CONFIG --cflags "libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28840,11 +21792,11 @@
+     pkg_cv_IMPORTERS_LIBS="$IMPORTERS_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE camel-provider-\$EDS_PACKAGE camel-\$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libedataserverui-\$EDS_PACKAGE camel-provider-\$EDS_PACKAGE camel-\$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_IMPORTERS_LIBS=`$PKG_CONFIG --libs "libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28870,18 +21822,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$IMPORTERS_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) were not met:
+-
+-$IMPORTERS_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables IMPORTERS_CFLAGS
+-and IMPORTERS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) were not met:
+ 
+ $IMPORTERS_PKG_ERRORS
+ 
+@@ -28891,22 +21832,11 @@
+ Alternatively, you may set the environment variables IMPORTERS_CFLAGS
+ and IMPORTERS_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables IMPORTERS_CFLAGS
+-and IMPORTERS_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -28915,12 +21845,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	IMPORTERS_CFLAGS=$pkg_cv_IMPORTERS_CFLAGS
+ 	IMPORTERS_LIBS=$pkg_cv_IMPORTERS_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -28933,18 +21862,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBFILTER" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFILTER" >&5
+ $as_echo_n "checking for LIBFILTER... " >&6; }
+ 
+ if test -n "$LIBFILTER_CFLAGS"; then
+     pkg_cv_LIBFILTER_CFLAGS="$LIBFILTER_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libglade-2.0 libedataserver-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libglade-2.0 libedataserver-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBFILTER_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28956,11 +21885,11 @@
+     pkg_cv_LIBFILTER_LIBS="$LIBFILTER_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libglade-2.0 libedataserver-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libglade-2.0 libedataserver-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBFILTER_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -28986,18 +21915,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBFILTER_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) were not met:
+-
+-$LIBFILTER_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBFILTER_CFLAGS
+-and LIBFILTER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) were not met:
+ 
+ $LIBFILTER_PKG_ERRORS
+ 
+@@ -29007,22 +21925,11 @@
+ Alternatively, you may set the environment variables LIBFILTER_CFLAGS
+ and LIBFILTER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables LIBFILTER_CFLAGS
+-and LIBFILTER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29031,12 +21938,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	LIBFILTER_CFLAGS=$pkg_cv_LIBFILTER_CFLAGS
+ 	LIBFILTER_LIBS=$pkg_cv_LIBFILTER_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29049,19 +21955,19 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for SHELL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SHELL" >&5
+ $as_echo_n "checking for SHELL... " >&6; }
+ 
+ if test -n "$SHELL_CFLAGS"; then
+     pkg_cv_SHELL_CFLAGS="$SHELL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SHELL_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>/dev/null`
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_SHELL_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -29072,12 +21978,12 @@
+     pkg_cv_SHELL_LIBS="$SHELL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
+-  pkg_cv_SHELL_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>/dev/null`
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
++  pkg_cv_SHELL_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -29095,25 +22001,14 @@
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>&1`
++	        SHELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>&1`
+         else
+-	        SHELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>&1`
++	        SHELL_PKG_ERRORS=`$PKG_CONFIG --print-errors "libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$SHELL_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE) were not met:
+-
+-$SHELL_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables SHELL_CFLAGS
+-and SHELL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE) were not met:
++	as_fn_error "Package requirements (libgnomeui-2.0 libbonoboui-2.0 lpint-bonobo libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE) were not met:
+ 
+ $SHELL_PKG_ERRORS
+ 
+@@ -29123,22 +22018,11 @@
+ Alternatively, you may set the environment variables SHELL_CFLAGS
+ and SHELL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables SHELL_CFLAGS
+-and SHELL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29147,12 +22031,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	SHELL_CFLAGS=$pkg_cv_SHELL_CFLAGS
+ 	SHELL_LIBS=$pkg_cv_SHELL_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29169,18 +22052,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_ADDRESSBOOK" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_ADDRESSBOOK" >&5
+ $as_echo_n "checking for EVOLUTION_ADDRESSBOOK... " >&6; }
+ 
+ if test -n "$EVOLUTION_ADDRESSBOOK_CFLAGS"; then
+     pkg_cv_EVOLUTION_ADDRESSBOOK_CFLAGS="$EVOLUTION_ADDRESSBOOK_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$EVOLUTION_ADDRESSBOOK_DEPS\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$EVOLUTION_ADDRESSBOOK_DEPS\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "$EVOLUTION_ADDRESSBOOK_DEPS") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_ADDRESSBOOK_CFLAGS=`$PKG_CONFIG --cflags "$EVOLUTION_ADDRESSBOOK_DEPS" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29192,11 +22075,11 @@
+     pkg_cv_EVOLUTION_ADDRESSBOOK_LIBS="$EVOLUTION_ADDRESSBOOK_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$EVOLUTION_ADDRESSBOOK_DEPS\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$EVOLUTION_ADDRESSBOOK_DEPS\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "$EVOLUTION_ADDRESSBOOK_DEPS") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_ADDRESSBOOK_LIBS=`$PKG_CONFIG --libs "$EVOLUTION_ADDRESSBOOK_DEPS" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29222,18 +22105,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_ADDRESSBOOK_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements ($EVOLUTION_ADDRESSBOOK_DEPS) were not met:
+-
+-$EVOLUTION_ADDRESSBOOK_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CFLAGS
+-and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements ($EVOLUTION_ADDRESSBOOK_DEPS) were not met:
++	as_fn_error "Package requirements ($EVOLUTION_ADDRESSBOOK_DEPS) were not met:
+ 
+ $EVOLUTION_ADDRESSBOOK_PKG_ERRORS
+ 
+@@ -29243,22 +22115,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CFLAGS
+ and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CFLAGS
+-and EVOLUTION_ADDRESSBOOK_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29267,12 +22128,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_ADDRESSBOOK_CFLAGS=$pkg_cv_EVOLUTION_ADDRESSBOOK_CFLAGS
+ 	EVOLUTION_ADDRESSBOOK_LIBS=$pkg_cv_EVOLUTION_ADDRESSBOOK_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29286,18 +22146,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_ADDRESSBOOK_CONDUIT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_ADDRESSBOOK_CONDUIT" >&5
+ $as_echo_n "checking for EVOLUTION_ADDRESSBOOK_CONDUIT... " >&6; }
+ 
+ if test -n "$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS"; then
+     pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS="$EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 \$EVOLUTION_ADDRESSBOOK_DEPS\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 \$EVOLUTION_ADDRESSBOOK_DEPS\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29309,11 +22169,11 @@
+     pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS="$EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 \$EVOLUTION_ADDRESSBOOK_DEPS\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0 \$EVOLUTION_ADDRESSBOOK_DEPS\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS=`$PKG_CONFIG --libs "gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29339,18 +22199,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_ADDRESSBOOK_CONDUIT_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS) were not met:
+-
+-$EVOLUTION_ADDRESSBOOK_CONDUIT_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
+-and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS) were not met:
++	as_fn_error "Package requirements (gnome-pilot-2.0 $EVOLUTION_ADDRESSBOOK_DEPS) were not met:
+ 
+ $EVOLUTION_ADDRESSBOOK_CONDUIT_PKG_ERRORS
+ 
+@@ -29360,22 +22209,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
+ and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
+-and EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29384,12 +22222,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS=$pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_CFLAGS
+ 	EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS=$pkg_cv_EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29404,18 +22241,18 @@
+ LIBNOTIFY_LIBS=
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBNOTIFY" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBNOTIFY" >&5
+ $as_echo_n "checking for LIBNOTIFY... " >&6; }
+ 
+ if test -n "$LIBNOTIFY_CFLAGS"; then
+     pkg_cv_LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29427,11 +22264,11 @@
+     pkg_cv_LIBNOTIFY_LIBS="$LIBNOTIFY_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.3.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libnotify >= 0.3.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29457,7 +22294,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+                 HAVE_LIBNOTIFY="no"
+ elif test $pkg_failed = untried; then
+@@ -29465,15 +22302,13 @@
+ else
+ 	LIBNOTIFY_CFLAGS=$pkg_cv_LIBNOTIFY_CFLAGS
+ 	LIBNOTIFY_LIBS=$pkg_cv_LIBNOTIFY_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	HAVE_LIBNOTIFY="yes"
+ fi
+ if test "x$HAVE_LIBNOTIFY" = "xyes"; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBNOTIFY 1
+-_ACEOF
++$as_echo "#define HAVE_LIBNOTIFY 1" >>confdefs.h
+ 
+ 	libnotify="libnotify"
+ else
+@@ -29485,18 +22320,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBSOUP" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSOUP" >&5
+ $as_echo_n "checking for LIBSOUP... " >&6; }
+ 
+ if test -n "$LIBSOUP_CFLAGS"; then
+     pkg_cv_LIBSOUP_CFLAGS="$LIBSOUP_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBSOUP_CFLAGS=`$PKG_CONFIG --cflags "libsoup-2.4 >= 2.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29508,11 +22343,11 @@
+     pkg_cv_LIBSOUP_LIBS="$LIBSOUP_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsoup-2.4 >= 2.3.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libsoup-2.4 >= 2.3.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBSOUP_LIBS=`$PKG_CONFIG --libs "libsoup-2.4 >= 2.3.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29538,7 +22373,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBSOUP_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libsoup-2.4 >= 2.3.0) were not met:
++	as_fn_error "Package requirements (libsoup-2.4 >= 2.3.0) were not met:
+ 
+ $LIBSOUP_PKG_ERRORS
+ 
+@@ -29548,33 +22383,11 @@
+ Alternatively, you may set the environment variables LIBSOUP_CFLAGS
+ and LIBSOUP_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libsoup-2.4 >= 2.3.0) were not met:
+-
+-$LIBSOUP_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBSOUP_CFLAGS
+-and LIBSOUP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables LIBSOUP_CFLAGS
+-and LIBSOUP_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29583,12 +22396,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	LIBSOUP_CFLAGS=$pkg_cv_LIBSOUP_CFLAGS
+ 	LIBSOUP_LIBS=$pkg_cv_LIBSOUP_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29601,18 +22413,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_CALENDAR" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_CALENDAR" >&5
+ $as_echo_n "checking for EVOLUTION_CALENDAR... " >&6; }
+ 
+ if test -n "$EVOLUTION_CALENDAR_CFLAGS"; then
+     pkg_cv_EVOLUTION_CALENDAR_CFLAGS="$EVOLUTION_CALENDAR_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE libebook-\$EDS_PACKAGE libecal-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libebackend-\$EDS_PACKAGE \$HAL_REQUIREMENT \$libnotify gtkhtml-editor libgdata-\$EDS_PACKAGE libgdata-google-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE libebook-\$EDS_PACKAGE libecal-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libebackend-\$EDS_PACKAGE \$HAL_REQUIREMENT \$libnotify gtkhtml-editor libgdata-\$EDS_PACKAGE libgdata-google-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_CALENDAR_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29624,11 +22436,11 @@
+     pkg_cv_EVOLUTION_CALENDAR_LIBS="$EVOLUTION_CALENDAR_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE libebook-\$EDS_PACKAGE libecal-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libebackend-\$EDS_PACKAGE \$HAL_REQUIREMENT \$libnotify gtkhtml-editor libgdata-\$EDS_PACKAGE libgdata-google-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE libebook-\$EDS_PACKAGE libecal-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libebackend-\$EDS_PACKAGE \$HAL_REQUIREMENT \$libnotify gtkhtml-editor libgdata-\$EDS_PACKAGE libgdata-google-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_CALENDAR_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29654,18 +22466,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_CALENDAR_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE) were not met:
+-
+-$EVOLUTION_CALENDAR_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CFLAGS
+-and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libebackend-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify gtkhtml-editor libgdata-$EDS_PACKAGE libgdata-google-$EDS_PACKAGE) were not met:
+ 
+ $EVOLUTION_CALENDAR_PKG_ERRORS
+ 
+@@ -29675,22 +22476,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CFLAGS
+ and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CFLAGS
+-and EVOLUTION_CALENDAR_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29699,12 +22489,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_CALENDAR_CFLAGS=$pkg_cv_EVOLUTION_CALENDAR_CFLAGS
+ 	EVOLUTION_CALENDAR_LIBS=$pkg_cv_EVOLUTION_CALENDAR_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29718,18 +22507,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_CALENDAR_CONDUIT" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_CALENDAR_CONDUIT" >&5
+ $as_echo_n "checking for EVOLUTION_CALENDAR_CONDUIT... " >&6; }
+ 
+ if test -n "$EVOLUTION_CALENDAR_CONDUIT_CFLAGS"; then
+     pkg_cv_EVOLUTION_CALENDAR_CONDUIT_CFLAGS="$EVOLUTION_CALENDAR_CONDUIT_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_CALENDAR_CONDUIT_CFLAGS=`$PKG_CONFIG --cflags "gnome-pilot-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29741,11 +22530,11 @@
+     pkg_cv_EVOLUTION_CALENDAR_CONDUIT_LIBS="$EVOLUTION_CALENDAR_CONDUIT_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gnome-pilot-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gnome-pilot-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_CALENDAR_CONDUIT_LIBS=`$PKG_CONFIG --libs "gnome-pilot-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29771,18 +22560,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_CALENDAR_CONDUIT_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gnome-pilot-2.0) were not met:
+-
+-$EVOLUTION_CALENDAR_CONDUIT_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CONDUIT_CFLAGS
+-and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gnome-pilot-2.0) were not met:
++	as_fn_error "Package requirements (gnome-pilot-2.0) were not met:
+ 
+ $EVOLUTION_CALENDAR_CONDUIT_PKG_ERRORS
+ 
+@@ -29792,22 +22570,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CONDUIT_CFLAGS
+ and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_CALENDAR_CONDUIT_CFLAGS
+-and EVOLUTION_CALENDAR_CONDUIT_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29816,12 +22583,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_CALENDAR_CONDUIT_CFLAGS=$pkg_cv_EVOLUTION_CALENDAR_CONDUIT_CFLAGS
+ 	EVOLUTION_CALENDAR_CONDUIT_LIBS=$pkg_cv_EVOLUTION_CALENDAR_CONDUIT_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29836,18 +22602,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_MAIL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_MAIL" >&5
+ $as_echo_n "checking for EVOLUTION_MAIL... " >&6; }
+ 
+ if test -n "$EVOLUTION_MAIL_CFLAGS"; then
+     pkg_cv_EVOLUTION_MAIL_CFLAGS="$EVOLUTION_MAIL_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 \$mozilla_nss libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 \$mozilla_nss libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_MAIL_CFLAGS=`$PKG_CONFIG --cflags "camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29859,11 +22625,11 @@
+     pkg_cv_EVOLUTION_MAIL_LIBS="$EVOLUTION_MAIL_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 \$mozilla_nss libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"camel-provider-\$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-\$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 \$mozilla_nss libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_MAIL_LIBS=`$PKG_CONFIG --libs "camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -29889,18 +22655,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_MAIL_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE) were not met:
+-
+-$EVOLUTION_MAIL_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_MAIL_CFLAGS
+-and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gio-2.0 gconf-2.0 gobject-2.0 libgtkhtml-$GTKHTML_PACKAGE gtkhtml-editor bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE) were not met:
+ 
+ $EVOLUTION_MAIL_PKG_ERRORS
+ 
+@@ -29910,22 +22665,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_MAIL_CFLAGS
+ and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_MAIL_CFLAGS
+-and EVOLUTION_MAIL_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -29934,12 +22678,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_MAIL_CFLAGS=$pkg_cv_EVOLUTION_MAIL_CFLAGS
+ 	EVOLUTION_MAIL_LIBS=$pkg_cv_EVOLUTION_MAIL_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -29951,9 +22694,7 @@
+ 
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DATASERVER_API_VERSION "1.2"
+-_ACEOF
++$as_echo "#define DATASERVER_API_VERSION \"1.2\"" >>confdefs.h
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -29964,35 +22705,33 @@
+ DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2`
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for evolution-data-server IDL" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for evolution-data-server IDL" >&5
+ $as_echo_n "checking for evolution-data-server IDL... " >&6; }
+ DATASERVER_IDL=`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl
+ if test -f "$DATASERVER_IDL"; then
+-	{ $as_echo "$as_me:$LINENO: result: $DATASERVER_IDL" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DATASERVER_IDL" >&5
+ $as_echo "$DATASERVER_IDL" >&6; }
+ 
+ else
+-	{ { $as_echo "$as_me:$LINENO: error: no" >&5
+-$as_echo "$as_me: error: no" >&2;}
+-   { (exit 1); exit 1; }; }
++	as_fn_error "no" "$LINENO" 5
+ fi
+ 
+ 
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for EVOLUTION_TEST" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVOLUTION_TEST" >&5
+ $as_echo_n "checking for EVOLUTION_TEST... " >&6; }
+ 
+ if test -n "$EVOLUTION_TEST_CFLAGS"; then
+     pkg_cv_EVOLUTION_TEST_CFLAGS="$EVOLUTION_TEST_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_TEST_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 libbonoboui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30004,11 +22743,11 @@
+     pkg_cv_EVOLUTION_TEST_LIBS="$EVOLUTION_TEST_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 libbonoboui-2.0\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 libbonoboui-2.0") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_EVOLUTION_TEST_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 libbonoboui-2.0" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30034,18 +22773,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$EVOLUTION_TEST_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
+-
+-$EVOLUTION_TEST_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables EVOLUTION_TEST_CFLAGS
+-and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
++	as_fn_error "Package requirements (libgnomeui-2.0 libbonoboui-2.0) were not met:
+ 
+ $EVOLUTION_TEST_PKG_ERRORS
+ 
+@@ -30055,22 +22783,11 @@
+ Alternatively, you may set the environment variables EVOLUTION_TEST_CFLAGS
+ and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables EVOLUTION_TEST_CFLAGS
+-and EVOLUTION_TEST_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -30079,12 +22796,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	EVOLUTION_TEST_CFLAGS=$pkg_cv_EVOLUTION_TEST_CFLAGS
+ 	EVOLUTION_TEST_LIBS=$pkg_cv_EVOLUTION_TEST_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -30187,7 +22903,7 @@
+ 
+ 
+ # Check whether --enable-plugins was given.
+-if test "${enable_plugins+set}" = set; then
++if test "${enable_plugins+set}" = set; then :
+   enableval=$enable_plugins; enable_plugins="$enableval"
+ else
+   enable_plugins=all
+@@ -30232,7 +22948,7 @@
+ esac
+ 
+ # Check whether --enable-profiling was given.
+-if test "${enable_profiling+set}" = set; then
++if test "${enable_profiling+set}" = set; then :
+   enableval=$enable_profiling; enable_profiling=$enableval
+ else
+   enable_profiling=no
+@@ -30244,9 +22960,7 @@
+ 	plugins_enabled="$plugins_enabled profiler"
+ 	msg_plugins="$msg_plugins (and profiling)"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_PROFILING 1
+-_ACEOF
++$as_echo "#define ENABLE_PROFILING 1" >>confdefs.h
+ 
+ 	;;
+ esac
+@@ -30273,18 +22987,18 @@
+ 	then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for GSTREAMER" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSTREAMER" >&5
+ $as_echo_n "checking for GSTREAMER... " >&6; }
+ 
+ if test -n "$GSTREAMER_CFLAGS"; then
+     pkg_cv_GSTREAMER_CFLAGS="$GSTREAMER_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gstreamer-0.10" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30296,11 +23010,11 @@
+     pkg_cv_GSTREAMER_LIBS="$GSTREAMER_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gstreamer-0.10\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "gstreamer-0.10") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_GSTREAMER_LIBS=`$PKG_CONFIG --libs "gstreamer-0.10" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30326,18 +23040,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GSTREAMER_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (gstreamer-0.10) were not met:
+-
+-$GSTREAMER_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+-and GSTREAMER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (gstreamer-0.10) were not met:
++	as_fn_error "Package requirements (gstreamer-0.10) were not met:
+ 
+ $GSTREAMER_PKG_ERRORS
+ 
+@@ -30347,12 +23050,11 @@
+ Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+ and GSTREAMER_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -30361,22 +23063,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables GSTREAMER_CFLAGS
+-and GSTREAMER_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	GSTREAMER_CFLAGS=$pkg_cv_GSTREAMER_CFLAGS
+ 	GSTREAMER_LIBS=$pkg_cv_GSTREAMER_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -30392,18 +23083,18 @@
+ if echo ${plugins_enabled} | grep "exchange-operations" > /dev/null ; then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBEXCHANGESTORAGE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBEXCHANGESTORAGE" >&5
+ $as_echo_n "checking for LIBEXCHANGESTORAGE... " >&6; }
+ 
+ if test -n "$LIBEXCHANGESTORAGE_CFLAGS"; then
+     pkg_cv_LIBEXCHANGESTORAGE_CFLAGS="$LIBEXCHANGESTORAGE_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexchange-storage-\$EDS_PACKAGE >= 2.28.3\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexchange-storage-\$EDS_PACKAGE >= 2.28.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libexchange-storage-$EDS_PACKAGE >= 2.28.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBEXCHANGESTORAGE_CFLAGS=`$PKG_CONFIG --cflags "libexchange-storage-$EDS_PACKAGE >= 2.28.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30415,11 +23106,11 @@
+     pkg_cv_LIBEXCHANGESTORAGE_LIBS="$LIBEXCHANGESTORAGE_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libexchange-storage-\$EDS_PACKAGE >= 2.28.3\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libexchange-storage-\$EDS_PACKAGE >= 2.28.3\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libexchange-storage-$EDS_PACKAGE >= 2.28.3") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBEXCHANGESTORAGE_LIBS=`$PKG_CONFIG --libs "libexchange-storage-$EDS_PACKAGE >= 2.28.3" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30445,7 +23136,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBEXCHANGESTORAGE_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:$LINENO: result: no" >&5
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+                 have_libexchange="no"
+ elif test $pkg_failed = untried; then
+@@ -30453,7 +23144,7 @@
+ else
+ 	LIBEXCHANGESTORAGE_CFLAGS=$pkg_cv_LIBEXCHANGESTORAGE_CFLAGS
+ 	LIBEXCHANGESTORAGE_LIBS=$pkg_cv_LIBEXCHANGESTORAGE_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	have_libexchange="yes"
+ fi
+@@ -30461,18 +23152,18 @@
+ 
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for CAMEL_EXCHANGE" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAMEL_EXCHANGE" >&5
+ $as_echo_n "checking for CAMEL_EXCHANGE... " >&6; }
+ 
+ if test -n "$CAMEL_EXCHANGE_CFLAGS"; then
+     pkg_cv_CAMEL_EXCHANGE_CFLAGS="$CAMEL_EXCHANGE_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-\$EDS_PACKAGE libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libexchange-storage-\$EDS_PACKAGE libecal-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-\$EDS_PACKAGE libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libexchange-storage-\$EDS_PACKAGE libecal-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_EXCHANGE_CFLAGS=`$PKG_CONFIG --cflags "libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30484,11 +23175,11 @@
+     pkg_cv_CAMEL_EXCHANGE_LIBS="$CAMEL_EXCHANGE_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-\$EDS_PACKAGE libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libexchange-storage-\$EDS_PACKAGE libecal-\$EDS_PACKAGE\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-\$EDS_PACKAGE libebook-\$EDS_PACKAGE libedataserverui-\$EDS_PACKAGE libexchange-storage-\$EDS_PACKAGE libecal-\$EDS_PACKAGE\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_CAMEL_EXCHANGE_LIBS=`$PKG_CONFIG --libs "libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30514,18 +23205,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$CAMEL_EXCHANGE_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) were not met:
+-
+-$CAMEL_EXCHANGE_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables CAMEL_EXCHANGE_CFLAGS
+-and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) were not met:
++	as_fn_error "Package requirements (libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) were not met:
+ 
+ $CAMEL_EXCHANGE_PKG_ERRORS
+ 
+@@ -30535,22 +23215,11 @@
+ Alternatively, you may set the environment variables CAMEL_EXCHANGE_CFLAGS
+ and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables CAMEL_EXCHANGE_CFLAGS
+-and CAMEL_EXCHANGE_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -30559,12 +23228,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	CAMEL_EXCHANGE_CFLAGS=$pkg_cv_CAMEL_EXCHANGE_CFLAGS
+ 	CAMEL_EXCHANGE_LIBS=$pkg_cv_CAMEL_EXCHANGE_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -30585,18 +23253,18 @@
+ 	then
+ 
+ pkg_failed=no
+-{ $as_echo "$as_me:$LINENO: checking for LIBPST" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBPST" >&5
+ $as_echo_n "checking for LIBPST... " >&6; }
+ 
+ if test -n "$LIBPST_CFLAGS"; then
+     pkg_cv_LIBPST_CFLAGS="$LIBPST_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpst >= 0.6.41\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpst >= 0.6.41\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libpst >= 0.6.41") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBPST_CFLAGS=`$PKG_CONFIG --cflags "libpst >= 0.6.41" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30608,11 +23276,11 @@
+     pkg_cv_LIBPST_LIBS="$LIBPST_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpst >= 0.6.41\"") >&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpst >= 0.6.41\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "libpst >= 0.6.41") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; then
++  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++  test $ac_status = 0; }; then
+   pkg_cv_LIBPST_LIBS=`$PKG_CONFIG --libs "libpst >= 0.6.41" 2>/dev/null`
+ else
+   pkg_failed=yes
+@@ -30638,18 +23306,7 @@
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$LIBPST_PKG_ERRORS" >&5
+ 
+-	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libpst >= 0.6.41) were not met:
+-
+-$LIBPST_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables LIBPST_CFLAGS
+-and LIBPST_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-" >&5
+-$as_echo "$as_me: error: Package requirements (libpst >= 0.6.41) were not met:
++	as_fn_error "Package requirements (libpst >= 0.6.41) were not met:
+ 
+ $LIBPST_PKG_ERRORS
+ 
+@@ -30659,22 +23316,11 @@
+ Alternatively, you may set the environment variables LIBPST_CFLAGS
+ and LIBPST_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+-" >&2;}
+-   { (exit 1); exit 1; }; }
++" "$LINENO" 5
+ elif test $pkg_failed = untried; then
+-	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
++	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables LIBPST_CFLAGS
+-and LIBPST_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
++as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
+ is in your PATH or set the PKG_CONFIG environment variable to the full
+ path to pkg-config.
+ 
+@@ -30683,12 +23329,11 @@
+ See the pkg-config man page for more details.
+ 
+ To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++See \`config.log' for more details." "$LINENO" 5; }
+ else
+ 	LIBPST_CFLAGS=$pkg_cv_LIBPST_CFLAGS
+ 	LIBPST_LIBS=$pkg_cv_LIBPST_LIBS
+-        { $as_echo "$as_me:$LINENO: result: yes" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ 	:
+ fi
+@@ -30703,9 +23348,9 @@
+ 
+ # Extract the first word of "gconftool-2", so it can be a program name with args.
+ set dummy gconftool-2; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_GCONFTOOL+set}" = set; then
++if test "${ac_cv_path_GCONFTOOL+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   case $GCONFTOOL in
+@@ -30718,14 +23363,14 @@
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
++    for ac_exec_ext in '' $ac_executable_extensions; do
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
++    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+-done
++  done
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_GCONFTOOL" && ac_cv_path_GCONFTOOL="no"
+@@ -30734,10 +23379,10 @@
+ fi
+ GCONFTOOL=$ac_cv_path_GCONFTOOL
+ if test -n "$GCONFTOOL"; then
+-  { $as_echo "$as_me:$LINENO: result: $GCONFTOOL" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
+ $as_echo "$GCONFTOOL" >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -30751,13 +23396,13 @@
+ 
+ 
+ # Check whether --with-gconf-source was given.
+-if test "${with_gconf_source+set}" = set; then
++if test "${with_gconf_source+set}" = set; then :
+   withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
+ fi
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
+ $as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
+ 
+   if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+@@ -30766,22 +23411,20 @@
+ 
+ 
+ # Check whether --with-gconf-schema-file-dir was given.
+-if test "${with_gconf_schema_file_dir+set}" = set; then
++if test "${with_gconf_schema_file_dir+set}" = set; then :
+   withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
+ fi
+ 
+ 
+ 
+-  { $as_echo "$as_me:$LINENO: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
+ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
+ 
+   # Check whether --enable-schemas-install was given.
+-if test "${enable_schemas_install+set}" = set; then
++if test "${enable_schemas_install+set}" = set; then :
+   enableval=$enable_schemas_install; case ${enableval} in
+        yes|no) ;;
+-       *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-schemas-install" >&5
+-$as_echo "$as_me: error: bad value ${enableval} for --enable-schemas-install" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++       *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
+       esac
+ fi
+ 
+@@ -30797,7 +23440,7 @@
+ 
+ 
+ # Check whether --with-sub-version was given.
+-if test "${with_sub_version+set}" = set; then
++if test "${with_sub_version+set}" = set; then :
+   withval=$with_sub_version;
+ fi
+ 
+@@ -30809,7 +23452,7 @@
+ 
+ 
+ # Check whether --enable-default-binary was given.
+-if test "${enable_default_binary+set}" = set; then
++if test "${enable_default_binary+set}" = set; then :
+   enableval=$enable_default_binary;
+ else
+   enable_default_binary=no
+@@ -30827,7 +23470,7 @@
+ 
+ 
+ # Check whether --with-kde-applnk-path was given.
+-if test "${with_kde_applnk_path+set}" = set; then
++if test "${with_kde_applnk_path+set}" = set; then :
+   withval=$with_kde_applnk_path; with_kde_applnk_path=$withval
+ else
+   with_kde_applnk_path="no"
+@@ -30891,13 +23534,13 @@
+     case $ac_val in #(
+     *${as_nl}*)
+       case $ac_var in #(
+-      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
++      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+       esac
+       case $ac_var in #(
+       _ | IFS | as_nl) ;; #(
+       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
+-      *) $as_unset $ac_var ;;
++      *) { eval $ac_var=; unset $ac_var;} ;;
+       esac ;;
+     esac
+   done
+@@ -30905,8 +23548,8 @@
+   (set) 2>&1 |
+     case $as_nl`(ac_space=' '; set) 2>&1` in #(
+     *${as_nl}ac_space=\ *)
+-      # `set' does not quote correctly, so add quotes (double-quote
+-      # substitution turns \\\\ into \\, and sed turns \\ into \).
++      # `set' does not quote correctly, so add quotes: double-quote
++      # substitution turns \\\\ into \\, and sed turns \\ into \.
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -30929,11 +23572,11 @@
+ if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
+   if test -w "$cache_file"; then
+     test "x$cache_file" != "x/dev/null" &&
+-      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+ $as_echo "$as_me: updating cache $cache_file" >&6;}
+     cat confcache >$cache_file
+   else
+-    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+@@ -30953,8 +23596,8 @@
+   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
+   #    will be set to the directory where LIBOBJS objects are built.
+-  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
+-  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
++  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
++  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
+ done
+ LIBOBJS=$ac_libobjs
+ 
+@@ -30970,192 +23613,118 @@
+ fi
+ 
+ if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_SK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_SK\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"AMDEP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_JW_TRUE}" && test -z "${HAVE_JW_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_JW\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_JW\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"HAVE_JW\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+   ac_config_commands="$ac_config_commands po/stamp-it"
+ 
+ 
+ if test -z "${OS_WIN32_TRUE}" && test -z "${OS_WIN32_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"OS_WIN32\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"OS_WIN32\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"OS_WIN32\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_WINDRES_TRUE}" && test -z "${HAVE_WINDRES_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_WINDRES\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_WINDRES\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"HAVE_WINDRES\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_HELP_TRUE}" && test -z "${WITH_HELP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"WITH_HELP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"WITH_HELP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"WITH_HELP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_PURIFY_TRUE}" && test -z "${ENABLE_PURIFY_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PURIFY\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_PURIFY\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_PURIFY\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_TEST_COMPONENT_TRUE}" && test -z "${ENABLE_TEST_COMPONENT_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_TEST_COMPONENT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_TEST_COMPONENT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_TEST_COMPONENT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_LDAP_TRUE}" && test -z "${ENABLE_LDAP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_LDAP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_LDAP_TRUE}" && test -z "${ENABLE_LDAP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_LDAP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_LDAP_TRUE}" && test -z "${ENABLE_LDAP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_LDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_LDAP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${SUNLDAP_TRUE}" && test -z "${SUNLDAP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"SUNLDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"SUNLDAP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"SUNLDAP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_NNTP_TRUE}" && test -z "${ENABLE_NNTP_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_NNTP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_NNTP\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_NNTP\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_PILOT_CONDUITS_TRUE}" && test -z "${ENABLE_PILOT_CONDUITS_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_PILOT_CONDUITS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_PILOT_CONDUITS\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_PILOT_CONDUITS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_SMIME_TRUE}" && test -z "${ENABLE_SMIME_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_SMIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_SMIME\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_SMIME\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${ENABLE_EXCHANGE_TRUE}" && test -z "${ENABLE_EXCHANGE_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_EXCHANGE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"ENABLE_EXCHANGE\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"ENABLE_EXCHANGE\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${DBUS_SUPPORT_TRUE}" && test -z "${DBUS_SUPPORT_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"DBUS_SUPPORT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"DBUS_SUPPORT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"DBUS_SUPPORT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${NM_SUPPORT_TRUE}" && test -z "${NM_SUPPORT_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"NM_SUPPORT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"NM_SUPPORT\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"NM_SUPPORT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${DEFAULT_BINARY_TRUE}" && test -z "${DEFAULT_BINARY_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"DEFAULT_BINARY\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"DEFAULT_BINARY\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"DEFAULT_BINARY\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${HAVE_KDE_APPLNK_TRUE}" && test -z "${HAVE_KDE_APPLNK_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"HAVE_KDE_APPLNK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"HAVE_KDE_APPLNK\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "conditional \"HAVE_KDE_APPLNK\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+ : ${CONFIG_STATUS=./config.status}
+ ac_write_fail=0
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+ $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+-cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++as_write_fail=0
++cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -31165,17 +23734,18 @@
+ debug=false
+ ac_cs_recheck=false
+ ac_cs_silent=false
+-SHELL=\${CONFIG_SHELL-$SHELL}
+-_ACEOF
+ 
+-cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-## --------------------- ##
+-## M4sh Initialization.  ##
+-## --------------------- ##
++SHELL=\${CONFIG_SHELL-$SHELL}
++export SHELL
++_ASEOF
++cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
++## -------------------- ##
++## M4sh Initialization. ##
++## -------------------- ##
+ 
+ # Be more Bourne compatible
+ DUALCASE=1; export DUALCASE # for MKS sh
+-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+   emulate sh
+   NULLCMD=:
+   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+@@ -31183,23 +23753,15 @@
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
++  case `(set -o) 2>/dev/null` in #(
++  *posix*) :
++    set -o posix ;; #(
++  *) :
++     ;;
+ esac
+-
+ fi
+ 
+ 
+-
+-
+-# PATH needs CR
+-# 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
+-
+ as_nl='
+ '
+ export as_nl
+@@ -31207,7 +23769,13 @@
+ as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+ as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+-if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
++# Prefer a ksh shell builtin over an external printf program on Solaris,
++# but without wasting forks for bash or zsh.
++if test -z "$BASH_VERSION$ZSH_VERSION" \
++    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
++  as_echo='print -r --'
++  as_echo_n='print -rn --'
++elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+@@ -31218,7 +23786,7 @@
+     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+     as_echo_n_body='eval
+       arg=$1;
+-      case $arg in
++      case $arg in #(
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -31241,13 +23809,6 @@
+   }
+ fi
+ 
+-# Support unset when possible.
+-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+-  as_unset=unset
+-else
+-  as_unset=false
+-fi
+-
+ 
+ # IFS
+ # We need space, tab and new line, in precisely that order.  Quoting is
+@@ -31257,15 +23818,15 @@
+ IFS=" ""	$as_nl"
+ 
+ # Find who we are.  Look in the path if we contain no directory separator.
+-case $0 in
++case $0 in #((
+   *[\\/]* ) as_myself=$0 ;;
+   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+-done
++    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++  done
+ IFS=$as_save_IFS
+ 
+      ;;
+@@ -31277,12 +23838,16 @@
+ fi
+ if test ! -f "$as_myself"; then
+   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+-  { (exit 1); exit 1; }
++  exit 1
+ fi
+ 
+-# Work around bugs in pre-3.0 UWIN ksh.
+-for as_var in ENV MAIL MAILPATH
+-do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++# Unset variables that we do not need and which cause bugs (e.g. in
++# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
++# suppresses any "Segmentation fault" message there.  '((' could
++# trigger a bug in pdksh 5.2.14.
++for as_var in BASH_ENV ENV MAIL MAILPATH
++do eval test x\${$as_var+set} = xset \
++  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+ done
+ PS1='$ '
+ PS2='> '
+@@ -31294,7 +23859,89 @@
+ LANGUAGE=C
+ export LANGUAGE
+ 
+-# Required to use basename.
++# CDPATH.
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
++
++
++# as_fn_error ERROR [LINENO LOG_FD]
++# ---------------------------------
++# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
++# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
++# script with status $?, using 1 if that was 0.
++as_fn_error ()
++{
++  as_status=$?; test $as_status -eq 0 && as_status=1
++  if test "$3"; then
++    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  fi
++  $as_echo "$as_me: error: $1" >&2
++  as_fn_exit $as_status
++} # as_fn_error
++
++
++# as_fn_set_status STATUS
++# -----------------------
++# Set $? to STATUS, without forking.
++as_fn_set_status ()
++{
++  return $1
++} # as_fn_set_status
++
++# as_fn_exit STATUS
++# -----------------
++# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
++as_fn_exit ()
++{
++  set +e
++  as_fn_set_status $1
++  exit $1
++} # as_fn_exit
++
++# as_fn_unset VAR
++# ---------------
++# Portably unset VAR.
++as_fn_unset ()
++{
++  { eval $1=; unset $1;}
++}
++as_unset=as_fn_unset
++# as_fn_append VAR VALUE
++# ----------------------
++# Append the text in VALUE to the end of the definition contained in VAR. Take
++# advantage of any shell optimizations that allow amortized linear growth over
++# repeated appends, instead of the typical quadratic growth present in naive
++# implementations.
++if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
++  eval 'as_fn_append ()
++  {
++    eval $1+=\$2
++  }'
++else
++  as_fn_append ()
++  {
++    eval $1=\$$1\$2
++  }
++fi # as_fn_append
++
++# as_fn_arith ARG...
++# ------------------
++# Perform arithmetic evaluation on the ARGs, and store the result in the
++# global $as_val. Take advantage of shells that can avoid forks. The arguments
++# must be portable across $(()) and expr.
++if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
++  eval 'as_fn_arith ()
++  {
++    as_val=$(( $* ))
++  }'
++else
++  as_fn_arith ()
++  {
++    as_val=`expr "$@" || test $? -eq 1`
++  }
++fi # as_fn_arith
++
++
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -31308,8 +23955,12 @@
+   as_basename=false
+ fi
+ 
++if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
++  as_dirname=dirname
++else
++  as_dirname=false
++fi
+ 
+-# Name of the executable.
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+@@ -31329,76 +23980,25 @@
+ 	  }
+ 	  s/.*/./; q'`
+ 
+-# CDPATH.
+-$as_unset CDPATH
+-
+-
+-
+-  as_lineno_1=$LINENO
+-  as_lineno_2=$LINENO
+-  test "x$as_lineno_1" != "x$as_lineno_2" &&
+-  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
+-
+-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
+-  # uniformly replaced by the line number.  The first 'sed' inserts a
+-  # line-number line after each line using $LINENO; the second 'sed'
+-  # does the real work.  The second script uses 'N' to pair each
+-  # line-number line with the line containing $LINENO, and appends
+-  # trailing '-' during substitution so that $LINENO is not a special
+-  # case at line end.
+-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
+-  # scripts with optimization help from Paolo Bonzini.  Blame Lee
+-  # E. McMahon (1931-1989) for sed's syntax.  :-)
+-  sed -n '
+-    p
+-    /[$]LINENO/=
+-  ' <$as_myself |
+-    sed '
+-      s/[$]LINENO.*/&-/
+-      t lineno
+-      b
+-      :lineno
+-      N
+-      :loop
+-      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
+-      t loop
+-      s/-\n.*//
+-    ' >$as_me.lineno &&
+-  chmod +x "$as_me.lineno" ||
+-    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+-   { (exit 1); exit 1; }; }
+-
+-  # Don't try to exec as it changes $[0], causing all sort of problems
+-  # (the dirname of $[0] is not the place where we might find the
+-  # original and so on.  Autoconf is especially sensitive to this).
+-  . "./$as_me.lineno"
+-  # Exit status is that of the last command.
+-  exit
+-}
+-
+-
+-if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+-  as_dirname=dirname
+-else
+-  as_dirname=false
+-fi
++# 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
+ 
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
++case `echo -n x` in #(((((
+ -n*)
+-  case `echo 'x\c'` in
++  case `echo 'xy\c'` in
+   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+-  *)   ECHO_C='\c';;
++  xy)  ECHO_C='\c';;
++  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
++       ECHO_T='	';;
+   esac;;
+ *)
+   ECHO_N='-n';;
+ esac
+-if expr a : '\(a\)' >/dev/null 2>&1 &&
+-   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+-  as_expr=expr
+-else
+-  as_expr=false
+-fi
+ 
+ rm -f conf$$ conf$$.exe conf$$.file
+ if test -d conf$$.dir; then
+@@ -31427,8 +24027,56 @@
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+ 
++
++# as_fn_mkdir_p
++# -------------
++# Create "$as_dir" as a directory, including parents if necessary.
++as_fn_mkdir_p ()
++{
++
++  case $as_dir in #(
++  -*) as_dir=./$as_dir;;
++  esac
++  test -d "$as_dir" || eval $as_mkdir_p || {
++    as_dirs=
++    while :; do
++      case $as_dir in #(
++      *\'*) as_qdir=`$as_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 ||
++$as_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" || as_fn_error "cannot create directory $as_dir"
++
++
++} # as_fn_mkdir_p
+ if mkdir -p . 2>/dev/null; then
+-  as_mkdir_p=:
++  as_mkdir_p='mkdir -p "$as_dir"'
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+@@ -31447,10 +24095,10 @@
+       if test -d "$1"; then
+ 	test -d "$1/.";
+       else
+-	case $1 in
++	case $1 in #(
+ 	-*)set "./$1";;
+ 	esac;
+-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
+ 	???[sx]*):;;*)false;;esac;fi
+     '\'' sh
+   '
+@@ -31465,13 +24113,19 @@
+ 
+ 
+ exec 6>&1
++## ----------------------------------- ##
++## Main body of $CONFIG_STATUS script. ##
++## ----------------------------------- ##
++_ASEOF
++test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
+ 
+-# Save the log message, to keep $[0] and so on meaningful, and to
++cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
++# Save the log message, to keep $0 and so on meaningful, and to
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+ This file was extended by evolution $as_me 2.28.3, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.65.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -31503,13 +24157,15 @@
+ 
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ ac_cs_usage="\
+-\`$as_me' instantiates files from templates according to the
+-current configuration.
++\`$as_me' instantiates files and other configuration actions
++from templates according to the current configuration.  Unless the files
++and actions are specified as TAGs, all are instantiated by default.
+ 
+-Usage: $0 [OPTION]... [FILE]...
++Usage: $0 [OPTION]... [TAG]...
+ 
+   -h, --help       print this help, then exit
+   -V, --version    print version number and configuration settings, then exit
++      --config     print configuration, then exit
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -31528,16 +24184,17 @@
+ Configuration commands:
+ $config_commands
+ 
+-Report bugs to <bug-autoconf@gnu.org>."
++Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution>."
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
++ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ evolution config.status 2.28.3
+-configured by $0, generated by GNU Autoconf 2.63,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.65,
++  with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2009 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -31573,6 +24230,8 @@
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;
++  --config | --confi | --conf | --con | --co | --c )
++    $as_echo "$ac_cs_config"; exit ;;
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+@@ -31580,20 +24239,19 @@
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+-    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
++    as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+   --header | --heade | --head | --hea )
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+     esac
+-    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
++    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    { $as_echo "$as_me: error: ambiguous option: $1
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; };;
++    as_fn_error "ambiguous option: \`$1'
++Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+@@ -31601,11 +24259,10 @@
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) { $as_echo "$as_me: error: unrecognized option: $1
+-Try \`$0 --help' for more information." >&2
+-   { (exit 1); exit 1; }; } ;;
++  -*) as_fn_error "unrecognized option: \`$1'
++Try \`$0 --help' for more information." ;;
+ 
+-  *) ac_config_targets="$ac_config_targets $1"
++  *) as_fn_append ac_config_targets " $1"
+      ac_need_defaults=false ;;
+ 
+   esac
+@@ -32069,9 +24726,7 @@
+     "evolution-plugin.pc") CONFIG_FILES="$CONFIG_FILES evolution-plugin.pc" ;;
+     "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
+ 
+-  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+-$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+-   { (exit 1); exit 1; }; };;
++  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+   esac
+ done
+ 
+@@ -32098,7 +24753,7 @@
+   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
++  trap 'as_fn_exit 1' 1 2 13 15
+ }
+ # Create a (secure) tmp directory for tmp files.
+ 
+@@ -32109,11 +24764,7 @@
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+-} ||
+-{
+-   $as_echo "$as_me: cannot create a temporary directory in ." >&2
+-   { (exit 1); exit 1; }
+-}
++} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -32138,10 +24789,16 @@
+   # The final `:' finishes the AND list.
+   ac_cs_awk_pipe_fini='END { print "|#_!!_#|"; print ":" }'
+ fi
+-ac_cr='
'
++ac_cr=`echo X | tr X '\015'`
++# On cygwin, bash can eat \r inside `` if the user requested igncr.
++# But we know of no other shell where ac_cr would be empty at this
++# point, so we can use a bashism as a fallback.
++if test "x$ac_cr" = x; then
++  eval ac_cr=\$\'\\r\'
++fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\\r'
++  ac_cs_awk_cr='\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+@@ -32158,9 +24815,7 @@
+   echo "_ACEOF"
+ } >conf$$files.sh &&
+ . ./conf$$files.sh ||
+-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ rm -f conf$$files.sh
+ 
+ {
+@@ -32168,24 +24823,18 @@
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+ 
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
+     break
+   elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -32207,7 +24856,7 @@
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -32221,7 +24870,7 @@
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
++s/\(.\{148\}\)..*/\1/
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -32280,9 +24929,7 @@
+ else
+   cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+-$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+-   { (exit 1); exit 1; }; }
++  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+ # VPATH may cause trouble with some makes, so we remove $(srcdir),
+@@ -32323,9 +24970,7 @@
+   if test -z "$ac_t"; then
+     break
+   elif $ac_last_try; then
+-    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
+-$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -32410,9 +25055,7 @@
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
+-$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+ 
+ 
+@@ -32425,9 +25068,7 @@
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+-$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+-   { (exit 1); exit 1; }; };;
++  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -32455,12 +25096,10 @@
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+-$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+-   { (exit 1); exit 1; }; };;
++	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+-      ac_file_inputs="$ac_file_inputs '$ac_f'"
++      as_fn_append ac_file_inputs " '$ac_f'"
+     done
+ 
+     # Let's still pretend it is `configure' which instantiates (i.e., don't
+@@ -32471,7 +25110,7 @@
+ 	`' by configure.'
+     if test x"$ac_file" != x-; then
+       configure_input="$ac_file.  $configure_input"
+-      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+ $as_echo "$as_me: creating $ac_file" >&6;}
+     fi
+     # Neutralize special characters interpreted by sed in replacement strings.
+@@ -32484,9 +25123,7 @@
+ 
+     case $ac_tag in
+     *:-:* | *:-) cat >"$tmp/stdin" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; } ;;
++      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+     esac
+     ;;
+   esac
+@@ -32514,47 +25151,7 @@
+ 	    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=`$as_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 ||
+-$as_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" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+-   { (exit 1); exit 1; }; }; }
++  as_dir="$ac_dir"; as_fn_mkdir_p
+   ac_builddir=.
+ 
+ case "$ac_dir" in
+@@ -32611,7 +25208,6 @@
+ # 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=
+-
+ ac_sed_dataroot='
+ /datarootdir/ {
+   p
+@@ -32621,12 +25217,11 @@
+ /@docdir@/p
+ /@infodir@/p
+ /@localedir@/p
+-/@mandir@/p
+-'
++/@mandir@/p'
+ case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+ *datarootdir*) ac_datarootdir_seen=yes;;
+ *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -32636,7 +25231,7 @@
+   s&@infodir@&$infodir&g
+   s&@localedir@&$localedir&g
+   s&@mandir@&$mandir&g
+-    s&\\\${datarootdir}&$datarootdir&g' ;;
++  s&\\\${datarootdir}&$datarootdir&g' ;;
+ esac
+ _ACEOF
+ 
+@@ -32670,14 +25265,12 @@
+ else
+   $AWK -f "$tmp/subs.awk" | $SHELL
+ fi >$tmp/out \
+-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+-  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ which seems to be undefined.  Please make sure it is defined." >&2;}
+@@ -32687,9 +25280,7 @@
+   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   esac \
+-  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++  || as_fn_error "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -32700,25 +25291,19 @@
+       $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+     } >"$tmp/config.h" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++      || as_fn_error "could not create $ac_file" "$LINENO" 5
+     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+-      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
++      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+       mv "$tmp/config.h" "$ac_file" \
+-	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+-$as_echo "$as_me: error: could not create $ac_file" >&2;}
+-   { (exit 1); exit 1; }; }
++	|| as_fn_error "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
+-$as_echo "$as_me: error: could not create -" >&2;}
+-   { (exit 1); exit 1; }; }
++      || as_fn_error "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -32756,7 +25341,7 @@
+ 	  s/.*/./; q'`/stamp-h$_am_stamp_count
+  ;;
+ 
+-  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
++  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+ $as_echo "$as_me: executing $ac_file commands" >&6;}
+  ;;
+   esac
+@@ -32851,47 +25436,7 @@
+ 	    q
+ 	  }
+ 	  s/.*/./; q'`
+-      { as_dir=$dirpart/$fdir
+-  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=`$as_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 ||
+-$as_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" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
+-$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+-   { (exit 1); exit 1; }; }; }
++      as_dir=$dirpart/$fdir; as_fn_mkdir_p
+       # echo "creating $dirpart/$file"
+       echo '# dummy' > "$dirpart/$file"
+     done
+@@ -33544,9 +26089,7 @@
+  ;;
+     "po/stamp-it":C)
+     if  ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then
+-       { { $as_echo "$as_me:$LINENO: error: po/Makefile.in.in was not created by intltoolize." >&5
+-$as_echo "$as_me: error: po/Makefile.in.in was not created by intltoolize." >&2;}
+-   { (exit 1); exit 1; }; }
++       as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5
+     fi
+     rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp"
+     >"po/stamp-it.tmp"
+@@ -33569,15 +26112,12 @@
+ done # for ac_tag
+ 
+ 
+-{ (exit 0); exit 0; }
++as_fn_exit 0
+ _ACEOF
+-chmod +x $CONFIG_STATUS
+ ac_clean_files=$ac_clean_files_save
+ 
+ test $ac_write_fail = 0 ||
+-  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+-$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+@@ -33598,10 +26138,10 @@
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || { (exit 1); exit 1; }
++  $ac_cs_success || as_fn_exit $?
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+-  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
++  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
--- evolution-2.28.3.orig/debian/lintian/evolution-plugins-experimental
+++ evolution-2.28.3/debian/lintian/evolution-plugins-experimental
@@ -0,0 +1,5 @@
+# Private rpaths
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-email-custom-header.so /usr/lib/evolution/2.28/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mail-folder-unsubscribe.so /usr/lib/evolution/2.28/components
+evolution-plugins-experimental: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-templates.so /usr/lib/evolution/2.28/components
+
--- evolution-2.28.3.orig/debian/lintian/evolution-plugins
+++ evolution-2.28.3/debian/lintian/evolution-plugins
@@ -0,0 +1,7 @@
+# Private rpath
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-default-mailer.so /usr/lib/evolution/2.28/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-evolution-attachment-reminder.so /usr/lib/evolution/2.28/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-face.so /usr/lib/evolution/2.28/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mail-to-task.so /usr/lib/evolution/2.28/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-mailing-list-actions.so /usr/lib/evolution/2.28/components
+evolution-plugins: binary-or-shlib-defines-rpath ./usr/lib/evolution/2.28/plugins/liborg-gnome-prefer-plain.so /usr/lib/evolution/2.28/components
--- evolution-2.28.3.orig/debian/lintian/evolution-common
+++ evolution-2.28.3/debian/lintian/evolution-common
@@ -0,0 +1 @@
+evolution-common: desktop-command-not-in-package /usr/share/applications/evolution.desktop evolution
