Received: from mail-pz0-f193.google.com (mail-pz0-f193.google.com [209.85.222.193]) by maillists.intel-research.net (8.13.8/8.13.8) with ESMTP id n9UMUEhf004945; Fri, 30 Oct 2009 15:30:14 -0700
Received: by pzk31 with SMTP id 31so2247294pzk.28 for <multiple recipients>; Fri, 30 Oct 2009 15:30:17 -0700 (PDT)
Received: by 10.115.151.5 with SMTP id d5mr1557931wao.204.1256941817693; Fri, 30 Oct 2009 15:30:17 -0700 (PDT)
Received: from ?10.212.112.68? (bldmz-nat-161-164.berkeley.intel-research.net [12.155.161.164]) by mx.google.com with ESMTPS id 21sm1001336pzk.7.2009.10.30.15.30.15 (version=SSLv3 cipher=RC4-MD5); Fri, 30 Oct 2009 15:30:17 -0700 (PDT)
Sender: Alex McMahon <alexmcm@gmail.com>
From: Alex McMahon <alex.mcmahon@cs.tcd.ie>
To: Nick Fox <fox.525@osu.edu>
In-Reply-To: <327e92bc0909301144r2ff99c35u5dd0444391a99044@mail.gmail.com>
References: <327e92bc0909301144r2ff99c35u5dd0444391a99044@mail.gmail.com>
Content-Type: multipart/alternative; boundary="=-cZtdMqsHhvPLb+EacEdl"
Organization: Trinity College Dublin
Date: Fri, 30 Oct 2009 15:30:14 -0700
Message-Id: <1256941814.1375.3014.camel@sphere>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.1
Cc: dtn-users@maillists.intel-research.net, dtn-interest@maillists.intel-research.net
Subject: Re: [dtn-users] bundle expire malfunction??
X-BeenThere: dtn-users@maillists.intel-research.net
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: alex.mcmahon@cs.tcd.ie
List-Id: dtn-users mailing list <dtn-users.maillists.intel-research.net>
List-Unsubscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=unsubscribe>
List-Archive: <http://maillists.intel-research.net/pipermail/dtn-users>
List-Post: <mailto:dtn-users@maillists.intel-research.net>
List-Help: <mailto:dtn-users-request@maillists.intel-research.net?subject=help>
List-Subscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=subscribe>
X-List-Received-Date: Fri, 30 Oct 2009 22:30:14 -0000

--=-cZtdMqsHhvPLb+EacEdl
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Expiring a bundle would simply remove it from the bundle list
immediately and delete the bundle.  I believe what you are seeing is one
of three registrations being deleted and not the expiration of the
bundle.  If the bundle expires ( you could try manually expiring it with
'bundle expire <id>')before all known nodes have been encountered, I
expect the bundle would disappear from the bundle list and is deleted.  


Alex

1) no bundles / default registrations
sphere dtn% bundle list
All Bundles (0): 

sphere dtn% registration list
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]

sphere dtn% route dump
Route table for flood router:

destinatio source COS    next hop    fwd    route [custody timeout]
endpoint i  eid   BNE    link/eid   action   prio [min   pct   max]
-----------------------------------------------------------------------------

Class of Service (COS) bits:
	B: Bulk  N: Normal  E: Expedited

Links:

2) Two bundles sent with expiration time of 10 seconds to EID that does
no exist. Bundles 8 & 9 and registrations 14 & 15 are visible  

$ dtnping -c 1 -e 10 dtn://blahblah2/ping
source_eid [dtn://sphere.dtn/ping.1747]
dtn_register succeeded, regid 15


$ dtnping -c 1 -e 10 dtn://blahblah1/ping
source_eid [dtn://sphere.dtn/ping.1745]
dtn_register succeeded, regid 14


sphere dtn% bundle list
All Bundles (2): 
	8  : dtn://sphere.dtn/ping.1745 -> dtn://blahblah1/ping length 20
	9  : dtn://sphere.dtn/ping.1747 -> dtn://blahblah2/ping length 20

sphere dtn% registration list
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]
id 14: active dtn://sphere.dtn/ping.1745 (DEFER) [expiration 0]
id 15: active dtn://sphere.dtn/ping.1747 (DEFER) [expiration 0]

sphere dtn% route dump
Route table for flood router:

destinatio source COS    next hop    fwd    route [custody timeout]
endpoint i  eid   BNE    link/eid   action   prio [min   pct   max]
-----------------------------------------------------------------------------

Class of Service (COS) bits:
	B: Bulk  N: Normal  E: Expedited

Links:


3) After 10 seconds as expected the registration expires and bundle
expires. Registrations 14 & 15 and bundles 8 & 9 are gone from lists. A
signal is given by the dtnping application for both bundles.  

PING [dtn://blahblah1/ping] (expiration 10)...
bundle deleted at [dtn://sphere.dtn] (lifetime expired): seqno=0,
time=10004 m

PING [dtn://blahblah1/ping] (expiration 10)...
bundle deleted at [dtn://sphere.dtn] (lifetime expired): seqno=0,
time=10002 ms

sphere dtn% bundle list
All Bundles (0): 

sphere dtn% registration list
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]

sphere dtn% route dump
Route table for flood router:

destinatio source COS    next hop    fwd    route [custody timeout]
endpoint i  eid   BNE    link/eid   action   prio [min   pct   max]
-----------------------------------------------------------------------------

Class of Service (COS) bits:
	B: Bulk  N: Normal  E: Expedited

Links:



On Wed, 2009-09-30 at 14:44 -0400, Nick Fox wrote:

> I am using DTN2-2.6.0 and flooding routing.  I believe I am
> experiencing some odd behavior with the bundle expire command.
> 
> Here is my test scenario:
> 
> Nodes N1, N2, N3, and N4 all have entries in each others link lists.
> Say N1 has a dtnsend command run on it while all links are closed
> which creates bundle B1.  If a bundle info command is run on B1, then
> it is "queued" of the following lists:all_bundles, pending_bundles,
> FloodBundleRouter::all_bundles, link-0:deferred, link-1:deferred, and
> link-2:deferred (link-0=N2, link-1=N3, link-2=N4).  Now if the link
> opens with N3, the bundle is flooded to N3 and a bundle expire command
> is run on the bundle on N1.  Here is the what I see on N1.  Bundle
> list status = NOT PENDING.  Now if bundle info is run on it, it is
> "queued" on the following lists:all_bundles, link-0:deferred,
> link-2:deferred.  If N1 now opens a link with N2 and/or N4, the bundle
> is still flooded to the node and it is removed from the corresponding
> link:deferred list.  When all known nodes have been encountered, then
> the bundle finally disappears from the bundle list and is deleted.
> Note: if N1 were to open a link to a "new" node ex. N6, then the
> bundle would be flooded to N6 as well.
> 
> I am curious, is this the intended behavior of the bundle expire
> command? I was under the impression that expiring a bundle would
> simply remove it from the bundle list immediately and delete the
> bundle.  Also, if this is the intended behavior for bundle expire, is
> there a way to manually alter which lists a bundle is a part of?  
> 
> Thanks in advance for your comments/suggestions.
> 
> Nick Fox
> 
> _______________________________________________
> dtn-users mailing list
> dtn-users@maillists.intel-research.net
> http://maillists.intel-research.net/mailman/listinfo/dtn-users

--=-cZtdMqsHhvPLb+EacEdl
Content-Type: text/html; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
<HTML>
<HEAD>
  <META HTTP-EQUIV=3D"Content-Type" CONTENT=3D"text/html; CHARSET=3DUTF-8">
  <META NAME=3D"GENERATOR" CONTENT=3D"GtkHTML/3.26.0">
</HEAD>
<BODY>
Expiring a bundle would simply remove it from the bundle list immediately a=
nd delete the bundle.&nbsp; I believe what you are seeing is one of three r=
egistrations being deleted and not the expiration of the bundle.&nbsp; If t=
he bundle expires ( you could try manually expiring it with 'bundle expire =
&lt;id&gt;')before all known nodes have been encountered, I expect the bund=
le would disappear from the bundle list and is deleted.&nbsp; <BR>
<BR>
<BR>
Alex<BR>
<BR>
<B>1) no bundles / default registrations</B><BR>
sphere dtn% bundle list<BR>
All Bundles (0): <BR>
<BR>
sphere dtn% registration list<BR>
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]<BR>
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]<BR>
<BR>
sphere dtn% route dump<BR>
Route table for flood router:<BR>
<BR>
destinatio source COS&nbsp;&nbsp;&nbsp; next hop&nbsp;&nbsp;&nbsp; fwd&nbsp=
;&nbsp;&nbsp; route [custody timeout]<BR>
endpoint i&nbsp; eid&nbsp;&nbsp; BNE&nbsp;&nbsp;&nbsp; link/eid&nbsp;&nbsp;=
 action&nbsp;&nbsp; prio [min&nbsp;&nbsp; pct&nbsp;&nbsp; max]<BR>
---------------------------------------------------------------------------=
--<BR>
<BR>
Class of Service (COS) bits:<BR>
	B: Bulk&nbsp; N: Normal&nbsp; E: Expedited<BR>
<BR>
Links:<BR>
<BR>
<B>2) Two bundles sent with expiration time of 10 seconds to EID that does =
no exist. Bundles 8 &amp; 9 and registrations 14 &amp; 15 are visible&nbsp;=
 </B><BR>
<BR>
<B>$ dtnping -c 1 -e 10 dtn://blahblah2/ping</B><BR>
<B>source_eid [dtn://sphere.dtn/ping.1747]</B><BR>
<B>dtn_register succeeded, regid 15</B><BR>
<BR>
<BR>
<B>$ dtnping -c 1 -e 10 dtn://blahblah1/ping</B><BR>
<B>source_eid [dtn://sphere.dtn/ping.1745]</B><BR>
<B>dtn_register succeeded, regid 14</B><BR>
<BR>
<BR>
sphere dtn% bundle list<BR>
All Bundles (2): <BR>
	8&nbsp; : dtn://sphere.dtn/ping.1745 -&gt; dtn://blahblah1/ping length 20<=
BR>
	9&nbsp; : dtn://sphere.dtn/ping.1747 -&gt; dtn://blahblah2/ping length 20<=
BR>
<BR>
sphere dtn% registration list<BR>
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]<BR>
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]<BR>
id 14: active dtn://sphere.dtn/ping.1745 (DEFER) [expiration 0]<BR>
id 15: active dtn://sphere.dtn/ping.1747 (DEFER) [expiration 0]<BR>
<BR>
sphere dtn% route dump<BR>
Route table for flood router:<BR>
<BR>
destinatio source COS&nbsp;&nbsp;&nbsp; next hop&nbsp;&nbsp;&nbsp; fwd&nbsp=
;&nbsp;&nbsp; route [custody timeout]<BR>
endpoint i&nbsp; eid&nbsp;&nbsp; BNE&nbsp;&nbsp;&nbsp; link/eid&nbsp;&nbsp;=
 action&nbsp;&nbsp; prio [min&nbsp;&nbsp; pct&nbsp;&nbsp; max]<BR>
---------------------------------------------------------------------------=
--<BR>
<BR>
Class of Service (COS) bits:<BR>
	B: Bulk&nbsp; N: Normal&nbsp; E: Expedited<BR>
<BR>
Links:<BR>
<BR>
<BR>
<B>3) After 10 seconds as expected the registration expires and bundle expi=
res. Registrations 14 &amp; 15 and bundles 8 &amp; 9 are gone from lists. A=
 signal is given by the dtnping application for both bundles.&nbsp; </B><BR=
>
<BR>
<B>PING [dtn://blahblah1/ping] (expiration 10)...</B><BR>
<B>bundle deleted at [dtn://sphere.dtn] (lifetime expired): seqno=3D0, time=
=3D10004 m</B><BR>
<BR>
<B>PING [dtn://blahblah1/ping] (expiration 10)...</B><BR>
<B>bundle deleted at [dtn://sphere.dtn] (lifetime expired): seqno=3D0, time=
=3D10002 ms</B><BR>
<BR>
sphere dtn% bundle list<BR>
All Bundles (0): <BR>
<BR>
sphere dtn% registration list<BR>
id 0: active dtn://sphere.dtn (DEFER) [expiration 0]<BR>
id 2: active dtn://sphere.dtn/ping (DEFER) [expiration 0]<BR>
<BR>
sphere dtn% route dump<BR>
Route table for flood router:<BR>
<BR>
destinatio source COS&nbsp;&nbsp;&nbsp; next hop&nbsp;&nbsp;&nbsp; fwd&nbsp=
;&nbsp;&nbsp; route [custody timeout]<BR>
endpoint i&nbsp; eid&nbsp;&nbsp; BNE&nbsp;&nbsp;&nbsp; link/eid&nbsp;&nbsp;=
 action&nbsp;&nbsp; prio [min&nbsp;&nbsp; pct&nbsp;&nbsp; max]<BR>
---------------------------------------------------------------------------=
--<BR>
<BR>
Class of Service (COS) bits:<BR>
	B: Bulk&nbsp; N: Normal&nbsp; E: Expedited<BR>
<BR>
Links:<BR>
<BR>
<BR>
<BR>
On Wed, 2009-09-30 at 14:44 -0400, Nick Fox wrote:<BR>
<BLOCKQUOTE TYPE=3DCITE>
    I am using DTN2-2.6.0 and flooding routing.&nbsp; I believe I am experi=
encing some odd behavior with the bundle expire command.<BR>
    <BR>
    Here is my test scenario:<BR>
    <BR>
    Nodes N1, N2, N3, and N4 all have entries in each others link lists.&nb=
sp; Say N1 has a dtnsend command run on it while all links are closed which=
 creates bundle B1.&nbsp; If a bundle info command is run on B1, then it is=
 &quot;queued&quot; of the following lists:all_bundles, pending_bundles, Fl=
oodBundleRouter::all_bundles, link-0:deferred, link-1:deferred, and link-2:=
deferred (link-0=3DN2, link-1=3DN3, link-2=3DN4).&nbsp; Now if the link ope=
ns with N3, the bundle is flooded to N3 and a bundle expire command is run =
on the bundle on N1.&nbsp; Here is the what I see on N1.&nbsp; Bundle list =
status =3D NOT PENDING.&nbsp; Now if bundle info is run on it, it is &quot;=
queued&quot; on the following lists:all_bundles, link-0:deferred, link-2:de=
ferred.&nbsp; If N1 now opens a link with N2 and/or N4, the bundle is still=
 flooded to the node and it is removed from the corresponding link:deferred=
 list.&nbsp; When all known nodes have been encountered, then the bundle fi=
nally disappears from the bundle list and is deleted.&nbsp; Note: if N1 wer=
e to open a link to a &quot;new&quot; node ex. N6, then the bundle would be=
 flooded to N6 as well.<BR>
    <BR>
    I am curious, is this the intended behavior of the bundle expire comman=
d? I was under the impression that expiring a bundle would simply remove it=
 from the bundle list immediately and delete the bundle.&nbsp; Also, if thi=
s is the intended behavior for bundle expire, is there a way to manually al=
ter which lists a bundle is a part of?&nbsp; <BR>
    <BR>
    Thanks in advance for your comments/suggestions.<BR>
    <BR>
    Nick Fox
<PRE>
_______________________________________________
dtn-users mailing list
<A HREF=3D"mailto:dtn-users@maillists.intel-research.net">dtn-users@maillis=
ts.intel-research.net</A>
<A HREF=3D"http://maillists.intel-research.net/mailman/listinfo/dtn-users">=
http://maillists.intel-research.net/mailman/listinfo/dtn-users</A>
</PRE>
</BLOCKQUOTE>
</BODY>
</HTML>

--=-cZtdMqsHhvPLb+EacEdl--



Received: from fg-out-1718.google.com (fg-out-1718.google.com [72.14.220.159]) by maillists.intel-research.net (8.13.8/8.13.8) with ESMTP id n9UJwIZC016831 for <dtn-users@maillists.intel-research.net>; Fri, 30 Oct 2009 12:58:19 -0700
Received: by fg-out-1718.google.com with SMTP id d23so1544629fga.16 for <dtn-users@maillists.intel-research.net>; Fri, 30 Oct 2009 12:58:21 -0700 (PDT)
Received: by 10.204.15.145 with SMTP id k17mr1421883bka.212.1256932701015; Fri, 30 Oct 2009 12:58:21 -0700 (PDT)
Received: from abel.local (93-46-211-135.ip109.fastwebnet.it [93.46.211.135]) by mx.google.com with ESMTPS id f31sm629810fkf.35.2009.10.30.12.58.20 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 30 Oct 2009 12:58:20 -0700 (PDT)
Sender: Francesco Vollero <razorinc@gmail.com>
Message-ID: <4AEB455D.70708@lilik.it>
Date: Fri, 30 Oct 2009 20:58:21 +0100
From: Francesco Vollero <raven@lilik.it>
User-Agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; it; rv:1.9.1.4pre) Gecko/20090915 Thunderbird/3.0b4
MIME-Version: 1.0
To: dtn-users@maillists.intel-research.net
Content-Type: text/plain; charset=ISO-8859-15; format=flowed
Content-Transfer-Encoding: 7bit
Subject: [dtn-users] DTN RI Configuration File
X-BeenThere: dtn-users@maillists.intel-research.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: dtn-users mailing list <dtn-users.maillists.intel-research.net>
List-Unsubscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=unsubscribe>
List-Archive: <http://maillists.intel-research.net/pipermail/dtn-users>
List-Post: <mailto:dtn-users@maillists.intel-research.net>
List-Help: <mailto:dtn-users-request@maillists.intel-research.net?subject=help>
List-Subscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=subscribe>
X-List-Received-Date: Fri, 30 Oct 2009 19:58:19 -0000

Hi,

I currently trying to create a DTN sensor network using a Fonera with 
OpenWrt and the RI of DTN2.
My network architecture consists in a certain number of nodes, which 
collect data from different sensors.
In my implementation, I choose a master node which acts as a collector 
for data coming from all the other nodes.
As any node can die or disappear at any moment, i need a way to have a 
backup master node with an associated route to use in case the chosen 
master node dies.
Is there a way to accomplish this using the RI config file?


Received: from mail-pw0-f50.google.com (mail-pw0-f50.google.com [209.85.160.50]) by maillists.intel-research.net (8.13.8/8.13.8) with ESMTP id n9R0c4in022107 for <dtn-users@mailman.dtnrg.org>; Mon, 26 Oct 2009 17:38:04 -0700
Received: by pwi4 with SMTP id 4so3714498pwi.29 for <dtn-users@mailman.dtnrg.org>; Mon, 26 Oct 2009 17:38:20 -0700 (PDT)
Received: by 10.114.51.6 with SMTP id y6mr23911445way.75.1256603899964; Mon, 26 Oct 2009 17:38:19 -0700 (PDT)
Received: from ?10.212.112.68? (bldmz-nat-161-164.berkeley.intel-research.net [12.155.161.164]) by mx.google.com with ESMTPS id 20sm1290914pzk.5.2009.10.26.17.38.16 (version=SSLv3 cipher=RC4-MD5); Mon, 26 Oct 2009 17:38:18 -0700 (PDT)
Sender: Alex McMahon <alexmcm@gmail.com>
From: Alex McMahon <alex.mcmahon@cs.tcd.ie>
To: dtn-users mailing list <dtn-users@mailman.dtnrg.org>
Content-Type: multipart/mixed; boundary="=-b9jDyyNmvIrVlMgIzBjN"
Organization: Trinity College Dublin
Date: Mon, 26 Oct 2009 17:38:15 -0700
Message-Id: <1256603895.31743.39.camel@sphere>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.1
Subject: [dtn-users] DTN2 / oasys build maintenance patches
X-BeenThere: dtn-users@maillists.intel-research.net
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: alex.mcmahon@cs.tcd.ie
List-Id: dtn-users mailing list <dtn-users.maillists.intel-research.net>
List-Unsubscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=unsubscribe>
List-Archive: <http://maillists.intel-research.net/pipermail/dtn-users>
List-Post: <mailto:dtn-users@maillists.intel-research.net>
List-Help: <mailto:dtn-users-request@maillists.intel-research.net?subject=help>
List-Subscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=subscribe>
X-List-Received-Date: Tue, 27 Oct 2009 00:38:04 -0000

--=-b9jDyyNmvIrVlMgIzBjN
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

Hi,

I have attached the exported changesets for udates, fixes and additions
to build scripts for DTN2 & oasys. I shall assume it is OK to apply
these on Monday 2nd of November unless someone objects before then. The
main changes are

1) stop creation of  symlinks in DTN2 (DTN2/oasys-->../oasys) and oasys
(oasys/include-->../oasys & oasys/share-->../oasys) and which lead to
recursion within oasys and DTN2. To do this I hae reconfigured build to
create below oasys structure if oasys is located at ../ on configuration
of DTN2:

oasys
|-- include
| `-- oasys -> ../../../oasys
|-- lib -> ../../oasys/lib
`-- share -> ../../oasys

2) Additional checks for required external packages/package versions for
DTN2 and oasys and removal of invalid checks.

3) Additional feedback on missing requirements during build of DTN2 &
oasys.	


Alex


--=-b9jDyyNmvIrVlMgIzBjN
Content-Disposition: attachment; filename="oasys-build.patch"
Content-Type: text/x-patch; name="oasys-build.patch"; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

# HG changeset patch
# User Alex McMahon <alex.mcmahon@cs.tcd.ie>
# Date 1256601516 25200
# Node ID 7afb46b9c8210363d06cffb9a8ec6ee8756f036b
# Parent  de4c4743ca6abc6fa1601b01b18bee27b7a64bf1
Stop creation of include/oasys-->../../oasys and /share-->../../oasys symli=
nks which
lead to recursion within oasys (i.e. include/oasys/include/oasy..n & share/=
oasys/share/oa..n).
Restructure of build to create below oasys structure if oasys located at ..=
/ :

oasys
|-- include
| `-- oasys -> ../../../oasys
|-- lib -> ../../oasys/lib
`-- share -> ../../oasys

Provide more searches (>than gcc 4.1 etc). Provide more feedback during bui=
ld updated make checks.

diff -r de4c4743ca6a -r 7afb46b9c821 Makefile
--- a/Makefile	Mon Jun 15 12:15:45 2009 +0100
+++ b/Makefile	Mon Oct 26 16:58:36 2009 -0700
@@ -302,9 +302,7 @@
 # Make sure the clean rule knows about which files need cleaning
 #
 CFGFILES :=3D Rules.make oasys-config.h config.cache config.log config.sta=
tus \
-	    include/oasys share/oasys
-CFGDIRS  :=3D include share
-
+CFGDIRS  :=3D=20
 $(SRCDIR)/Rules.make.in:
 	@echo SRCDIR: $(SRCDIR)
 	@echo error -- Makefile did not set SRCDIR properly
@@ -447,10 +445,6 @@
 TESTFILES :=3D $(patsubst %,test/%,$(TESTFILES))
 test tests: all $(TESTS) $(TESTFILES)
=20
-# run tests
-.PHONY: check
-check:
-	cd test; tclsh UnitTest.tcl
=20
 # tags
 .PHONY: tag tags
diff -r de4c4743ca6a -r 7afb46b9c821 README
--- a/README	Mon Jun 15 12:15:45 2009 +0100
+++ b/README	Mon Oct 26 16:58:36 2009 -0700
@@ -4,6 +4,40 @@
 OASYS is a C++ library that provides a set of wrapper classes and
 utilities for systems programming projects.
=20
+oasys/compat/           portability and compatibility logic
+oasys/debug/            debugging and logging support code
+oasys/io/               I/O and networking support code
+oasys/memory/           memory management and debugging support
+oasys/serialize/        object serialization support
+oasys/smtp/             SMTP (mail) protocol handlers
+oasys/storage/          persistant storage interface
+oasys/tclcmd/           tcl command infrastructure and support
+oasys/test/             unit tests and other test files
+oasys/thread/           thread / lock support implementation
+oasys/util/             miscellaneous utility classes
+
+External Requirements
+---------------------
+
+gcc/g++			The GNU Compiler Collection
+pthreads		libc6 - GNU C Library: Shared libraries
+make			The GNU version of the "make" utility
+tcl			The Tool Command Language [development]
+
+Optional External Packages
+--------------------------
+tclreadline		GNU Readline Extension for Tcl/Tk
+libreadline		GNU readline and history libraries [development]
+tclx			Extended Tcl - shared library
+tcllib			Standard Tcl Library
+libdb			Berkeley v4.2 - v4.7  Database Libraries [development]
+libbluetooth		BlueZ Linux Bluetooth library [development]
+libgoogle-perftools0	Libraries for CPU and heap analysis
+libxerces-cs-dev	Validating XML parser library for C++ [development]
+python			interactive high-level object-oriented language
+xsd			XML Data Binding for C++
+zlib			Compression library [runtime]
+
 Build / Installation:
 ---------------------
=20
diff -r de4c4743ca6a -r 7afb46b9c821 Rules.make.in
--- a/Rules.make.in	Mon Jun 15 12:15:45 2009 +0100
+++ b/Rules.make.in	Mon Oct 26 16:58:36 2009 -0700
@@ -112,6 +112,7 @@
 	@echo "  EXTLIB_CFLAGS: $(EXTLIB_CFLAGS)"
 	@echo "  EXTLIB_LDFLAGS: $(EXTLIB_LDFLAGS)"
=20
+
 #
 # Rule for generating a .o file from the corresponding .cc file;
 # automatically creates dependencies via the dependency flags.
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal.m4
--- a/aclocal.m4	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal.m4	Mon Oct 26 16:58:36 2009 -0700
@@ -158,7 +158,26 @@
 dnl Autoconf support for configuring whether Apple's Bonjour stack is=20
 dnl available on the system
 dnl
+AC_DEFUN(AC_BONJOUR_HELP, [
+cat <<EOF
=20
+Configure error with bonjour...
+
+The default is to try to compile in bonjour support and
+if development headers and libraries are not present
+proceed. You appear to have stated '[$ac_use_bonjour]'=20
+when asked whether bonjour support should be enabled
+Can't find the required development headers (dns_sd.h) or=20
+function (DNSServiceRegister) in dns_sd of the Avahi=20
+Apple Bonjour library.=20
+
+
+If you do not want bonjour support at all, you can specify
+--without-bonjour.
+
+
+EOF
+])
 AC_DEFUN(AC_CONFIG_BONJOUR, [
=20
     AC_ARG_WITH(bonjour,
@@ -172,16 +191,18 @@
=20
     AC_MSG_CHECKING([whether bonjour support should be enabled])
=20
-    if test "$ac_use_bonjour" =3D "no"; then
-        AC_MSG_RESULT(no)
=20
-    else
-        AC_MSG_RESULT($ac_use_bonjour)
+	if test "$ac_use_bonjour" =3D "no"; then
+	AC_MSG_RESULT(no)
+
+	else
+	AC_MSG_RESULT($ac_use_bonjour)
 =09
 	dnl look for the library and the header
 	AC_EXTLIB_PREPARE
-        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=3Dyes)
-        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=3Dye=
s)
+	AC_MSG_CHECKING([searching for the bonjour library development headers])
+        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=3Dyes, AC_MSG_RESULT=
(bonjour header not found))
+        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=3Dye=
s, AC_MSG_RESULT(function not found in bonjour library))
 	AC_EXTLIB_SAVE
=20
 	dnl print the result
@@ -195,7 +216,8 @@
           AC_MSG_RESULT(no)
=20
         else
-          AC_MSG_ERROR([can't find bonjour headers or library])
+	AC_BONJOUR_HELP
+          AC_MSG_ERROR([can't find the required development headers for th=
e Avahi Apple Bonjour library])
         fi
     fi
 ])
@@ -260,7 +282,7 @@
=20
     AC_ARG_WITH(dbver,
         AC_HELP_STRING([--with-dbver=3DVERSION],
-    		   Berkeley DB versions to try (default 4.5-4.2)),
+    		   Berkeley DB versions to try (default 4.7-4.2)),
         ac_dbvers=3D$withval)
=20
     dnl
@@ -701,8 +723,8 @@
                        ac_with_cxx=3D$withval)
    =20
     if test "x$ac_with_cc" =3D "x" ; then
-        ac_try_cc=3D"gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
-        ac_try_cxx=3D"g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
+        ac_try_cc=3D"gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
+        ac_try_cxx=3D"g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
     else
         ac_try_cc=3D$ac_with_cc
=20
@@ -1304,13 +1326,17 @@
        AC_DEFINE_UNQUOTED(LIBMYSQLD_ENABLED, 1,=20
            [whether the mysql embedded server is enabled])
=20
-       AC_SEARCH_LIBS(request_init, wrap, [],=20
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for request_i=
nit() in libwrap])
+	AC_SEARCH_LIBS(request_init, wrap, [],=20
                       AC_MSG_ERROR([can't find request_init() in libwrap])=
)
-       AC_SEARCH_LIBS(exp, m, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for exp() in =
libm])
+	AC_SEARCH_LIBS(exp, m, [],
                       AC_MSG_ERROR([can't find exp() in libm]))
-       AC_SEARCH_LIBS(crypt, crypt, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for crypt() i=
n libcrypt])
+	AC_SEARCH_LIBS(crypt, crypt, [],
                       AC_MSG_ERROR([can't find crypt() in libcrypt]))
-       AC_SEARCH_LIBS(compress, z, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for compress(=
) in libz])
+	AC_SEARCH_LIBS(compress, z, [],
                       AC_MSG_ERROR([can't find compress() in libz]))
     fi
=20
@@ -1442,6 +1468,39 @@
         AC_MSG_ERROR([can't find usable mysql library])
     fi
 ])
+
+dnl
+dnl Check if oasys has support for the given feature. Returns result
+dnl in ac_oasys_supports_result.
+dnl
+AC_DEFUN(AC_OASYS_SUPPORTS, [
+    AC_MSG_CHECKING(whether oasys is configured with $1)
+
+    if test x$cv_oasys_supports_$1 !=3D x ; then
+        ac_oasys_supports_result=3D$cv_oasys_supports_$1
+        AC_MSG_RESULT($ac_oasys_supports_result (cached))
+    else
+
+    ac_save_CPPFLAGS=3D"$CPPFLAGS"
+    CPPFLAGS=3D"$CPPFLAGS -I$OASYS_INCDIR"
+    AC_LINK_IFELSE(
+      AC_LANG_PROGRAM(
+        [
+            #include <oasys/oasys-config.h>
+            #ifndef $1
+            #error $1 not configured
+            #endif
+        ], [] ),
+      ac_oasys_supports_result=3Dyes,
+      ac_oasys_supports_result=3Dno)
+
+    cv_oasys_supports_$1=3D$ac_oasys_supports_result
+   =20
+    AC_MSG_RESULT([$ac_oasys_supports_result])
+    CPPFLAGS=3D$ac_save_CPPFLAGS
+
+    fi
+])
 dnl
 dnl    Copyright 2007 Intel Corporation
 dnl=20
@@ -1465,7 +1524,7 @@
=20
 AC_DEFUN(AC_OASYS_CONFIG_HELP, [
 cat <<EOF
-
+   =20
 Configure error finding oasys.
=20
 This script first looks for an oasys installation in the same location
@@ -1479,6 +1538,11 @@
 If problems still exist, then look in the config.log to see exactly
 what the failing command was.
=20
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)=20
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.=20
+You will then probably have to run ./configure and make =20
+in the oasys code tree in order to be able to compile DTN2
+
 EOF
=20
 ])
@@ -1503,36 +1567,49 @@
=20
     ac_oasysdir_ver=3D`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_=
base.* | tail -1`
     if test "$ac_oasysdir" =3D "" ; then
-       if test -d "$ac_oasysdir_ver" ; then
-          ac_oasysdir=3D$ac_oasysdir_ver
-       elif test -d ../oasys ; then
-          ac_oasysdir=3D../oasys
-       else
-          ac_oasysdir=3D/usr
-       fi
+	if test -d "$ac_oasysdir_ver" ; then
+	    ac_oasysdir=3D$ac_oasysdir_ver
+	elif test -d ../oasys ; then
+	    ac_oasysdir=3D../oasys
+
+	else
+	    ac_oasysdir=3D/usr
+	    # Set the oasys paths properly. OASYS_INCDIR points to the parent
+	    # directory containing the oasys header files or the source
+	    # directory itself with a symlink (include/oasys -> .),
+	    # OASYS_LIBDIR points to the directory where the libraries are.
+	    # OASYS_ETCDIR points to where the various scripts are.
+	    #
+	    OASYS_INCDIR=3D"$ac_oasysdir/include"
+	    OASYS_LIBDIR=3D"$ac_oasysdir/lib"
+	    OASYS_ETCDIR=3D"$ac_oasysdir/share/oasys"
+	fi
+    	if test -d oasys ; then
+	    	rm -rf oasys
+	fi
+	    mkdir oasys oasys/include
+	    OASYS_INCDIR=3D"oasys/include/oasys"
+	    OASYS_LIBDIR=3D"oasys/lib"
+	    OASYS_ETCDIR=3D"oasys/share"
+	    ln -s ../../$ac_oasysdir $OASYS_INCDIR
+	    ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
+	    ln -s ../$ac_oasysdir $OASYS_ETCDIR
     fi
=20
     #
-    # Set the oasys paths properly. OASYS_INCDIR points to the parent
-    # directory containing the oasys header files or the source
-    # directory itself with a symlink (include/oasys -> .),
-    # OASYS_LIBDIR points to the directory where the libraries are.
-    # OASYS_ETCDIR points to where the various scripts are.
-    #
-    OASYS_INCDIR=3D"$ac_oasysdir/include"
-    OASYS_LIBDIR=3D"$ac_oasysdir/lib"
-    OASYS_ETCDIR=3D"$ac_oasysdir/share/oasys"
-
-    if test ! -d $OASYS_INCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
+    if test ! -d $OASYS_INCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
     fi
=20
-    if test ! -d $OASYS_LIBDIR ; then
-       AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
+    if test ! -d $OASYS_LIBDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
     fi
=20
-    if test ! -d $OASYS_ETCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
+    if test ! -d $OASYS_ETCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
     fi
=20
     if test "$ac_oasysver_major" =3D "" ; then
@@ -1554,31 +1631,27 @@
     ac_save_LDFLAGS=3D$LDFLAGS
     LDFLAGS=3D"$LDFLAGS $OASYS_LDFLAGS"
     AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-      [
+	AC_LANG_PROGRAM(
+    [
 	#include <oasys/oasys-version.h>
 	#if (OASYS_VERSION_MAJOR !=3D ${ac_oasysver_major}) || \
             (OASYS_VERSION_MINOR <  ${ac_oasysver_minor})
 	#error incorrect oasys version (wanted ${ac_oasysver_major}.${ac_oasysver=
_minor})
 	#endif
-      ],=20
-      [
-          const char* s =3D oasys_version;
-	  (void)s;
-      ]),
-      [=20
-          AC_MSG_RESULT($ac_oasysdir)
-      ],
-      [
-          AC_MSG_RESULT([no])
-	  AC_MSG_ERROR([can't find compatible oasys install (version $ac_oasysver=
_major.$ac_oasysver_minor or better) at $ac_oasysdir])
+    ],=20
+    [
+	const char* s =3D oasys_version;
+	(void)s;
+    ]),
+    [=20
+    AC_MSG_RESULT($ac_oasysdir)
+    ],
+    [
+    AC_MSG_RESULT([no])
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR([Can't find compatible oasys libraries which are a requir=
ed for DTN2.])=20
       ])
=20
-    #
-    # Create a symlink to the oasys directory for the test scripts
-    #
-    ln -s $ac_oasysdir oasys
-
     CFLAGS=3D$ac_save_CFLAGS
     LDFLAGS=3D$ac_save_LDFLAGS
 ])
@@ -1627,39 +1700,6 @@
     AC_SUBST(SYS_EXTLIB_CFLAGS)
     AC_SUBST(SYS_EXTLIB_LDFLAGS)
 ])
-
-dnl
-dnl Check if oasys has support for the given feature. Returns result
-dnl in ac_oasys_supports_result.
-dnl
-AC_DEFUN(AC_OASYS_SUPPORTS, [
-    AC_MSG_CHECKING(whether oasys is configured with $1)
-
-    if test x$cv_oasys_supports_$1 !=3D x ; then
-        ac_oasys_supports_result=3D$cv_oasys_supports_$1
-        AC_MSG_RESULT($ac_oasys_supports_result (cached))
-    else
-
-    ac_save_CPPFLAGS=3D"$CPPFLAGS"
-    CPPFLAGS=3D"$CPPFLAGS -I$OASYS_INCDIR"
-    AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-        [
-            #include <oasys/oasys-config.h>
-            #ifndef $1
-            #error $1 not configured
-            #endif
-        ], [] ),
-      ac_oasys_supports_result=3Dyes,
-      ac_oasys_supports_result=3Dno)
-
-    cv_oasys_supports_$1=3D$ac_oasys_supports_result
-   =20
-    AC_MSG_RESULT([$ac_oasys_supports_result])
-    CPPFLAGS=3D$ac_save_CPPFLAGS
-
-    fi
-])
 dnl
 dnl    Copyright 2005-2006 Intel Corporation
 dnl=20
@@ -2152,14 +2192,14 @@
=20
     AC_ARG_WITH(tclver,
         AC_HELP_STRING([--with-tclver=3DVERSION],
-    		   [tcl version to use (default 8.4 or 8.3)]),
+    		   [tcl version to use (default 8.5 - 8.3)]),
         ac_tclvers=3D$withval)
=20
     dnl
     dnl We don't accept --without-tcl
     dnl
     if test $ac_tcldir =3D no ; then
-       AC_MSG_ERROR([cannot configure without tcl])
+       AC_MSG_ERROR([tcl MUST be installed to configure])
     fi
=20
     dnl
@@ -2167,9 +2207,9 @@
     dnl
     AC_EXTLIB_PREPARE
     AC_SEARCH_LIBS(pow, m, [],
-      AC_MSG_ERROR([can't find required library function (pow)]))
+      AC_MSG_ERROR([can't find standard C library function (pow) required =
by tcl]))
     AC_SEARCH_LIBS(dlopen, dl, [],
-      AC_MSG_ERROR([can't find required library function (dlopen)]))
+      AC_MSG_ERROR([can't find standard library function (dlopen) required=
 by tcl]))
     AC_EXTLIB_SAVE
=20
     dnl
@@ -2177,8 +2217,8 @@
     dnl specified something with --with-tcl, in which case we force=20
     dnl it to redo the checks (i.e. ignore the cached values).
     dnl
-    if test $ac_tcldir =3D system -a ! x$oasys_cv_path_tcl_h =3D x ; then
-        echo "checking for tcl installation... (cached) $oasys_cv_path_tcl=
_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
+    if test $ac_tcldir =3D system -a ! x$oasys_cv_path_tcl_h =3D x ; then =
\
+	echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.=
h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
     else
         AC_FIND_TCL
     fi
@@ -2214,9 +2254,9 @@
         ac_tcldir=3Dsystem
         ac_tclincdirs=3D"/usr/include /usr/local/include"
 	for ac_tclver in $ac_tclvers ; do
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver"
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/local/include/tcl$ac_tclve=
r"
-        done
+           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver /usr=
/local/include/tcl$ac_tclver"
+           ac_tclincdirs=3D"$ac_tclincdirs"
+       done
         ac_tcllibdirs=3D"/usr/lib /usr/local/lib"
     else
         ac_tclincdirs=3D$ac_tcldir/include
@@ -2318,7 +2358,7 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test x$oasys_cv_path_tcl_h =3D x ; then
-        AC_MSG_ERROR([can't find usable tcl.h])
+        AC_MSG_ERROR([Please install the tcl development files headers and=
 libraries. Can't find usable tcl.h ])
     fi
 ])
 dnl
@@ -2342,20 +2382,50 @@
 dnl
=20
 dnl
+dnl help=20
+dnl
+AC_DEFUN(AC_TCLRL_HELP, [
+cat <<EOF
+
+Configure error with tclreadline...
+
+If you do not want tclreadline support at all, you can specify
+--without-tclreadline.
+
+Download tclreadline from http://tclreadline.sourceforge.net/
+
+Before trying to compile tclreadline you should do the following things:
+
+    (a) Make sure you have tcl 8.0 or higher.
+        tclreadline relies on a proper tcl installation:
+        It uses the tclConfig.sh file, which should reside somewhere
+        in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
+
+    (b) Make sure you have gnu readline 2.2 or higher.
+        tclreadline uses the gnu readline callback handler
+
+    (c) The usual ./configure; make; make install sequence should do the r=
est.
+
+
+EOF
+
+])
+dnl
 dnl Main macro for finding a usable db installation=20
 dnl
 AC_DEFUN(AC_CONFIG_TCLREADLINE, [
+#ac_tclreadlinedir=3D'system'
+
     AC_ARG_WITH(tclreadline,
         AC_HELP_STRING([--with-tclreadline],
     		   [enable or disable tclreadline (default try)]),
         [ac_tclreadline=3D$withval],
         [ac_tclreadline=3Dtry])
=20
-    AC_MSG_CHECKING([whether tclreadline support should be enabled])
-
     dnl
     dnl First make sure we even want it
     dnl
+	AC_MSG_CHECKING([whether tclreadline support should be enabled])
     if test "$ac_tclreadline" =3D no ; then
     AC_MSG_RESULT([no])
     TCLREADLINE_ENABLED=3D0
@@ -2377,11 +2447,13 @@
     if test $BUILD_SYSTEM =3D 'CYGWIN' ; then
         TCLREADLINE_ENABLED=3D0
     else=20
-        AC_EXTLIB_PREPARE
-        AC_SEARCH_LIBS(readline,=20
-                       readline,=20
-	    	       [TCLREADLINE_ENABLED=3D1],
-	    	       [TCLREADLINE_ENABLED=3D0])
+    dnl=09
+    dnl look for the library and the header
+    dnl
+	AC_EXTLIB_PREPARE
+        AC_MSG_CHECKING([searching for the readline library development he=
aders])
+        AC_CHECK_HEADERS([readline/readline.h], TCLREADLINE_ENABLED=3D1, T=
CLREADLINE_ENABLED=3D0)
+	AC_SEARCH_LIBS(readline, readline, TCLREADLINE_ENABLED=3D1, TCLREADLINE_E=
NABLED=3D0)
         AC_EXTLIB_SAVE
     fi
=20
@@ -2389,7 +2461,7 @@
     dnl Find out if we're using the BSD libedit implementation of=20
     dnl readline functionality.
     dnl
-    if test $TCLREADLINE_ENABLED =3D 1 ; then
+    if test "$TCLREADLINE_ENABLED" =3D 1; then
          AC_CACHE_CHECK([whether readline is GNU readline or BSD editline]=
,
 	  	        [oasys_cv_readline_is_editline],
  		        [AC_LINK_IFELSE([AC_LANG_CALL([], [rl_extend_line_buffer])],
@@ -2403,10 +2475,16 @@
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
         AC_MSG_RESULT([yes])
+
     else
+
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
-        AC_MSG_RESULT([no])
+	AC_MSG_RESULT([no])
+	if test "$ac_tclreadline" =3D yes; then
+	AC_TCLRL_HELP
+	AC_MSG_ERROR([can't find usable tclreadline])
+	fi
     fi
=20
     fi # ac_tclreadline !=3D no
@@ -2457,6 +2535,9 @@
     if test "$ac_with_xerces_c" =3D no; then
         AC_MSG_RESULT([no])
         XERCES_C_ENABLED=3D0
+	echo ""
+	AC_MSG_NOTICE([Proceeding without xerces-c support as requested])
+	echo ""
     else
=20
     dnl
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/bonjour.ac
--- a/aclocal/bonjour.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/bonjour.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -18,7 +18,26 @@
 dnl Autoconf support for configuring whether Apple's Bonjour stack is=20
 dnl available on the system
 dnl
+AC_DEFUN(AC_BONJOUR_HELP, [
+cat <<EOF
=20
+Configure error with bonjour...
+
+The default is to try to compile in bonjour support and
+if development headers and libraries are not present
+proceed. You appear to have stated '[$ac_use_bonjour]'=20
+when asked whether bonjour support should be enabled
+Can't find the required development headers (dns_sd.h) or=20
+function (DNSServiceRegister) in dns_sd of the Avahi=20
+Apple Bonjour library.=20
+
+
+If you do not want bonjour support at all, you can specify
+--without-bonjour.
+
+
+EOF
+])
 AC_DEFUN(AC_CONFIG_BONJOUR, [
=20
     AC_ARG_WITH(bonjour,
@@ -32,16 +51,18 @@
=20
     AC_MSG_CHECKING([whether bonjour support should be enabled])
=20
-    if test "$ac_use_bonjour" =3D "no"; then
-        AC_MSG_RESULT(no)
=20
-    else
-        AC_MSG_RESULT($ac_use_bonjour)
+	if test "$ac_use_bonjour" =3D "no"; then
+	AC_MSG_RESULT(no)
+
+	else
+	AC_MSG_RESULT($ac_use_bonjour)
 =09
 	dnl look for the library and the header
 	AC_EXTLIB_PREPARE
-        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=3Dyes)
-        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=3Dye=
s)
+	AC_MSG_CHECKING([searching for the bonjour library development headers])
+        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=3Dyes, AC_MSG_RESULT=
(bonjour header not found))
+        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=3Dye=
s, AC_MSG_RESULT(function not found in bonjour library))
 	AC_EXTLIB_SAVE
=20
 	dnl print the result
@@ -55,7 +76,8 @@
           AC_MSG_RESULT(no)
=20
         else
-          AC_MSG_ERROR([can't find bonjour headers or library])
+	AC_BONJOUR_HELP
+          AC_MSG_ERROR([can't find the required development headers for th=
e Avahi Apple Bonjour library])
         fi
     fi
 ])
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/db.ac
--- a/aclocal/db.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/db.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -59,7 +59,7 @@
=20
     AC_ARG_WITH(dbver,
         AC_HELP_STRING([--with-dbver=3DVERSION],
-    		   Berkeley DB versions to try (default 4.5-4.2)),
+    		   Berkeley DB versions to try (default 4.7-4.2)),
         ac_dbvers=3D$withval)
=20
     dnl
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/gcc.ac
--- a/aclocal/gcc.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/gcc.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -35,8 +35,8 @@
                        ac_with_cxx=3D$withval)
    =20
     if test "x$ac_with_cc" =3D "x" ; then
-        ac_try_cc=3D"gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
-        ac_try_cxx=3D"g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
+        ac_try_cc=3D"gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
+        ac_try_cxx=3D"g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
     else
         ac_try_cc=3D$ac_with_cc
=20
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/mysql.ac
--- a/aclocal/mysql.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/mysql.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -53,13 +53,17 @@
        AC_DEFINE_UNQUOTED(LIBMYSQLD_ENABLED, 1,=20
            [whether the mysql embedded server is enabled])
=20
-       AC_SEARCH_LIBS(request_init, wrap, [],=20
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for request_i=
nit() in libwrap])
+	AC_SEARCH_LIBS(request_init, wrap, [],=20
                       AC_MSG_ERROR([can't find request_init() in libwrap])=
)
-       AC_SEARCH_LIBS(exp, m, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for exp() in =
libm])
+	AC_SEARCH_LIBS(exp, m, [],
                       AC_MSG_ERROR([can't find exp() in libm]))
-       AC_SEARCH_LIBS(crypt, crypt, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for crypt() i=
n libcrypt])
+	AC_SEARCH_LIBS(crypt, crypt, [],
                       AC_MSG_ERROR([can't find crypt() in libcrypt]))
-       AC_SEARCH_LIBS(compress, z, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for compress(=
) in libz])
+	AC_SEARCH_LIBS(compress, z, [],
                       AC_MSG_ERROR([can't find compress() in libz]))
     fi
=20
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/oasys.ac
--- a/aclocal/oasys.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/oasys.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -21,7 +21,7 @@
=20
 AC_DEFUN(AC_OASYS_CONFIG_HELP, [
 cat <<EOF
-
+   =20
 Configure error finding oasys.
=20
 This script first looks for an oasys installation in the same location
@@ -35,6 +35,11 @@
 If problems still exist, then look in the config.log to see exactly
 what the failing command was.
=20
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)=20
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.=20
+You will then probably have to run ./configure and make =20
+in the oasys code tree in order to be able to compile DTN2
+
 EOF
=20
 ])
@@ -59,36 +64,49 @@
=20
     ac_oasysdir_ver=3D`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_=
base.* | tail -1`
     if test "$ac_oasysdir" =3D "" ; then
-       if test -d "$ac_oasysdir_ver" ; then
-          ac_oasysdir=3D$ac_oasysdir_ver
-       elif test -d ../oasys ; then
-          ac_oasysdir=3D../oasys
-       else
-          ac_oasysdir=3D/usr
-       fi
+	if test -d "$ac_oasysdir_ver" ; then
+	    ac_oasysdir=3D$ac_oasysdir_ver
+	elif test -d ../oasys ; then
+	    ac_oasysdir=3D../oasys
+
+	else
+	    ac_oasysdir=3D/usr
+	    # Set the oasys paths properly. OASYS_INCDIR points to the parent
+	    # directory containing the oasys header files or the source
+	    # directory itself with a symlink (include/oasys -> .),
+	    # OASYS_LIBDIR points to the directory where the libraries are.
+	    # OASYS_ETCDIR points to where the various scripts are.
+	    #
+	    OASYS_INCDIR=3D"$ac_oasysdir/include"
+	    OASYS_LIBDIR=3D"$ac_oasysdir/lib"
+	    OASYS_ETCDIR=3D"$ac_oasysdir/share/oasys"
+	fi
+    	if test -d oasys ; then
+	    	rm -rf oasys
+	fi
+	    mkdir oasys oasys/include
+	    OASYS_INCDIR=3D"oasys/include/oasys"
+	    OASYS_LIBDIR=3D"oasys/lib"
+	    OASYS_ETCDIR=3D"oasys/share"
+	    ln -s ../../$ac_oasysdir $OASYS_INCDIR
+	    ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
+	    ln -s ../$ac_oasysdir $OASYS_ETCDIR
     fi
=20
     #
-    # Set the oasys paths properly. OASYS_INCDIR points to the parent
-    # directory containing the oasys header files or the source
-    # directory itself with a symlink (include/oasys -> .),
-    # OASYS_LIBDIR points to the directory where the libraries are.
-    # OASYS_ETCDIR points to where the various scripts are.
-    #
-    OASYS_INCDIR=3D"$ac_oasysdir/include"
-    OASYS_LIBDIR=3D"$ac_oasysdir/lib"
-    OASYS_ETCDIR=3D"$ac_oasysdir/share/oasys"
-
-    if test ! -d $OASYS_INCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
+    if test ! -d $OASYS_INCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
     fi
=20
-    if test ! -d $OASYS_LIBDIR ; then
-       AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
+    if test ! -d $OASYS_LIBDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
     fi
=20
-    if test ! -d $OASYS_ETCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
+    if test ! -d $OASYS_ETCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
     fi
=20
     if test "$ac_oasysver_major" =3D "" ; then
@@ -110,31 +128,27 @@
     ac_save_LDFLAGS=3D$LDFLAGS
     LDFLAGS=3D"$LDFLAGS $OASYS_LDFLAGS"
     AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-      [
+	AC_LANG_PROGRAM(
+    [
 	#include <oasys/oasys-version.h>
 	#if (OASYS_VERSION_MAJOR !=3D ${ac_oasysver_major}) || \
             (OASYS_VERSION_MINOR <  ${ac_oasysver_minor})
 	#error incorrect oasys version (wanted ${ac_oasysver_major}.${ac_oasysver=
_minor})
 	#endif
-      ],=20
-      [
-          const char* s =3D oasys_version;
-	  (void)s;
-      ]),
-      [=20
-          AC_MSG_RESULT($ac_oasysdir)
-      ],
-      [
-          AC_MSG_RESULT([no])
-	  AC_MSG_ERROR([can't find compatible oasys install (version $ac_oasysver=
_major.$ac_oasysver_minor or better) at $ac_oasysdir])
+    ],=20
+    [
+	const char* s =3D oasys_version;
+	(void)s;
+    ]),
+    [=20
+    AC_MSG_RESULT($ac_oasysdir)
+    ],
+    [
+    AC_MSG_RESULT([no])
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR([Can't find compatible oasys libraries which are a requir=
ed for DTN2.])=20
       ])
=20
-    #
-    # Create a symlink to the oasys directory for the test scripts
-    #
-    ln -s $ac_oasysdir oasys
-
     CFLAGS=3D$ac_save_CFLAGS
     LDFLAGS=3D$ac_save_LDFLAGS
 ])
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/tcl.ac
--- a/aclocal/tcl.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/tcl.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -37,14 +37,14 @@
=20
     AC_ARG_WITH(tclver,
         AC_HELP_STRING([--with-tclver=3DVERSION],
-    		   [tcl version to use (default 8.4 or 8.3)]),
+    		   [tcl version to use (default 8.5 - 8.3)]),
         ac_tclvers=3D$withval)
=20
     dnl
     dnl We don't accept --without-tcl
     dnl
     if test $ac_tcldir =3D no ; then
-       AC_MSG_ERROR([cannot configure without tcl])
+       AC_MSG_ERROR([tcl MUST be installed to configure])
     fi
=20
     dnl
@@ -52,9 +52,9 @@
     dnl
     AC_EXTLIB_PREPARE
     AC_SEARCH_LIBS(pow, m, [],
-      AC_MSG_ERROR([can't find required library function (pow)]))
+      AC_MSG_ERROR([can't find standard C library function (pow) required =
by tcl]))
     AC_SEARCH_LIBS(dlopen, dl, [],
-      AC_MSG_ERROR([can't find required library function (dlopen)]))
+      AC_MSG_ERROR([can't find standard library function (dlopen) required=
 by tcl]))
     AC_EXTLIB_SAVE
=20
     dnl
@@ -62,8 +62,8 @@
     dnl specified something with --with-tcl, in which case we force=20
     dnl it to redo the checks (i.e. ignore the cached values).
     dnl
-    if test $ac_tcldir =3D system -a ! x$oasys_cv_path_tcl_h =3D x ; then
-        echo "checking for tcl installation... (cached) $oasys_cv_path_tcl=
_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
+    if test $ac_tcldir =3D system -a ! x$oasys_cv_path_tcl_h =3D x ; then =
\
+	echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.=
h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
     else
         AC_FIND_TCL
     fi
@@ -99,9 +99,9 @@
         ac_tcldir=3Dsystem
         ac_tclincdirs=3D"/usr/include /usr/local/include"
 	for ac_tclver in $ac_tclvers ; do
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver"
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/local/include/tcl$ac_tclve=
r"
-        done
+           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver /usr=
/local/include/tcl$ac_tclver"
+           ac_tclincdirs=3D"$ac_tclincdirs"
+       done
         ac_tcllibdirs=3D"/usr/lib /usr/local/lib"
     else
         ac_tclincdirs=3D$ac_tcldir/include
@@ -203,6 +203,6 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test x$oasys_cv_path_tcl_h =3D x ; then
-        AC_MSG_ERROR([can't find usable tcl.h])
+        AC_MSG_ERROR([Please install the tcl development files headers and=
 libraries. Can't find usable tcl.h ])
     fi
 ])
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/tclreadline.ac
--- a/aclocal/tclreadline.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/tclreadline.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -19,20 +19,50 @@
 dnl
=20
 dnl
+dnl help=20
+dnl
+AC_DEFUN(AC_TCLRL_HELP, [
+cat <<EOF
+
+Configure error with tclreadline...
+
+If you do not want tclreadline support at all, you can specify
+--without-tclreadline.
+
+Download tclreadline from http://tclreadline.sourceforge.net/
+
+Before trying to compile tclreadline you should do the following things:
+
+    (a) Make sure you have tcl 8.0 or higher.
+        tclreadline relies on a proper tcl installation:
+        It uses the tclConfig.sh file, which should reside somewhere
+        in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
+
+    (b) Make sure you have gnu readline 2.2 or higher.
+        tclreadline uses the gnu readline callback handler
+
+    (c) The usual ./configure; make; make install sequence should do the r=
est.
+
+
+EOF
+
+])
+dnl
 dnl Main macro for finding a usable db installation=20
 dnl
 AC_DEFUN(AC_CONFIG_TCLREADLINE, [
+#ac_tclreadlinedir=3D'system'
+
     AC_ARG_WITH(tclreadline,
         AC_HELP_STRING([--with-tclreadline],
     		   [enable or disable tclreadline (default try)]),
         [ac_tclreadline=3D$withval],
         [ac_tclreadline=3Dtry])
=20
-    AC_MSG_CHECKING([whether tclreadline support should be enabled])
-
     dnl
     dnl First make sure we even want it
     dnl
+	AC_MSG_CHECKING([whether tclreadline support should be enabled])
     if test "$ac_tclreadline" =3D no ; then
     AC_MSG_RESULT([no])
     TCLREADLINE_ENABLED=3D0
@@ -54,11 +84,13 @@
     if test $BUILD_SYSTEM =3D 'CYGWIN' ; then
         TCLREADLINE_ENABLED=3D0
     else=20
-        AC_EXTLIB_PREPARE
-        AC_SEARCH_LIBS(readline,=20
-                       readline,=20
-	    	       [TCLREADLINE_ENABLED=3D1],
-	    	       [TCLREADLINE_ENABLED=3D0])
+    dnl=09
+    dnl look for the library and the header
+    dnl
+	AC_EXTLIB_PREPARE
+        AC_MSG_CHECKING([searching for the readline library development he=
aders])
+        AC_CHECK_HEADERS([readline/readline.h], TCLREADLINE_ENABLED=3D1, T=
CLREADLINE_ENABLED=3D0)
+	AC_SEARCH_LIBS(readline, readline, TCLREADLINE_ENABLED=3D1, TCLREADLINE_E=
NABLED=3D0)
         AC_EXTLIB_SAVE
     fi
=20
@@ -66,7 +98,7 @@
     dnl Find out if we're using the BSD libedit implementation of=20
     dnl readline functionality.
     dnl
-    if test $TCLREADLINE_ENABLED =3D 1 ; then
+    if test "$TCLREADLINE_ENABLED" =3D 1; then
          AC_CACHE_CHECK([whether readline is GNU readline or BSD editline]=
,
 	  	        [oasys_cv_readline_is_editline],
  		        [AC_LINK_IFELSE([AC_LANG_CALL([], [rl_extend_line_buffer])],
@@ -80,10 +112,16 @@
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
         AC_MSG_RESULT([yes])
+
     else
+
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
-        AC_MSG_RESULT([no])
+	AC_MSG_RESULT([no])
+	if test "$ac_tclreadline" =3D yes; then
+	AC_TCLRL_HELP
+	AC_MSG_ERROR([can't find usable tclreadline])
+	fi
     fi
=20
     fi # ac_tclreadline !=3D no
diff -r de4c4743ca6a -r 7afb46b9c821 aclocal/xerces-c.ac
--- a/aclocal/xerces-c.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/aclocal/xerces-c.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -41,6 +41,9 @@
     if test "$ac_with_xerces_c" =3D no; then
         AC_MSG_RESULT([no])
         XERCES_C_ENABLED=3D0
+	echo ""
+	AC_MSG_NOTICE([Proceeding without xerces-c support as requested])
+	echo ""
     else
=20
     dnl
diff -r de4c4743ca6a -r 7afb46b9c821 configure
--- a/configure	Mon Jun 15 12:15:45 2009 +0100
+++ b/configure	Mon Oct 26 16:58:36 2009 -0700
@@ -1,10 +1,10 @@
 #! /bin/sh
 # From configure.ac -- DO NOT EDIT THIS FILE!  See the instructions in con=
figure.ac --.
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61.
+# Generated by GNU Autoconf 2.63.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
@@ -33,7 +33,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=3D:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'=3D'"$@"'
   setopt NO_GLOB_SUBST
@@ -55,17 +55,45 @@
 as_cr_digits=3D'0123456789'
 as_cr_alnum=3D$as_cr_Letters$as_cr_digits
=20
+as_nl=3D'
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo=3D'\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\=
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=3D$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=3D$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" =3D "X$as_echo") 2>/dev/null; then
+  as_echo=3D'printf %s\n'
+  as_echo_n=3D'printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" =3D "X-n $as_ech=
o"; then
+    as_echo_body=3D'eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n=3D'/usr/ucb/echo -n'
+  else
+    as_echo_body=3D'eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body=3D'eval
+      arg=3D$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=3D`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n=3D'sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo=3D'sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" !=3D set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=3D';'
-  else
-    PATH_SEPARATOR=3D:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=3D:
+  (PATH=3D'/bin;/bin'; FPATH=3D$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH=3D'/bin:/bin'; FPATH=3D$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=3D';'
+  }
 fi
=20
 # Support unset when possible.
@@ -81,8 +109,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl=3D'
-'
 IFS=3D" ""	$as_nl"
=20
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -105,7 +131,7 @@
   as_myself=3D$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file=
 name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute =
file name" >&2
   { (exit 1); exit 1; }
 fi
=20
@@ -118,17 +144,10 @@
 PS4=3D'+ '
=20
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
-    eval $as_var=3DC; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=3DC
+export LC_ALL
+LANGUAGE=3DC
+export LANGUAGE
=20
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -150,7 +169,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -176,7 +195,7 @@
   as_have_required=3Dno
 fi
=20
-  if test $as_have_required =3D yes && 	 (eval ":
+  if test $as_have_required =3D yes &&	 (eval ":
 (as_func_return () {
   (exit \$1)
 }
@@ -258,7 +277,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=3D:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'=3D'"$@"'
   setopt NO_GLOB_SUBST
@@ -279,7 +298,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=3D:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'=3D'"$@"'
   setopt NO_GLOB_SUBST
@@ -359,10 +378,10 @@
=20
       if test "x$CONFIG_SHELL" !=3D x; then
   for as_var in BASH_ENV ENV
-        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-        done
-        export CONFIG_SHELL
-        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+	done
+	export CONFIG_SHELL
+	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
 fi
=20
=20
@@ -431,9 +450,10 @@
=20
 test \$exitcode =3D 0") || {
   echo No shell found that supports shell functions.
-  echo Please tell autoconf@gnu.org about your system,
-  echo including any error possibly output before this
-  echo message
+  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.
 }
=20
=20
@@ -469,7 +489,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX=
 shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a P=
OSIX shell" >&2
    { (exit 1); exit 1; }; }
=20
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -497,7 +517,6 @@
 *)
   ECHO_N=3D'-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" =3D X001; then
   as_expr=3Dexpr
@@ -510,19 +529,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=3D'ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=3D'ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executabl=
e.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s=3D'cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=3Dln
+  else
     as_ln_s=3D'cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=3Dln
+  fi
 else
   as_ln_s=3D'cp -p'
 fi
@@ -547,10 +569,10 @@
   as_test_x=3D'
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -633,101 +655,139 @@
 # include <unistd.h>
 #endif"
=20
-ac_subst_vars=3D'SHELL
+ac_subst_vars=3D'LTLIBOBJS
+LIBOBJS
+SUBDIR
+SYS_EXTLIB_LDFLAGS
+SYS_EXTLIB_CFLAGS
+EXTLIB_LDFLAGS
+EXTLIB_CFLAGS
+OASYS_VERSION
+OASYS_COMPAT_LDFLAGS
+OASYS_LDFLAGS_STATIC
+OASYS_LDFLAGS
+OASYS_ETCDIR
+OASYS_LIBDIR
+OASYS_INCDIR
+INCFLAGS
+XSD_TOOL
+CXXCPP
+TCL_LDFLAGS
+PYTHON_BUILD_EXT
+PYTHON
+SYS_CFLAGS
+EGREP
+GREP
+SET_MAKE
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+AWK
+BUILD_SYSTEM
+EXTRA_LDFLAGS
+EXTRA_CFLAGS
+LDFLAGS_SHLIB
+RPATH
+PICFLAGS
+SHLIB_EXT
+SHLIBS
+STATIC
+PROFILE
+OPTIMIZE_WARN
+OPTIMIZE
+DEBUG
+RANLIB
+AR
+DEPFLAGS
+CPP
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+TARGET
+BUILDDIR
+SRCDIR
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
 PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-SRCDIR
-BUILDDIR
-TARGET
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-CPP
-DEPFLAGS
-AR
-RANLIB
-DEBUG
-OPTIMIZE
-OPTIMIZE_WARN
-PROFILE
-STATIC
-SHLIBS
-SHLIB_EXT
-PICFLAGS
-RPATH
-LDFLAGS_SHLIB
-EXTRA_CFLAGS
-EXTRA_LDFLAGS
-BUILD_SYSTEM
-AWK
-INSTALL_PROGRAM
-INSTALL_SCRIPT
-INSTALL_DATA
-SET_MAKE
-GREP
-EGREP
-SYS_CFLAGS
-PYTHON
-PYTHON_BUILD_EXT
-TCL_LDFLAGS
-XSD_TOOL
-INCFLAGS
-OASYS_INCDIR
-OASYS_LIBDIR
-OASYS_ETCDIR
-OASYS_LDFLAGS
-OASYS_LDFLAGS_STATIC
-OASYS_COMPAT_LDFLAGS
-OASYS_VERSION
-EXTLIB_CFLAGS
-EXTLIB_LDFLAGS
-SYS_EXTLIB_CFLAGS
-SYS_EXTLIB_LDFLAGS
-SUBDIR
-LIBOBJS
-LTLIBOBJS'
+SHELL'
 ac_subst_files=3D''
+ac_user_opts=3D'
+enable_option_checking
+with_previous_options
+with_cc
+with_cxx
+enable_debug
+enable_debug_memory
+enable_debug_locking
+enable_optimize
+enable_profile
+enable_static
+enable_static_external_libs
+enable_shlibs
+with_extra_cflags
+with_extra_ldflags
+with_file_offset_bits
+enable_atomic_nonatomic
+enable_atomic_asm
+with_python
+with_tcl
+with_tcldir
+with_tclver
+with_google_perftools
+enable_google_profiling
+with_bluez
+with_expat
+with_xerces_c
+with_tclreadline
+with_zlib
+with_xsd_tool
+with_db
+with_dbver
+with_mysql
+with_mysql_daemon
+with_postgres
+enable_eds
+'
       ac_precious_vars=3D'build_alias
 host_alias
 target_alias
@@ -740,12 +800,15 @@
 CXXFLAGS
 CCC
 CPP
-PYTHON'
+PYTHON
+CXXCPP'
=20
=20
 # Initialize some variables set by options.
 ac_init_help=3D
 ac_init_version=3Dfalse
+ac_unrecognized_opts=3D
+ac_unrecognized_sep=3D
 # The variables have the same names as the options, with
 # dashes changed to underlines.
 cache_file=3D/dev/null
@@ -844,13 +907,21 @@
     datarootdir=3D$ac_optarg ;;
=20
   -disable-* | --disable-*)
-    ac_feature=3D`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+    ac_useropt=3D`expr "x$ac_option" : 'x-*disable-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=3D`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=3Dno ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=3D$ac_useropt
+    ac_useropt=3D`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts=3D"$ac_unrecognized_opts$ac_unrecognized_sep=
--disable-$ac_useropt_orig"
+	 ac_unrecognized_sep=3D', ';;
+    esac
+    eval enable_$ac_useropt=3Dno ;;
=20
   -docdir | --docdir | --docdi | --doc | --do)
     ac_prev=3Ddocdir ;;
@@ -863,13 +934,21 @@
     dvidir=3D$ac_optarg ;;
=20
   -enable-* | --enable-*)
-    ac_feature=3D`expr "x$ac_option" : 'x-*enable-\([^=3D]*\)'`
+    ac_useropt=3D`expr "x$ac_option" : 'x-*enable-\([^=3D]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=3D`echo $ac_feature | sed 's/[-.]/_/g'`
-    eval enable_$ac_feature=3D\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=3D$ac_useropt
+    ac_useropt=3D`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"enable_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts=3D"$ac_unrecognized_opts$ac_unrecognized_sep=
--enable-$ac_useropt_orig"
+	 ac_unrecognized_sep=3D', ';;
+    esac
+    eval enable_$ac_useropt=3D\$ac_optarg ;;
=20
   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1060,22 +1139,38 @@
     ac_init_version=3D: ;;
=20
   -with-* | --with-*)
-    ac_package=3D`expr "x$ac_option" : 'x-*with-\([^=3D]*\)'`
+    ac_useropt=3D`expr "x$ac_option" : 'x-*with-\([^=3D]*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=3D`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=3D\$ac_optarg ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=3D$ac_useropt
+    ac_useropt=3D`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts=3D"$ac_unrecognized_opts$ac_unrecognized_sep=
--with-$ac_useropt_orig"
+	 ac_unrecognized_sep=3D', ';;
+    esac
+    eval with_$ac_useropt=3D\$ac_optarg ;;
=20
   -without-* | --without-*)
-    ac_package=3D`expr "x$ac_option" : 'x-*without-\(.*\)'`
+    ac_useropt=3D`expr "x$ac_option" : 'x-*without-\(.*\)'`
     # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=3D`echo $ac_package | sed 's/[-.]/_/g'`
-    eval with_$ac_package=3Dno ;;
+    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
+   { (exit 1); exit 1; }; }
+    ac_useropt_orig=3D$ac_useropt
+    ac_useropt=3D`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+    case $ac_user_opts in
+      *"
+"with_$ac_useropt"
+"*) ;;
+      *) ac_unrecognized_opts=3D"$ac_unrecognized_opts$ac_unrecognized_sep=
--without-$ac_useropt_orig"
+	 ac_unrecognized_sep=3D', ';;
+    esac
+    eval with_$ac_useropt=3Dno ;;
=20
   --x)
     # Obsolete; use --with-x.
@@ -1095,7 +1190,7 @@
   | --x-librar=3D* | --x-libra=3D* | --x-libr=3D* | --x-lib=3D* | --x-li=
=3D* | --x-l=3D*)
     x_libraries=3D$ac_optarg ;;
=20
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
+  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; }
     ;;
@@ -1104,16 +1199,16 @@
     ac_envvar=3D`expr "x$ac_option" : 'x\([^=3D]*\)=3D'`
     # Reject names that are not valid shell variable names.
     expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
    { (exit 1); exit 1; }; }
     eval $ac_envvar=3D\$ac_optarg
     export $ac_envvar ;;
=20
   *)
     # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >=
&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
     : ${build_alias=3D$ac_option} ${host_alias=3D$ac_option} ${target_alia=
s=3D$ac_option}
     ;;
=20
@@ -1122,22 +1217,38 @@
=20
 if test -n "$ac_prev"; then
   ac_option=3D--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute directory names.
+  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
+   { (exit 1); exit 1; }; }
+fi
+
+if test -n "$ac_unrecognized_opts"; then
+  case $enable_option_checking in
+    no) ;;
+    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecogniz=
ed_opts" >&2
+   { (exit 1); exit 1; }; } ;;
+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecogniz=
ed_opts" >&2 ;;
+  esac
+fi
+
+# Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
 		libdir localedir mandir
 do
   eval ac_val=3D\$$ac_var
+  # Remove trailing slashes.
+  case $ac_val in
+    */ )
+      ac_val=3D`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+      eval $ac_var=3D\$ac_val;;
+  esac
+  # Be sure to have absolute directory names.
   case $ac_val in
     [\\/$]* | ?:[\\/]* )  continue;;
     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   esac
-  { echo "$as_me: error: expected an absolute directory name for --$ac_var=
: $ac_val" >&2
+  { $as_echo "$as_me: error: expected an absolute directory name for --$ac=
_var: $ac_val" >&2
    { (exit 1); exit 1; }; }
 done
=20
@@ -1152,7 +1263,7 @@
 if test "x$host_alias" !=3D x; then
   if test "x$build_alias" =3D x; then
     cross_compiling=3Dmaybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't us=
e --host.
+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don'=
t use --host.
     If a cross compiler is detected then cross compile mode will be used."=
 >&2
   elif test "x$build_alias" !=3D "x$host_alias"; then
     cross_compiling=3Dyes
@@ -1168,10 +1279,10 @@
 ac_pwd=3D`pwd` && test -n "$ac_pwd" &&
 ac_ls_di=3D`ls -di .` &&
 ac_pwd_ls_di=3D`cd "$ac_pwd" && ls -di .` ||
-  { echo "$as_me: error: Working directory cannot be determined" >&2
+  { $as_echo "$as_me: error: working directory cannot be determined" >&2
    { (exit 1); exit 1; }; }
 test "X$ac_ls_di" =3D "X$ac_pwd_ls_di" ||
-  { echo "$as_me: error: pwd does not report name of working directory" >&=
2
+  { $as_echo "$as_me: error: pwd does not report name of working directory=
" >&2
    { (exit 1); exit 1; }; }
=20
=20
@@ -1179,12 +1290,12 @@
 if test -z "$srcdir"; then
   ac_srcdir_defaulted=3Dyes
   # Try the directory containing this script, then the parent directory.
-  ac_confdir=3D`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+  ac_confdir=3D`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_myself" : 'X\(//\)[^/]' \| \
+	 X"$as_myself" : 'X\(//\)$' \| \
+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -1211,12 +1322,12 @@
 fi
 if test ! -r "$srcdir/$ac_unique_file"; then
   test "$ac_srcdir_defaulted" =3D yes && srcdir=3D"$ac_confdir or .."
-  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir"=
 >&2
+  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $src=
dir" >&2
    { (exit 1); exit 1; }; }
 fi
 ac_msg=3D"sources are in $srcdir, but \`cd $srcdir' does not work"
 ac_abs_confdir=3D`(
-	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac=
_msg" >&2
+	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error:=
 $ac_msg" >&2
    { (exit 1); exit 1; }; }
 	pwd)`
 # When building in place, set srcdir=3D.
@@ -1265,9 +1376,9 @@
=20
 Installation directories:
   --prefix=3DPREFIX         install architecture-independent files in PREF=
IX
-			  [$ac_default_prefix]
+                          [$ac_default_prefix]
   --exec-prefix=3DEPREFIX   install architecture-dependent files in EPREFI=
X
-			  [PREFIX]
+                          [PREFIX]
=20
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1277,25 +1388,25 @@
 For better control, use the options below.
=20
 Fine tuning of the installation directories:
-  --bindir=3DDIR           user executables [EPREFIX/bin]
-  --sbindir=3DDIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=3DDIR       program executables [EPREFIX/libexec]
-  --sysconfdir=3DDIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=3DDIR   modifiable architecture-independent data [PREFI=
X/com]
-  --localstatedir=3DDIR    modifiable single-machine data [PREFIX/var]
-  --libdir=3DDIR           object code libraries [EPREFIX/lib]
-  --includedir=3DDIR       C header files [PREFIX/include]
-  --oldincludedir=3DDIR    C header files for non-gcc [/usr/include]
-  --datarootdir=3DDIR      read-only arch.-independent data root [PREFIX/s=
hare]
-  --datadir=3DDIR          read-only architecture-independent data [DATARO=
OTDIR]
-  --infodir=3DDIR          info documentation [DATAROOTDIR/info]
-  --localedir=3DDIR        locale-dependent data [DATAROOTDIR/locale]
-  --mandir=3DDIR           man documentation [DATAROOTDIR/man]
-  --docdir=3DDIR           documentation root [DATAROOTDIR/doc/PACKAGE]
-  --htmldir=3DDIR          html documentation [DOCDIR]
-  --dvidir=3DDIR           dvi documentation [DOCDIR]
-  --pdfdir=3DDIR           pdf documentation [DOCDIR]
-  --psdir=3DDIR            ps documentation [DOCDIR]
+  --bindir=3DDIR            user executables [EPREFIX/bin]
+  --sbindir=3DDIR           system admin executables [EPREFIX/sbin]
+  --libexecdir=3DDIR        program executables [EPREFIX/libexec]
+  --sysconfdir=3DDIR        read-only single-machine data [PREFIX/etc]
+  --sharedstatedir=3DDIR    modifiable architecture-independent data [PREF=
IX/com]
+  --localstatedir=3DDIR     modifiable single-machine data [PREFIX/var]
+  --libdir=3DDIR            object code libraries [EPREFIX/lib]
+  --includedir=3DDIR        C header files [PREFIX/include]
+  --oldincludedir=3DDIR     C header files for non-gcc [/usr/include]
+  --datarootdir=3DDIR       read-only arch.-independent data root [PREFIX/=
share]
+  --datadir=3DDIR           read-only architecture-independent data [DATAR=
OOTDIR]
+  --infodir=3DDIR           info documentation [DATAROOTDIR/info]
+  --localedir=3DDIR         locale-dependent data [DATAROOTDIR/locale]
+  --mandir=3DDIR            man documentation [DATAROOTDIR/man]
+  --docdir=3DDIR            documentation root [DATAROOTDIR/doc/PACKAGE]
+  --htmldir=3DDIR           html documentation [DOCDIR]
+  --dvidir=3DDIR            dvi documentation [DOCDIR]
+  --pdfdir=3DDIR            pdf documentation [DOCDIR]
+  --psdir=3DDIR             ps documentation [DOCDIR]
 _ACEOF
=20
   cat <<\_ACEOF
@@ -1307,6 +1418,7 @@
   cat <<\_ACEOF
=20
 Optional Features:
+  --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=
=3Dno)
   --enable-FEATURE[=3DARG]  include FEATURE [ARG=3Dyes]
   --disable-debug         compile with debugging turned off
@@ -1339,7 +1451,7 @@
   --with-python=3DPYTHON    absolute path name of Python executable
   --with-tcl=3DDIR          location of a tcl installation (default system=
)
   --with-tcldir=3DDIR       same as --with-tcl
-  --with-tclver=3DVERSION   tcl version to use (default 8.4 or 8.3)
+  --with-tclver=3DVERSION   tcl version to use (default 8.5 - 8.3)
   --with-google-perftools=3DDIR
                           location of a google perftools installation (def=
ault
                           none)
@@ -1351,7 +1463,7 @@
   --with-xsd-tool=3Dxsd     name or path of the xsd tool (default: xsd)
   --with-db=3DDIR           location of a Berkeley DB installation (defaul=
t
                           system)
-  --with-dbver=3DVERSION    Berkeley DB versions to try (default 4.5-4.2)
+  --with-dbver=3DVERSION    Berkeley DB versions to try (default 4.7-4.2)
   --with-mysql=3DDIR        location of a mysql installation (default none=
)
   --with-mysql-daemon     use the daemon library (not the client library)
   --with-postgres=3DDIR     location of a postgres installation (default n=
one)
@@ -1368,6 +1480,7 @@
   CXXFLAGS    C++ compiler flags
   CPP         C preprocessor
   PYTHON
+  CXXCPP      C++ preprocessor
=20
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -1379,15 +1492,17 @@
 if test "$ac_init_help" =3D "recursive"; then
   # If there are subdirs, report their specific --help.
   for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" =3D x: && continue
-    test -d "$ac_dir" || continue
+    test -d "$ac_dir" ||
+      { cd "$srcdir" && ac_pwd=3D`pwd` && srcdir=3D. && test -d "$ac_dir";=
 } ||
+      continue
     ac_builddir=3D.
=20
 case "$ac_dir" in
 .) ac_dir_suffix=3D ac_top_builddir_sub=3D. ac_top_build_prefix=3D ;;
 *)
-  ac_dir_suffix=3D/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=3D/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=3D`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/=
,,'`
+  ac_top_builddir_sub=3D`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g=
;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=3D. ac_top_build_prefix=3D ;;
   *)  ac_top_build_prefix=3D$ac_top_builddir_sub/ ;;
@@ -1423,7 +1538,7 @@
       echo &&
       $SHELL "$ac_srcdir/configure" --help=3Drecursive
     else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >=
&2
+      $as_echo "$as_me: WARNING: no configuration information is in $ac_di=
r" >&2
     fi || ac_status=3D$?
     cd "$ac_pwd" || { ac_status=3D$?; break; }
   done
@@ -1433,10 +1548,10 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 configure
-generated by GNU Autoconf 2.61
+generated by GNU Autoconf 2.63
=20
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
=20
@@ -1464,7 +1579,7 @@
 running configure, to aid debugging if configure makes a mistake.
=20
 It was created by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
=20
   $ $0 $@
=20
@@ -1500,7 +1615,7 @@
 do
   IFS=3D$as_save_IFS
   test -z "$as_dir" && as_dir=3D.
-  echo "PATH: $as_dir"
+  $as_echo "PATH: $as_dir"
 done
 IFS=3D$as_save_IFS
=20
@@ -1535,7 +1650,7 @@
     | -silent | --silent | --silen | --sile | --sil)
       continue ;;
     *\'*)
-      ac_arg=3D`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+      ac_arg=3D`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
     esac
     case $ac_pass in
     1) ac_configure_args0=3D"$ac_configure_args0 '$ac_arg'" ;;
@@ -1587,11 +1702,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var cont=
ains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;=
;
+      *_cv_*) { $as_echo "$as_me:$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=3D ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -1621,9 +1737,9 @@
     do
       eval ac_val=3D\$$ac_var
       case $ac_val in
-      *\'\''*) ac_val=3D`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''=
/g"`;;
+      *\'\''*) ac_val=3D`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\''=
'\''/g"`;;
       esac
-      echo "$ac_var=3D'\''$ac_val'\''"
+      $as_echo "$ac_var=3D'\''$ac_val'\''"
     done | sort
     echo
=20
@@ -1638,9 +1754,9 @@
       do
 	eval ac_val=3D\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=3D`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;=
;
+	*\'\''*) ac_val=3D`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/=
g"`;;
 	esac
-	echo "$ac_var=3D'\''$ac_val'\''"
+	$as_echo "$ac_var=3D'\''$ac_val'\''"
       done | sort
       echo
     fi
@@ -1656,8 +1772,8 @@
       echo
     fi
     test "$ac_signal" !=3D 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
+      $as_echo "$as_me: caught signal $ac_signal"
+    $as_echo "$as_me: exit $exit_status"
   } >&5
   rm -f core *.core core.conftest.* &&
     rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1699,21 +1815,24 @@
=20
=20
 # Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=3DNONE
+ac_site_file2=3DNONE
 if test -n "$CONFIG_SITE"; then
-  set x "$CONFIG_SITE"
+  ac_site_file1=3D$CONFIG_SITE
 elif test "x$prefix" !=3D xNONE; then
-  set x "$prefix/share/config.site" "$prefix/etc/config.site"
-else
-  set x "$ac_default_prefix/share/config.site" \
-	"$ac_default_prefix/etc/config.site"
-fi
-shift
-for ac_site_file
-do
+  ac_site_file1=3D$prefix/share/config.site
+  ac_site_file2=3D$prefix/etc/config.site
+else
+  ac_site_file1=3D$ac_default_prefix/share/config.site
+  ac_site_file2=3D$ac_default_prefix/etc/config.site
+fi
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+do
+  test "x$ac_site_file" =3D xNONE && continue
   if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+    { $as_echo "$as_me:$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"
   fi
@@ -1723,16 +1842,16 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . "$cache_file";;
       *)                      . "./$cache_file";;
     esac
   fi
 else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
=20
@@ -1746,29 +1865,38 @@
   eval ac_new_val=3D\$ac_env_${ac_var}_value
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' =
in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous =
run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_v=
al' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previ=
ous run" >&2;}
       ac_cache_corrupted=3D: ;;
     ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previou=
s run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the pre=
vious run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=3D: ;;
     ,);;
     *)
       if test "x$ac_old_val" !=3D "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous =
run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=3D:
+	# differences in whitespace do not lead to failure.
+	ac_old_val_w=3D`echo x $ac_old_val`
+	ac_new_val_w=3D`echo x $ac_new_val`
+	if test "$ac_old_val_w" !=3D "$ac_new_val_w"; then
+	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the pre=
vious run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >=
&2;}
+	  ac_cache_corrupted=3D:
+	else
+	  { $as_echo "$as_me:$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=3D\$ac_old_val
+	fi
+	{ $as_echo "$as_me:$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:   current value: \`$ac_new_val'" >&2;}
       fi;;
   esac
   # Pass precious variables to config.status.
   if test "$ac_new_set" =3D set; then
     case $ac_new_val in
-    *\'*) ac_arg=3D$ac_var=3D`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"=
` ;;
+    *\'*) ac_arg=3D$ac_var=3D`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\'=
'/g"` ;;
     *) ac_arg=3D$ac_var=3D$ac_new_val ;;
     esac
     case " $ac_configure_args " in
@@ -1778,10 +1906,12 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise=
 the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" =
>&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cach=
e_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and st=
art over" >&2;}
+  { $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: changes in the environment can compro=
mise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the bui=
ld" >&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' an=
d start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
=20
@@ -1840,18 +1970,18 @@
=20
=20
 #  First set srcdir and builddir, calculated above in AC_CONFIG_SRCDIR
-{ echo "$as_me:$LINENO: checking location of source directory" >&5
-echo $ECHO_N "checking location of source directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking location of source directory" >&5
+$as_echo_n "checking location of source directory... " >&6; }
 SRCDIR=3D`(cd $srcdir && pwd)`
-{ echo "$as_me:$LINENO: result: \"$SRCDIR\"" >&5
-echo "${ECHO_T}\"$SRCDIR\"" >&6; }
+{ $as_echo "$as_me:$LINENO: result: \"$SRCDIR\"" >&5
+$as_echo "\"$SRCDIR\"" >&6; }
=20
=20
 builddir=3D`pwd`
-{ echo "$as_me:$LINENO: checking location of build directory" >&5
-echo $ECHO_N "checking location of build directory... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: \"$builddir\"" >&5
-echo "${ECHO_T}\"$builddir\"" >&6; }
+{ $as_echo "$as_me:$LINENO: checking location of build directory" >&5
+$as_echo_n "checking location of build directory... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: \"$builddir\"" >&5
+$as_echo "\"$builddir\"" >&6; }
 BUILDDIR=3D$builddir
=20
=20
@@ -1890,15 +2020,15 @@
=20
=20
     if test "x$ac_with_cc" =3D "x" ; then
-        ac_try_cc=3D"gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
-        ac_try_cxx=3D"g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
+        ac_try_cc=3D"gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
+        ac_try_cxx=3D"g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
     else
         ac_try_cc=3D$ac_with_cc
=20
 	if test x"$ac_with_cxx" =3D x ; then
             ac_try_cxx=3D`echo $ac_with_cc | sed 's/cc/++/'`
-	    { echo "$as_me:$LINENO: inferring C++ compiler '$ac_try_cxx' from C c=
ompiler setting" >&5
-echo "$as_me: inferring C++ compiler '$ac_try_cxx' from C compiler setting=
" >&6;}
+	    { $as_echo "$as_me:$LINENO: inferring C++ compiler '$ac_try_cxx' from=
 C compiler setting" >&5
+$as_echo "$as_me: inferring C++ compiler '$ac_try_cxx' from C compiler set=
ting" >&6;}
 	else
 	    ac_try_cxx=3D$ac_with_cxx
 	fi
@@ -1907,10 +2037,10 @@
 	CXX=3D$ac_try_cxx
     fi
=20
-                { echo "$as_me:$LINENO: checking for a C compiler (trying =
$ac_try_cc)" >&5
-echo $ECHO_N "checking for a C compiler (trying $ac_try_cc)... $ECHO_C" >&=
6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+                { $as_echo "$as_me:$LINENO: checking for a C compiler (try=
ing $ac_try_cc)" >&5
+$as_echo_n "checking for a C compiler (trying $ac_try_cc)... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
     ac_ext=3Dc
 ac_cpp=3D'$CPP $CPPFLAGS'
 ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -1921,10 +2051,10 @@
   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=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CC+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
   ac_cv_prog_CC=3D"$CC" # Let the user override the test.
@@ -1937,7 +2067,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_CC=3D"$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1948,11 +2078,11 @@
 fi
 CC=3D$ac_cv_prog_CC
 if test -n "$CC"; then
-  { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -1965,10 +2095,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with=
 args.
 set dummy $ac_prog; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CC+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
   ac_cv_prog_ac_ct_CC=3D"$ac_ct_CC" # Let the user override the test.
@@ -1981,7 +2111,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CC=3D"$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -1992,11 +2122,11 @@
 fi
 ac_ct_CC=3D$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -2008,12 +2138,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     CC=3D$ac_ct_CC
@@ -2021,44 +2147,50 @@
 fi
=20
=20
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler=
 found in \$PATH
+test -z "$CC" && { { $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: no acceptable C compiler found in \$P=
ATH
 See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
=20
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=3D`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=3D$2
 { (ac_try=3D"$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
 { (ac_try=3D"$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
 { (ac_try=3D"$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
=20
 cat >conftest.$ac_ext <<_ACEOF
@@ -2077,27 +2209,22 @@
 }
 _ACEOF
 ac_clean_files_save=3D$ac_clean_files
-ac_clean_files=3D"$ac_clean_files a.out a.exe b.out"
+ac_clean_files=3D"$ac_clean_files a.out a.out.dSYM a.exe b.out"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" =
>&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C"=
 >&6; }
-ac_link_default=3D`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort.  b.out is created by i960 compilers.
-ac_files=3D'a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.o=
ut'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions.  Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file na=
me" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=3D`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files=3D"a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
 ac_rmfiles=3D
 for ac_file in $ac_files
 do
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.dSYM | *.o | *.obj ) ;;
     * ) ac_rmfiles=3D"$ac_rmfiles $ac_file";;
   esac
 done
@@ -2108,10 +2235,11 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link_default") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; then
   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
 # So ignore a value of `no', otherwise this would lead to `EXEEXT =3D no'
@@ -2122,7 +2250,7 @@
 do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.o | *.obj )
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.dSYM | *.o | *.obj )
 	;;
     [ab].out )
 	# We found the default executable, but exeext=3D'' is most
@@ -2149,25 +2277,27 @@
   ac_file=3D''
 fi
=20
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
 if test -z "$ac_file"; then
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+  $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: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
 See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
 fi
=20
 ac_exeext=3D$ac_cv_exeext
=20
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $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" !=3D yes; then
@@ -2176,49 +2306,53 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=3Dno
   else
     if test "$cross_compiling" =3D maybe; then
 	cross_compiling=3Dyes
     else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+	{ { $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
-echo "$as_me: error: cannot run C compiled programs.
+$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
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+   { (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=3D$ac_clean_files_save
 # Check that the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
-
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
-if { (ac_try=3D"$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+{ $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_n "checking for suffix of executables... " >&6; }
+if { (ac_try=3D"$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2227,31 +2361,33 @@
 for ac_file in conftest.exe conftest conftest.*; do
   test -f "$ac_file" || continue
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.o | *.obj ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.dSYM | *.o | *.obj ) ;;
     *.* ) ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
 	  break;;
     * ) break;;
   esac
 done
 else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: c=
annot compile and link
+  { { $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 compute suffix of executables:=
 cannot compile and link
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile =
and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot comp=
ile and link
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
=20
 rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
=20
 rm -f conftest.$ac_ext
 EXEEXT=3D$ac_cv_exeext
 ac_exeext=3D$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
 if test "${ac_cv_objext+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2274,40 +2410,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compile") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in conftest.o conftest.obj conftest.*; do
   test -f "$ac_file" || continue;
   case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf ) ;;
+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
map | *.inf | *.dSYM ) ;;
     *) ac_cv_objext=3D`expr "$ac_file" : '.*\.\(.*\)'`
        break;;
   esac
 done
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: ca=
nnot compile
+  $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: 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
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot com=
pile
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
=20
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
 OBJEXT=3D$ac_cv_objext
 ac_objext=3D$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" =
>&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C"=
 >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compil=
er" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
 if test "${ac_cv_c_compiler_gnu+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2333,20 +2472,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_compiler_gnu=3Dno
@@ -2356,15 +2496,19 @@
 ac_cv_c_compiler_gnu=3D$ac_compiler_gnu
=20
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=3D`test $ac_compiler_gnu =3D yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu =3D yes; then
+  GCC=3Dyes
+else
+  GCC=3D
+fi
 ac_test_CFLAGS=3D${CFLAGS+set}
 ac_save_CFLAGS=3D$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
 if test "${ac_cv_prog_cc_g+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=3D$ac_c_werror_flag
    ac_c_werror_flag=3Dyes
@@ -2391,20 +2535,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	CFLAGS=3D""
@@ -2429,20 +2574,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
=20
 	ac_c_werror_flag=3D$ac_save_c_werror_flag
@@ -2468,20 +2614,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_g=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
=20
@@ -2496,8 +2643,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_c_werror_flag=3D$ac_save_c_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
 if test "$ac_test_CFLAGS" =3D set; then
   CFLAGS=3D$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g =3D yes; then
@@ -2513,10 +2660,10 @@
     CFLAGS=3D
   fi
 fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=3Dno
 ac_save_CC=3D$CC
@@ -2587,20 +2734,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cc_c89=3D$ac_arg
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
=20
@@ -2616,15 +2764,15 @@
 # AC_CACHE_VAL
 case "x$ac_cv_prog_cc_c89" in
   x)
-    { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
   xno)
-    { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
   *)
     CC=3D"$CC $ac_cv_prog_cc_c89"
-    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
 esac
=20
=20
@@ -2635,10 +2783,10 @@
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
=20
=20
-    { echo "$as_me:$LINENO: checking for a C++ compiler (trying $ac_try_cx=
x)" >&5
-echo $ECHO_N "checking for a C++ compiler (trying $ac_try_cxx)... $ECHO_C"=
 >&6; }
-    { echo "$as_me:$LINENO: result: " >&5
-echo "${ECHO_T}" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for a C++ compiler (trying $ac_tr=
y_cxx)" >&5
+$as_echo_n "checking for a C++ compiler (trying $ac_try_cxx)... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: " >&5
+$as_echo "" >&6; }
     ac_ext=3Dcpp
 ac_cpp=3D'$CXXCPP $CPPFLAGS'
 ac_compile=3D'$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2653,10 +2801,10 @@
   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=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_CXX+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
   ac_cv_prog_CXX=3D"$CXX" # Let the user override the test.
@@ -2669,7 +2817,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_CXX=3D"$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2680,11 +2828,11 @@
 fi
 CXX=3D$ac_cv_prog_CXX
 if test -n "$CXX"; then
-  { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -2697,10 +2845,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with=
 args.
 set dummy $ac_prog; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_CXX+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
   ac_cv_prog_ac_ct_CXX=3D"$ac_ct_CXX" # Let the user override the test.
@@ -2713,7 +2861,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_CXX=3D"$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -2724,11 +2872,11 @@
 fi
 ac_ct_CXX=3D$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -2740,12 +2888,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     CXX=3D$ac_ct_CXX
@@ -2755,43 +2899,47 @@
   fi
 fi
 # Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=3D`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=3D$2
 { (ac_try=3D"$ac_compiler --version >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler --version >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
 { (ac_try=3D"$ac_compiler -v >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -v >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
 { (ac_try=3D"$ac_compiler -V >&5"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_compiler -V >&5") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
=20
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler=
" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_=
C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ comp=
iler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
 if test "${ac_cv_cxx_compiler_gnu+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -2817,20 +2965,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_compiler_gnu=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_compiler_gnu=3Dno
@@ -2840,15 +2989,19 @@
 ac_cv_cxx_compiler_gnu=3D$ac_compiler_gnu
=20
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=3D`test $ac_compiler_gnu =3D yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu =3D yes; then
+  GXX=3Dyes
+else
+  GXX=3D
+fi
 ac_test_CXXFLAGS=3D${CXXFLAGS+set}
 ac_save_CXXFLAGS=3D$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
 if test "${ac_cv_prog_cxx_g+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=3D$ac_cxx_werror_flag
    ac_cxx_werror_flag=3Dyes
@@ -2875,20 +3028,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	CXXFLAGS=3D""
@@ -2913,20 +3067,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_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
=20
 	ac_cxx_werror_flag=3D$ac_save_cxx_werror_flag
@@ -2952,20 +3107,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_prog_cxx_g=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
=20
@@ -2980,8 +3136,8 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    ac_cxx_werror_flag=3D$ac_save_cxx_werror_flag
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
 if test "$ac_test_CXXFLAGS" =3D set; then
   CXXFLAGS=3D$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g =3D yes; then
@@ -3004,8 +3160,8 @@
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
=20
=20
-                    { echo "$as_me:$LINENO: checking whether the C++ compi=
ler works" >&5
-echo $ECHO_N "checking whether the C++ compiler works... $ECHO_C" >&6; }
+                    { $as_echo "$as_me:$LINENO: checking whether the C++ c=
ompiler works" >&5
+$as_echo_n "checking whether the C++ compiler works... " >&6; }
     ac_ext=3Dcpp
 ac_cpp=3D'$CXXCPP $CPPFLAGS'
 ac_compile=3D'$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3033,33 +3189,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	{ echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-		   { { echo "$as_me:$LINENO: error: C++ compiler does not work
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+		   { { $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: C++ compiler does not work
 See \`config.log' for more details." >&5
-echo "$as_me: error: C++ compiler does not work
+$as_echo "$as_me: error: C++ compiler does not work
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+   { (exit 1); exit 1; }; }; }
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     ac_ext=3Dc
@@ -3074,15 +3236,15 @@
 ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link=3D'$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$=
ac_ext $LIBS >&5'
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$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=3D
 fi
 if test -z "$CPP"; then
   if test "${ac_cv_prog_CPP+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
     for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -3114,20 +3276,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   # Broken: fails on valid input.
@@ -3151,13 +3314,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3165,7 +3329,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   # Passes both tests.
@@ -3190,8 +3354,8 @@
 else
   ac_cv_prog_CPP=3D$CPP
 fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
 ac_preproc_ok=3Dfalse
 for ac_c_preproc_warn_flag in '' yes
 do
@@ -3219,20 +3383,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   # Broken: fails on valid input.
@@ -3256,13 +3421,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -3270,7 +3436,7 @@
   # Broken: success on invalid input.
 continue
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   # Passes both tests.
@@ -3286,11 +3452,13 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity ch=
eck
+  { { $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: C preprocessor \"$CPP\" fails sanity =
check
 See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
+   { (exit 1); exit 1; }; }; }
 fi
=20
 ac_ext=3Dc
@@ -3300,29 +3468,29 @@
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
=20
=20
-                { echo "$as_me:$LINENO: checking for the version of the GN=
U C compiler" >&5
-echo $ECHO_N "checking for the version of the GNU C compiler... $ECHO_C" >=
&6; }
+                { $as_echo "$as_me:$LINENO: checking for the version of th=
e GNU C compiler" >&5
+$as_echo_n "checking for the version of the GNU C compiler... " >&6; }
 if test "${oasys_cv_prog_gccver+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
=20
       oasys_cv_prog_gccver=3D`$CC -dumpversion | cut -d. -f1-2`
=20
 fi
-{ echo "$as_me:$LINENO: result: $oasys_cv_prog_gccver" >&5
-echo "${ECHO_T}$oasys_cv_prog_gccver" >&6; }
-
-    { echo "$as_me:$LINENO: checking for the version of the GNU C++ compil=
er" >&5
-echo $ECHO_N "checking for the version of the GNU C++ compiler... $ECHO_C"=
 >&6; }
+{ $as_echo "$as_me:$LINENO: result: $oasys_cv_prog_gccver" >&5
+$as_echo "$oasys_cv_prog_gccver" >&6; }
+
+    { $as_echo "$as_me:$LINENO: checking for the version of the GNU C++ co=
mpiler" >&5
+$as_echo_n "checking for the version of the GNU C++ compiler... " >&6; }
 if test "${oasys_cv_prog_gxxver+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
=20
       oasys_cv_prog_gxxver=3D`$CXX -dumpversion | cut -d. -f1-2`
=20
 fi
-{ echo "$as_me:$LINENO: result: $oasys_cv_prog_gxxver" >&5
-echo "${ECHO_T}$oasys_cv_prog_gxxver" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $oasys_cv_prog_gxxver" >&5
+$as_echo "$oasys_cv_prog_gxxver" >&6; }
=20
     if test $oasys_cv_prog_gccver !=3D $oasys_cv_prog_gxxver ; then
         echo "*** "
@@ -3367,10 +3535,10 @@
                 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ar", so it can be a progra=
m name with args.
 set dummy ${ac_tool_prefix}ar; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AR+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AR"; then
   ac_cv_prog_AR=3D"$AR" # Let the user override the test.
@@ -3383,7 +3551,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_AR=3D"${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3394,11 +3562,11 @@
 fi
 AR=3D$ac_cv_prog_AR
 if test -n "$AR"; then
-  { echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -3407,10 +3575,10 @@
   ac_ct_AR=3D$AR
   # Extract the first word of "ar", so it can be a program name with args.
 set dummy ar; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_AR+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_AR"; then
   ac_cv_prog_ac_ct_AR=3D"$ac_ct_AR" # Let the user override the test.
@@ -3423,7 +3591,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_AR=3D"ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3434,11 +3602,11 @@
 fi
 ac_ct_AR=3D$ac_cv_prog_ac_ct_AR
 if test -n "$ac_ct_AR"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
   if test "x$ac_ct_AR" =3D x; then
@@ -3446,12 +3614,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     AR=3D$ac_ct_AR
@@ -3463,10 +3627,10 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a pr=
ogram name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB=3D"$RANLIB" # Let the user override the test.
@@ -3479,7 +3643,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB=3D"${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3490,11 +3654,11 @@
 fi
 RANLIB=3D$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -3503,10 +3667,10 @@
   ac_ct_RANLIB=3D$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with a=
rgs.
 set dummy ranlib; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB=3D"$ac_ct_RANLIB" # Let the user override the te=
st.
@@ -3519,7 +3683,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB=3D"ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -3530,11 +3694,11 @@
 fi
 ac_ct_RANLIB=3D$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
   if test "x$ac_ct_RANLIB" =3D x; then
@@ -3542,12 +3706,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     RANLIB=3D$ac_ct_RANLIB
@@ -3558,8 +3718,8 @@
=20
=20
     if test -z "$AR" ; then
-       { { echo "$as_me:$LINENO: error: can't find a working ar tool" >&5
-echo "$as_me: error: can't find a working ar tool" >&2;}
+       { { $as_echo "$as_me:$LINENO: error: can't find a working ar tool" =
>&5
+$as_echo "$as_me: error: can't find a working ar tool" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -3572,10 +3732,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with debugging" >&=
5
-echo $ECHO_N "checking whether to compile with debugging... $ECHO_C" >&6; =
}
-    { echo "$as_me:$LINENO: result: $debug" >&5
-echo "${ECHO_T}$debug" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with debugging=
" >&5
+$as_echo_n "checking whether to compile with debugging... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $debug" >&5
+$as_echo "$debug" >&6; }
=20
     DEBUG=3D
     if test $debug =3D yes ; then
@@ -3593,10 +3753,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with memory debugg=
ing" >&5
-echo $ECHO_N "checking whether to compile with memory debugging... $ECHO_C=
" >&6; }
-    { echo "$as_me:$LINENO: result: $debug_memory" >&5
-echo "${ECHO_T}$debug_memory" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with memory de=
bugging" >&5
+$as_echo_n "checking whether to compile with memory debugging... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $debug_memory" >&5
+$as_echo "$debug_memory" >&6; }
=20
     if test $debug_memory =3D yes ; then
=20
@@ -3614,10 +3774,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with lock debuggin=
g (default $debug)" >&5
-echo $ECHO_N "checking whether to compile with lock debugging (default $de=
bug)... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $debug_locking" >&5
-echo "${ECHO_T}$debug_locking" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with lock debu=
gging (default $debug)" >&5
+$as_echo_n "checking whether to compile with lock debugging (default $debu=
g)... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $debug_locking" >&5
+$as_echo "$debug_locking" >&6; }
=20
     if test $debug_locking =3D yes ; then
=20
@@ -3636,10 +3796,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with optimization"=
 >&5
-echo $ECHO_N "checking whether to compile with optimization... $ECHO_C" >&=
6; }
-    { echo "$as_me:$LINENO: result: $optimize" >&5
-echo "${ECHO_T}$optimize" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with optimizat=
ion" >&5
+$as_echo_n "checking whether to compile with optimization... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $optimize" >&5
+$as_echo "$optimize" >&6; }
=20
     OPTIMIZE=3D
     OPTIMIZE_WARN=3D
@@ -3659,10 +3819,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with profiling" >&=
5
-echo $ECHO_N "checking whether to compile with profiling... $ECHO_C" >&6; =
}
-    { echo "$as_me:$LINENO: result: $profile" >&5
-echo "${ECHO_T}$profile" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with profiling=
" >&5
+$as_echo_n "checking whether to compile with profiling... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $profile" >&5
+$as_echo "$profile" >&6; }
=20
     PROFILE=3D
     if test $profile =3D yes ; then
@@ -3678,10 +3838,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to link statically" >&5
-echo $ECHO_N "checking whether to link statically... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $static" >&5
-echo "${ECHO_T}$static" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to link statically" >&5
+$as_echo_n "checking whether to link statically... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $static" >&5
+$as_echo "$static" >&6; }
=20
     # Check whether --enable-static-external-libs was given.
 if test "${enable_static_external_libs+set}" =3D set; then
@@ -3691,10 +3851,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to link using static external=
 libraries" >&5
-echo $ECHO_N "checking whether to link using static external libraries... =
$ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $staticextlibs" >&5
-echo "${ECHO_T}$staticextlibs" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to link using static exte=
rnal libraries" >&5
+$as_echo_n "checking whether to link using static external libraries... " =
>&6; }
+    { $as_echo "$as_me:$LINENO: result: $staticextlibs" >&5
+$as_echo "$staticextlibs" >&6; }
=20
     STATIC=3Dno
     if [ $static =3D yes ] ; then
@@ -3705,11 +3865,11 @@
     fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to try to build shared librar=
ies" >&5
-echo $ECHO_N "checking whether to try to build shared libraries... $ECHO_C=
" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to try to build shared li=
braries" >&5
+$as_echo_n "checking whether to try to build shared libraries... " >&6; }
     if [ $static =3D yes ] ; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     else
=20
                             # Check whether --enable-shlibs was given.
@@ -3720,8 +3880,8 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: result: $shlibs" >&5
-echo "${ECHO_T}$shlibs" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $shlibs" >&5
+$as_echo "$shlibs" >&6; }
=20
     SHLIBS=3Dno
     PICFLAGS=3D""
@@ -3731,8 +3891,8 @@
        ac_save_CFLAGS=3D$CFLAGS
        picflags=3D"-fPIC -DPIC"
        CFLAGS=3D"$picflags $ac_save_CFLAGS -Werror"
-       { echo "$as_me:$LINENO: checking whether the compiler supports -fPI=
C" >&5
-echo $ECHO_N "checking whether the compiler supports -fPIC... $ECHO_C" >&6=
; }
+       { $as_echo "$as_me:$LINENO: checking whether the compiler supports =
-fPIC" >&5
+$as_echo_n "checking whether the compiler supports -fPIC... " >&6; }
        cat >conftest.$ac_ext <<_ACEOF
 int myfunc() {return 0;}
 _ACEOF
@@ -3742,34 +3902,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   pic=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	pic=3Dno
 fi
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-       { echo "$as_me:$LINENO: result: $pic" >&5
-echo "${ECHO_T}$pic" >&6; }
+       { $as_echo "$as_me:$LINENO: result: $pic" >&5
+$as_echo "$pic" >&6; }
=20
        if [ $pic =3D yes ] ; then
=20
            for shopt in -shared "-dynamiclib -single_module" ; do
-             { echo "$as_me:$LINENO: checking whether the compiler can lin=
k a dynamic library with $shopt" >&5
-echo $ECHO_N "checking whether the compiler can link a dynamic library wit=
h $shopt... $ECHO_C" >&6; }
+             { $as_echo "$as_me:$LINENO: checking whether the compiler can=
 link a dynamic library with $shopt" >&5
+$as_echo_n "checking whether the compiler can link a dynamic library with =
$shopt... " >&6; }
 	     LDFLAGS=3D"$shopt $ac_save_LDFLAGS"
              cat >conftest.$ac_ext <<_ACEOF
 void myfunc() {}
@@ -3780,53 +3941,57 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   shlink=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	shlink=3Dno
 fi
=20
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-             { echo "$as_me:$LINENO: result: $shlink" >&5
-echo "${ECHO_T}$shlink" >&6; }
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+             { $as_echo "$as_me:$LINENO: result: $shlink" >&5
+$as_echo "$shlink" >&6; }
=20
              if [ $shlink =3D yes ] ; then
                  SHLIBS=3Dyes
                  PICFLAGS=3D$picflags
                  LDFLAGS_SHLIB=3D"$shopt $PICFLAGS"
=20
-		 { echo "$as_me:$LINENO: checking extension for dynamic libraries" >&5
-echo $ECHO_N "checking extension for dynamic libraries... $ECHO_C" >&6; }
+		 { $as_echo "$as_me:$LINENO: checking extension for dynamic libraries" >=
&5
+$as_echo_n "checking extension for dynamic libraries... " >&6; }
 		 		 if [ "$shopt" =3D "-dynamiclib -single_module" ] ; then
                      SHLIB_EXT=3Ddylib
                  elif [ $shopt =3D -shared ] ; then
                      SHLIB_EXT=3Dso
                  else
                      # shouldn't happen if above options are correctly che=
cked
-                     { { echo "$as_me:$LINENO: error: internal error in co=
nfigure script" >&5
-echo "$as_me: error: internal error in configure script" >&2;}
+                     { { $as_echo "$as_me:$LINENO: error: internal error i=
n configure script" >&5
+$as_echo "$as_me: error: internal error in configure script" >&2;}
    { (exit 1); exit 1; }; }
                  fi
-		 { echo "$as_me:$LINENO: result: $SHLIB_EXT" >&5
-echo "${ECHO_T}$SHLIB_EXT" >&6; }
-
-		 { echo "$as_me:$LINENO: checking if the compiler supports -Wl,--rpath=
=3D." >&5
-echo $ECHO_N "checking if the compiler supports -Wl,--rpath=3D.... $ECHO_C=
" >&6; }
+		 { $as_echo "$as_me:$LINENO: result: $SHLIB_EXT" >&5
+$as_echo "$SHLIB_EXT" >&6; }
+
+		 { $as_echo "$as_me:$LINENO: checking if the compiler supports -Wl,--rpa=
th=3D." >&5
+$as_echo_n "checking if the compiler supports -Wl,--rpath=3D.... " >&6; }
 		 LDFLAGS=3D"$LDFLAGS -Wl,-rpath=3D/foo"
 		 cat >conftest.$ac_ext <<_ACEOF
 void myfunc() {}
@@ -3837,30 +4002,34 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   rpath=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	rpath=3Dno
 fi
=20
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-		 { echo "$as_me:$LINENO: result: $rpath" >&5
-echo "${ECHO_T}$rpath" >&6; }
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+		 { $as_echo "$as_me:$LINENO: result: $rpath" >&5
+$as_echo "$rpath" >&6; }
 		 if [ $rpath =3D yes ] ; then
 		     RPATH=3D"-Wl,-rpath=3D. -Wl,-rpath=3D\$(prefix)/lib"
 		 fi
@@ -3919,8 +4088,8 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in=
 \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \=
"$srcdir/..\" \"$srcdir/../..\"" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.s=
h 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; }; }
 fi
=20
@@ -3934,42 +4103,37 @@
=20
=20
=20
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" =
>&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C"=
 >&6; }
+{ $as_echo "$as_me:$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}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=3D$2
-if test "${ac_cv_path_GREP+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+  $as_echo_n "(cached) " >&6
+else
+  if test -z "$GREP"; then
   ac_path_GREP_found=3Dfalse
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=3D$as_save_IFS
   test -z "$as_dir" && as_dir=3D.
   for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP=3D"$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_GREP=3D"$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || contin=
ue
+# Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_GREP=3D"$ac_path_GREP" ac_path_GREP_found=3D:;;
 *)
   ac_count=3D0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"con=
ftest.out" 2>/dev/null || break
     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
     ac_count=3D`expr $ac_count + 1`
@@ -3984,74 +4148,60 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
=20
-
-    $ac_path_GREP_found && break 3
-  done
-done
-
-done
-IFS=3D$as_save_IFS
-
-
-fi
-
-GREP=3D"$ac_cv_path_GREP"
-if test -z "$GREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be fo=
und in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$P=
ATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+      $ac_path_GREP_found && break 3
+    done
+  done
+done
+IFS=3D$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_S=
EPARATOR/usr/xpg4/bin" >&2;}
+   { (exit 1); exit 1; }; }
+  fi
 else
   ac_cv_path_GREP=3D$GREP
 fi
=20
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+fi
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
  GREP=3D"$ac_cv_path_GREP"
=20
=20
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
    then ac_cv_path_EGREP=3D"$GREP -E"
    else
-     # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=3D$2
-if test "${ac_cv_path_EGREP+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+     if test -z "$EGREP"; then
   ac_path_EGREP_found=3Dfalse
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
+  # Loop through the user's path and test for each of PROGNAME-LIST
+  as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
   IFS=3D$as_save_IFS
   test -z "$as_dir" && as_dir=3D.
   for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP=3D"$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || contin=
ue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      ac_path_EGREP=3D"$as_dir/$ac_prog$ac_exec_ext"
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || cont=
inue
+# Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
   ac_cv_path_EGREP=3D"$ac_path_EGREP" ac_path_EGREP_found=3D:;;
 *)
   ac_count=3D0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
   while :
   do
     cat "conftest.in" "conftest.in" >"conftest.tmp"
     mv "conftest.tmp" "conftest.in"
     cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $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=3D`expr $ac_count + 1`
@@ -4066,33 +4216,24 @@
   rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
=20
-
-    $ac_path_EGREP_found && break 3
-  done
-done
-
-done
-IFS=3D$as_save_IFS
-
-
-fi
-
-EGREP=3D"$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
-  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be fo=
und in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$P=
ATH_SEPARATOR/usr/xpg4/bin" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
+      $ac_path_EGREP_found && break 3
+    done
+  done
+done
+IFS=3D$as_save_IFS
+  if test -z "$ac_cv_path_EGREP"; then
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be foun=
d 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; }; }
+  fi
 else
   ac_cv_path_EGREP=3D$EGREP
 fi
=20
-
    fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
  EGREP=3D"$ac_cv_path_EGREP"
=20
=20
@@ -4109,11 +4250,11 @@
 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=3D`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=3D`$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=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -4131,20 +4272,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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=3Dyes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	eval "$as_ac_Header=3Dno"
@@ -4152,12 +4294,15 @@
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=3D`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` =3D yes; then
+ac_res=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" =3D x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
=20
 fi
@@ -4171,10 +4316,10 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with=
 args.
 set dummy $ac_prog; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_AWK+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
   ac_cv_prog_AWK=3D"$AWK" # Let the user override the test.
@@ -4187,7 +4332,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_AWK=3D"$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4198,11 +4343,11 @@
 fi
 AWK=3D$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  { echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -4222,11 +4367,12 @@
 # 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.
-{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; }
+# 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}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   as_save_IFS=3D$IFS; IFS=3D$PATH_SEPARATOR
 for as_dir in $PATH
@@ -4255,17 +4401,29 @@
 	    # program-specific install script used by HP pwplus--don't use.
 	    :
 	  else
-	    ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
+	    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=3D"$as_dir/$ac_prog$ac_exec_ext -c"
+	      break 3
+	    fi
 	  fi
 	fi
       done
     done
     ;;
 esac
-done
-IFS=3D$as_save_IFS
-
+
+done
+IFS=3D$as_save_IFS
+
+rm -rf conftest.one conftest.two conftest.dir
=20
 fi
   if test "${ac_cv_path_install+set}" =3D set; then
@@ -4278,8 +4436,8 @@
     INSTALL=3D$ac_install_sh
   fi
 fi
-{ echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
=20
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -4289,11 +4447,12 @@
=20
 test -z "$INSTALL_DATA" && INSTALL_DATA=3D'${INSTALL} -m 644'
=20
-    { echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >=
&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6;=
 }
-set x ${MAKE-make}; ac_make=3D`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_=
/g'`
+    { $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE=
)" >&5
+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=3D`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 if { as_var=3Dac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}=
\" =3D set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
 SHELL =3D /bin/sh
@@ -4310,22 +4469,22 @@
 rm -f conftest.make
 fi
 if eval test \$ac_cv_prog_make_${ac_make}_set =3D yes; then
-  { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+  { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
   SET_MAKE=3D
 else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
   SET_MAKE=3D"MAKE=3D${MAKE-make}"
 fi
=20
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a pr=
ogram name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_RANLIB+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB=3D"$RANLIB" # Let the user override the test.
@@ -4338,7 +4497,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_RANLIB=3D"${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4349,11 +4508,11 @@
 fi
 RANLIB=3D$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -4362,10 +4521,10 @@
   ac_ct_RANLIB=3D$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with a=
rgs.
 set dummy ranlib; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
   ac_cv_prog_ac_ct_RANLIB=3D"$ac_ct_RANLIB" # Let the user override the te=
st.
@@ -4378,7 +4537,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_RANLIB=3D"ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -4389,11 +4548,11 @@
 fi
 ac_ct_RANLIB=3D$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
   if test "x$ac_ct_RANLIB" =3D x; then
@@ -4401,12 +4560,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     RANLIB=3D$ac_ct_RANLIB
@@ -4427,10 +4582,10 @@
     LIBS=3D
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing pthread_create=
" >&5
-echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >=
&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing pthread_cr=
eate" >&5
+$as_echo_n "checking for library containing pthread_create... " >&6; }
 if test "${ac_cv_search_pthread_create+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4468,26 +4623,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_pthread_create=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_pthread_create+set}" =3D set; then
@@ -4502,23 +4661,23 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
-echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5
+$as_echo "$ac_cv_search_pthread_create" >&6; }
 ac_res=3D$ac_cv_search_pthread_create
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find required library function (p=
thread_create)" >&5
-echo "$as_me: error: can't find required library function (pthread_create)=
" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-    { echo "$as_me:$LINENO: checking for library containing pthread_yield"=
 >&5
-echo $ECHO_N "checking for library containing pthread_yield... $ECHO_C" >&=
6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find required library functio=
n (pthread_create)" >&5
+$as_echo "$as_me: error: can't find required library function (pthread_cre=
ate)" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+    { $as_echo "$as_me:$LINENO: checking for library containing pthread_yi=
eld" >&5
+$as_echo_n "checking for library containing pthread_yield... " >&6; }
 if test "${ac_cv_search_pthread_yield+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4556,26 +4715,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_pthread_yield=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_pthread_yield+set}" =3D set; then
@@ -4590,8 +4753,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_yield" >&5
-echo "${ECHO_T}$ac_cv_search_pthread_yield" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_yield" >&5
+$as_echo "$ac_cv_search_pthread_yield" >&6; }
 ac_res=3D$ac_cv_search_pthread_yield
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -4603,10 +4766,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing sched_yield" >=
&5
-echo $ECHO_N "checking for library containing sched_yield... $ECHO_C" >&6;=
 }
+    { $as_echo "$as_me:$LINENO: checking for library containing sched_yiel=
d" >&5
+$as_echo_n "checking for library containing sched_yield... " >&6; }
 if test "${ac_cv_search_sched_yield+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4644,26 +4807,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_sched_yield=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_sched_yield+set}" =3D set; then
@@ -4678,8 +4845,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5
-echo "${ECHO_T}$ac_cv_search_sched_yield" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_sched_yield" >&5
+$as_echo "$ac_cv_search_sched_yield" >&6; }
 ac_res=3D$ac_cv_search_sched_yield
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -4691,10 +4858,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing pthread_setspe=
cific" >&5
-echo $ECHO_N "checking for library containing pthread_setspecific... $ECHO=
_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing pthread_se=
tspecific" >&5
+$as_echo_n "checking for library containing pthread_setspecific... " >&6; =
}
 if test "${ac_cv_search_pthread_setspecific+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4732,26 +4899,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_pthread_setspecific=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_pthread_setspecific+set}" =3D set; then
@@ -4766,8 +4937,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_setspecific" >&5
-echo "${ECHO_T}$ac_cv_search_pthread_setspecific" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pthread_setspecific" >&5
+$as_echo "$ac_cv_search_pthread_setspecific" >&6; }
 ac_res=3D$ac_cv_search_pthread_setspecific
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -4779,10 +4950,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing socket" >&5
-echo $ECHO_N "checking for library containing socket... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing socket" >&=
5
+$as_echo_n "checking for library containing socket... " >&6; }
 if test "${ac_cv_search_socket+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4820,26 +4991,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_socket=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_socket+set}" =3D set; then
@@ -4854,23 +5029,23 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
-echo "${ECHO_T}$ac_cv_search_socket" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_socket" >&5
+$as_echo "$ac_cv_search_socket" >&6; }
 ac_res=3D$ac_cv_search_socket
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find required library function (s=
ocket)" >&5
-echo "$as_me: error: can't find required library function (socket)" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-    { echo "$as_me:$LINENO: checking for library containing gethostbyname"=
 >&5
-echo $ECHO_N "checking for library containing gethostbyname... $ECHO_C" >&=
6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find required library functio=
n (socket)" >&5
+$as_echo "$as_me: error: can't find required library function (socket)" >&=
2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+    { $as_echo "$as_me:$LINENO: checking for library containing gethostbyn=
ame" >&5
+$as_echo_n "checking for library containing gethostbyname... " >&6; }
 if test "${ac_cv_search_gethostbyname+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4908,26 +5083,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gethostbyname=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_gethostbyname+set}" =3D set; then
@@ -4942,8 +5121,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname" >&5
+$as_echo "$ac_cv_search_gethostbyname" >&6; }
 ac_res=3D$ac_cv_search_gethostbyname
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -4955,10 +5134,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing gethostbyname_=
r" >&5
-echo $ECHO_N "checking for library containing gethostbyname_r... $ECHO_C" =
>&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing gethostbyn=
ame_r" >&5
+$as_echo_n "checking for library containing gethostbyname_r... " >&6; }
 if test "${ac_cv_search_gethostbyname_r+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -4996,26 +5175,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_gethostbyname_r=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_gethostbyname_r+set}" =3D set; then
@@ -5030,8 +5213,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5
-echo "${ECHO_T}$ac_cv_search_gethostbyname_r" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_gethostbyname_r" >&5
+$as_echo "$ac_cv_search_gethostbyname_r" >&6; }
 ac_res=3D$ac_cv_search_gethostbyname_r
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -5043,10 +5226,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing xdr_int" >&5
-echo $ECHO_N "checking for library containing xdr_int... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing xdr_int" >=
&5
+$as_echo_n "checking for library containing xdr_int... " >&6; }
 if test "${ac_cv_search_xdr_int+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -5084,26 +5267,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_xdr_int=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_xdr_int+set}" =3D set; then
@@ -5118,23 +5305,23 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_xdr_int" >&5
-echo "${ECHO_T}$ac_cv_search_xdr_int" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_xdr_int" >&5
+$as_echo "$ac_cv_search_xdr_int" >&6; }
 ac_res=3D$ac_cv_search_xdr_int
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find required library function (x=
dr_int)" >&5
-echo "$as_me: error: can't find required library function (xdr_int)" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-
-    { echo "$as_me:$LINENO: checking for library containing inet_aton" >&5
-echo $ECHO_N "checking for library containing inet_aton... $ECHO_C" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find required library functio=
n (xdr_int)" >&5
+$as_echo "$as_me: error: can't find required library function (xdr_int)" >=
&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
+    { $as_echo "$as_me:$LINENO: checking for library containing inet_aton"=
 >&5
+$as_echo_n "checking for library containing inet_aton... " >&6; }
 if test "${ac_cv_search_inet_aton+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -5172,26 +5359,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_inet_aton=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_inet_aton+set}" =3D set; then
@@ -5206,8 +5397,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
-echo "${ECHO_T}$ac_cv_search_inet_aton" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_aton" >&5
+$as_echo "$ac_cv_search_inet_aton" >&6; }
 ac_res=3D$ac_cv_search_inet_aton
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -5219,10 +5410,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking for library containing inet_pton" >&5
-echo $ECHO_N "checking for library containing inet_pton... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing inet_pton"=
 >&5
+$as_echo_n "checking for library containing inet_pton... " >&6; }
 if test "${ac_cv_search_inet_pton+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -5260,26 +5451,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_inet_pton=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_inet_pton+set}" =3D set; then
@@ -5294,8 +5489,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_inet_pton" >&5
-echo "${ECHO_T}$ac_cv_search_inet_pton" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_inet_pton" >&5
+$as_echo "$ac_cv_search_inet_pton" >&6; }
 ac_res=3D$ac_cv_search_inet_pton
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -5326,10 +5521,10 @@
=20
=20
=20
-    { echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$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}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5356,20 +5551,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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_stdc=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_cv_header_stdc=3Dno
@@ -5461,37 +5657,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && { ac_try=3D'./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
=20
 ( exit $ac_status )
 ac_cv_header_stdc=3Dno
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conft=
est.$ac_objext conftest.$ac_ext
 fi
=20
=20
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc =3D yes; then
=20
 cat >>confdefs.h <<\_ACEOF
@@ -5509,20 +5708,21 @@
=20
 for ac_header in err.h execinfo.h stdint.h string.h synch.h sys/cdefs.h sy=
s/types.h
 do
-as_ac_Header=3D`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=3D`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=3D`eval 'as_val=3D${'$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?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $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
@@ -5538,32 +5738,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_header_compiler=3Dno
 fi
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
=20
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $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
@@ -5577,81 +5778,85 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   ac_header_preproc=3Dno
 fi
=20
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
=20
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
 rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compi=
ler, 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 c=
ompiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's resu=
lt" >&2;}
     ac_header_preproc=3Dyes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing pre=
requisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite head=
ers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But=
 Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Com=
piled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $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 docu=
mentation" >&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 p=
reprocessor'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 co=
mpiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will ta=
ke precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=3D\$ac_header_preproc"
 fi
-ac_res=3D`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` =3D yes; then
+ac_res=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" =3D x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-    { echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+
+done
+
+
+
+    { $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >=
&5
+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
 if test "${ac_cv_c_const+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5723,20 +5928,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_const=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_cv_c_const=3Dno
@@ -5744,20 +5950,20 @@
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
+$as_echo "$ac_cv_c_const" >&6; }
 if test $ac_cv_c_const =3D no; then
=20
 cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-    { echo "$as_me:$LINENO: checking for inline" >&5
-echo $ECHO_N "checking for inline... $ECHO_C" >&6; }
+#define const /**/
+_ACEOF
+
+fi
+
+    { $as_echo "$as_me:$LINENO: checking for inline" >&5
+$as_echo_n "checking for inline... " >&6; }
 if test "${ac_cv_c_inline+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=3Dno
 for ac_kw in inline __inline__ __inline; do
@@ -5780,20 +5986,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_inline=3D$ac_kw
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
=20
@@ -5804,8 +6011,8 @@
 done
=20
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
-echo "${ECHO_T}$ac_cv_c_inline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
+$as_echo "$ac_cv_c_inline" >&6; }
=20
=20
 case $ac_cv_c_inline in
@@ -5823,10 +6030,10 @@
     ;;
 esac
=20
-    { echo "$as_me:$LINENO: checking for working volatile" >&5
-echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for working volatile" >&5
+$as_echo_n "checking for working volatile... " >&6; }
 if test "${ac_cv_c_volatile+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5852,20 +6059,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_c_volatile=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_cv_c_volatile=3Dno
@@ -5873,70 +6081,111 @@
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
-echo "${ECHO_T}$ac_cv_c_volatile" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
+$as_echo "$ac_cv_c_volatile" >&6; }
 if test $ac_cv_c_volatile =3D no; then
=20
 cat >>confdefs.h <<\_ACEOF
-#define volatile
-_ACEOF
-
-fi
-
-    { echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
+#define volatile /**/
+_ACEOF
+
+fi
+
+    { $as_echo "$as_me:$LINENO: checking for mode_t" >&5
+$as_echo_n "checking for mode_t... " >&6; }
 if test "${ac_cv_type_mode_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef mode_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_mode_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_mode_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
-if test $ac_cv_type_mode_t =3D yes; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_mode_t=3Dno
+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
+int
+main ()
+{
+if (sizeof (mode_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+int
+main ()
+{
+if (sizeof ((mode_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
+
+	ac_cv_type_mode_t=3Dyes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
+$as_echo "$ac_cv_type_mode_t" >&6; }
+if test "x$ac_cv_type_mode_t" =3D x""yes; then
   :
 else
=20
@@ -5946,8 +6195,8 @@
=20
 fi
=20
-    { echo "$as_me:$LINENO: checking value for _FILE_OFFSET_BITS preproces=
sor symbol" >&5
-echo $ECHO_N "checking value for _FILE_OFFSET_BITS preprocessor symbol... =
$ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking value for _FILE_OFFSET_BITS prepr=
ocessor symbol" >&5
+$as_echo_n "checking value for _FILE_OFFSET_BITS preprocessor symbol... " =
>&6; }
     ac_file_offset_bits=3D64
=20
 # Check whether --with-file-offset-bits was given.
@@ -5955,8 +6204,8 @@
   withval=3D$with_file_offset_bits; ac_file_offset_bits=3D$withval
 fi
=20
-    { echo "$as_me:$LINENO: result: $ac_file_offset_bits" >&5
-echo "${ECHO_T}$ac_file_offset_bits" >&6; }
+    { $as_echo "$as_me:$LINENO: result: $ac_file_offset_bits" >&5
+$as_echo "$ac_file_offset_bits" >&6; }
     if test $ac_file_offset_bits =3D 64 ; then
         SYS_CFLAGS=3D"-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=3D64"
     else
@@ -5965,68 +6214,14 @@
=20
     oasys_ac_cppflags_save=3D"$CPPFLAGS"
     CPPFLAGS=3D"$SYS_CFLAGS $CPPFLAGS"
-    { echo "$as_me:$LINENO: checking for off_t" >&5
-echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_off_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef off_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_off_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_off_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
-
-# The cast to long int works around a bug in the HP C Compiler
+    # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
 # declarations like `int a3[[(sizeof (unsigned char)) >=3D 0]];'.
 # This bug is HP SR number 8606223364.
-{ echo "$as_me:$LINENO: checking size of off_t" >&5
-echo $ECHO_N "checking size of off_t... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
+$as_echo_n "checking size of off_t... " >&6; }
 if test "${ac_cv_sizeof_off_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" =3D yes; then
   # Depending upon the size, compute the lo and hi bounds.
@@ -6037,11 +6232,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) =
>=3D 0)];
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >=3D 0)];
 test_array [0] =3D 0
=20
   ;
@@ -6054,13 +6248,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -6074,11 +6269,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) =
<=3D $ac_mid)];
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <=3D $ac_mi=
d)];
 test_array [0] =3D 0
=20
   ;
@@ -6091,20 +6285,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=3D$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_lo=3D`expr $ac_mid + 1`
@@ -6118,7 +6313,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	cat >conftest.$ac_ext <<_ACEOF
@@ -6128,11 +6323,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) =
< 0)];
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
 test_array [0] =3D 0
=20
   ;
@@ -6145,13 +6339,14 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
@@ -6165,11 +6360,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) =
>=3D $ac_mid)];
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >=3D $ac_mi=
d)];
 test_array [0] =3D 0
=20
   ;
@@ -6182,20 +6376,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_lo=3D$ac_mid; break
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_hi=3D`expr '(' $ac_mid ')' - 1`
@@ -6209,7 +6404,7 @@
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
   done
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_lo=3D ac_hi=3D
@@ -6229,11 +6424,10 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-int
-main ()
-{
-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) =
<=3D $ac_mid)];
+int
+main ()
+{
+static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <=3D $ac_mi=
d)];
 test_array [0] =3D 0
=20
   ;
@@ -6246,20 +6440,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_hi=3D$ac_mid
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_lo=3D`expr '(' $ac_mid ')' + 1`
@@ -6270,11 +6465,13 @@
 case $ac_lo in
 ?*) ac_cv_sizeof_off_t=3D$ac_lo;;
 '') if test "$ac_cv_type_off_t" =3D yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+     { { $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 compute sizeof (off_t)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off_t)
+$as_echo "$as_me: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_off_t=3D0
    fi ;;
@@ -6287,9 +6484,8 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 $ac_includes_default
-   typedef off_t ac__type_sizeof_;
-static long int longval () { return (long int) (sizeof (ac__type_sizeof_))=
; }
-static unsigned long int ulongval () { return (long int) (sizeof (ac__type=
_sizeof_)); }
+static long int longval () { return (long int) (sizeof (off_t)); }
+static unsigned long int ulongval () { return (long int) (sizeof (off_t));=
 }
 #include <stdio.h>
 #include <stdlib.h>
 int
@@ -6299,20 +6495,22 @@
   FILE *f =3D fopen ("conftest.val", "w");
   if (! f)
     return 1;
-  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
+  if (((long int) (sizeof (off_t))) < 0)
     {
       long int i =3D longval ();
-      if (i !=3D ((long int) (sizeof (ac__type_sizeof_))))
+      if (i !=3D ((long int) (sizeof (off_t))))
 	return 1;
-      fprintf (f, "%ld\n", i);
+      fprintf (f, "%ld", i);
     }
   else
     {
       unsigned long int i =3D ulongval ();
-      if (i !=3D ((long int) (sizeof (ac__type_sizeof_))))
+      if (i !=3D ((long int) (sizeof (off_t))))
 	return 1;
-      fprintf (f, "%lu\n", i);
+      fprintf (f, "%lu", i);
     }
+  /* Do not output a trailing newline, as this causes \r\n confusion
+     on some platforms.  */
   return ferror (f) || fclose (f) !=3D 0;
=20
   ;
@@ -6325,43 +6523,48 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_link") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && { ac_try=3D'./conftest$ac_exeext'
   { (case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_try") 2>&5
   ac_status=3D$?
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_off_t=3D`cat conftest.val`
 else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+  $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
=20
 ( exit $ac_status )
 if test "$ac_cv_type_off_t" =3D yes; then
-     { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+     { { $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 compute sizeof (off_t)
 See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute sizeof (off_t)
+$as_echo "$as_me: error: cannot compute sizeof (off_t)
 See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
+   { (exit 77); exit 77; }; }; }
    else
      ac_cv_sizeof_off_t=3D0
    fi
 fi
+rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conft=
est.$ac_objext conftest.$ac_ext
 fi
 rm -f conftest.val
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
-echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
+$as_echo "$ac_cv_sizeof_off_t" >&6; }
=20
=20
=20
@@ -6371,10 +6574,10 @@
=20
=20
     CPPFLAGS=3D"$oasys_ac_cppflags_save"
-    { echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking return type of signal handlers" >=
&5
+$as_echo_n "checking return type of signal handlers... " >&6; }
 if test "${ac_cv_type_signal+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6399,20 +6602,21 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
        } && test -s conftest.$ac_objext; then
   ac_cv_type_signal=3Dint
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_cv_type_signal=3Dvoid
@@ -6420,68 +6624,109 @@
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
+$as_echo "$ac_cv_type_signal" >&6; }
=20
 cat >>confdefs.h <<_ACEOF
 #define RETSIGTYPE $ac_cv_type_signal
 _ACEOF
=20
=20
-    { echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for size_t" >&5
+$as_echo_n "checking for size_t... " >&6; }
 if test "${ac_cv_type_size_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_size_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t =3D yes; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_size_t=3Dno
+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
+int
+main ()
+{
+if (sizeof (size_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+int
+main ()
+{
+if (sizeof ((size_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
+
+	ac_cv_type_size_t=3Dyes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+$as_echo "$ac_cv_type_size_t" >&6; }
+if test "x$ac_cv_type_size_t" =3D x""yes; then
   :
 else
=20
@@ -6491,60 +6736,101 @@
=20
 fi
=20
-    { echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
-echo $ECHO_N "checking for ptrdiff_t... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for ptrdiff_t" >&5
+$as_echo_n "checking for ptrdiff_t... " >&6; }
 if test "${ac_cv_type_ptrdiff_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef ptrdiff_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_ptrdiff_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_ptrdiff_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
-echo "${ECHO_T}$ac_cv_type_ptrdiff_t" >&6; }
-if test $ac_cv_type_ptrdiff_t =3D yes; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_ptrdiff_t=3Dno
+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
+int
+main ()
+{
+if (sizeof (ptrdiff_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+int
+main ()
+{
+if (sizeof ((ptrdiff_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
+
+	ac_cv_type_ptrdiff_t=3Dyes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ptrdiff_t" >&5
+$as_echo "$ac_cv_type_ptrdiff_t" >&6; }
+if test "x$ac_cv_type_ptrdiff_t" =3D x""yes; then
=20
 cat >>confdefs.h <<_ACEOF
 #define HAVE_PTRDIFF_T 1
@@ -6553,60 +6839,101 @@
=20
 fi
=20
-    { echo "$as_me:$LINENO: checking for uint32_t" >&5
-echo $ECHO_N "checking for uint32_t... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+$as_echo_n "checking for uint32_t... " >&6; }
 if test "${ac_cv_type_uint32_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef uint32_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_uint32_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_uint32_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
-echo "${ECHO_T}$ac_cv_type_uint32_t" >&6; }
-if test $ac_cv_type_uint32_t =3D yes; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_uint32_t=3Dno
+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
+int
+main ()
+{
+if (sizeof (uint32_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+int
+main ()
+{
+if (sizeof ((uint32_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
+
+	ac_cv_type_uint32_t=3Dyes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_uint32_t" >&5
+$as_echo "$ac_cv_type_uint32_t" >&6; }
+if test "x$ac_cv_type_uint32_t" =3D x""yes; then
=20
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UINT32_T 1
@@ -6615,60 +6942,101 @@
=20
 fi
=20
-    { echo "$as_me:$LINENO: checking for u_int32_t" >&5
-echo $ECHO_N "checking for u_int32_t... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for u_int32_t" >&5
+$as_echo_n "checking for u_int32_t... " >&6; }
 if test "${ac_cv_type_u_int32_t+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef u_int32_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try=3D"$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
-  *) ac_try_echo=3D$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_u_int32_t=3Dyes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-	ac_cv_type_u_int32_t=3Dno
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
-echo "${ECHO_T}$ac_cv_type_u_int32_t" >&6; }
-if test $ac_cv_type_u_int32_t =3D yes; then
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_type_u_int32_t=3Dno
+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
+int
+main ()
+{
+if (sizeof (u_int32_t))
+       return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  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
+int
+main ()
+{
+if (sizeof ((u_int32_t)))
+	  return 0;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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
+
+	ac_cv_type_u_int32_t=3Dyes
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+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
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_u_int32_t" >&5
+$as_echo "$ac_cv_type_u_int32_t" >&6; }
+if test "x$ac_cv_type_u_int32_t" =3D x""yes; then
=20
 cat >>confdefs.h <<_ACEOF
 #define HAVE_U_INT32_T 1
@@ -6687,11 +7055,11 @@
=20
 for ac_func in fdatasync getaddrinfo getopt_long cfmakeraw cfsetspeed
 do
-as_ac_var=3D`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
+as_ac_var=3D`$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=3D$as_ac_var; eval "test \"\${$as_var+set}\" =3D set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -6744,35 +7112,42 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   eval "$as_ac_var=3Dyes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	eval "$as_ac_var=3Dno"
 fi
=20
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=3D`eval echo '${'$as_ac_var'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` =3D 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
+ac_res=3D`eval 'as_val=3D${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=3D`eval 'as_val=3D${'$as_ac_var'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" =3D x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
=20
 fi
@@ -6789,18 +7164,18 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with non-atomic \"=
atomic\" routines" >&5
-echo $ECHO_N "checking whether to compile with non-atomic \"atomic\" routi=
nes... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $atomic_nonatomic" >&5
-echo "${ECHO_T}$atomic_nonatomic" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with non-atomi=
c \"atomic\" routines" >&5
+$as_echo_n "checking whether to compile with non-atomic \"atomic\" routine=
s... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $atomic_nonatomic" >&5
+$as_echo "$atomic_nonatomic" >&6; }
=20
     if test $atomic_nonatomic =3D yes ; then
-        { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
-        { echo "$as_me:$LINENO: *** WARNING: non-atomic \"atomic\" routine=
s are for testing only ***" >&5
-echo "$as_me: *** WARNING: non-atomic \"atomic\" routines are for testing =
only ***" >&6;}
-        { echo "$as_me:$LINENO: ***" >&5
-echo "$as_me: ***" >&6;}
+        { $as_echo "$as_me:$LINENO: ***" >&5
+$as_echo "$as_me: ***" >&6;}
+        { $as_echo "$as_me:$LINENO: *** WARNING: non-atomic \"atomic\" rou=
tines are for testing only ***" >&5
+$as_echo "$as_me: *** WARNING: non-atomic \"atomic\" routines are for test=
ing only ***" >&6;}
+        { $as_echo "$as_me:$LINENO: ***" >&5
+$as_echo "$as_me: ***" >&6;}
=20
=20
 cat >>confdefs.h <<_ACEOF
@@ -6817,10 +7192,10 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with assembly-base=
d atomic functions" >&5
-echo $ECHO_N "checking whether to compile with assembly-based atomic funct=
ions... $ECHO_C" >&6; }
-    { echo "$as_me:$LINENO: result: $atomic_asm" >&5
-echo "${ECHO_T}$atomic_asm" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with assembly-=
based atomic functions" >&5
+$as_echo_n "checking whether to compile with assembly-based atomic functio=
ns... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $atomic_asm" >&5
+$as_echo "$atomic_asm" >&6; }
=20
     if test $atomic_asm =3D no ; then
=20
@@ -6863,11 +7238,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var cont=
ains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;=
;
+      *_cv_*) { $as_echo "$as_me:$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=3D ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -6900,12 +7276,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" !=3D "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file"=
 >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -6918,24 +7294,24 @@
=20
     if test -z "$PYTHON"
   then
-    { echo "$as_me:$LINENO: checking for --with-python" >&5
-echo $ECHO_N "checking for --with-python... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for --with-python" >&5
+$as_echo_n "checking for --with-python... " >&6; }
=20
 # Check whether --with-python was given.
 if test "${with_python+set}" =3D set; then
   withval=3D$with_python;  if test "$withval" !=3D "yes"
                   then
                     PYTHON=3D"$withval"
-                    { echo "$as_me:$LINENO: result: $withval" >&5
-echo "${ECHO_T}$withval" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: $withval" >&5
+$as_echo "$withval" >&6; }
                   else
-                    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+                    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
                   fi
=20
 else
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+   { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
=20
 fi
=20
@@ -6945,10 +7321,10 @@
   then
     # Extract the first word of "python", so it can be a program name with=
 args.
 set dummy python; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_path_PYTHON+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   case $PYTHON in
   [\\/]* | ?:[\\/]*)
@@ -6963,7 +7339,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_path_PYTHON=3D"$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -6976,11 +7352,11 @@
 fi
 PYTHON=3D$ac_cv_path_PYTHON
 if test -n "$PYTHON"; then
-  { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -6992,8 +7368,8 @@
=20
     if test ! -z "$PYTHON" ; then
=20
-    { echo "$as_me:$LINENO: checking whether python distutils can build an=
 extension module" >&5
-echo $ECHO_N "checking whether python distutils can build an extension mod=
ule... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether python distutils can buil=
d an extension module" >&5
+$as_echo_n "checking whether python distutils can build an extension modul=
e... " >&6; }
=20
     cat > conftest.c <<_ACEOF
=20
@@ -7025,13 +7401,13 @@
      ac_python_build=3D$?
=20
      if test $ac_python_build =3D 0 ; then
-     	{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+     	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
 	PYTHON_BUILD_EXT=3Dyes
=20
      else
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
      fi
=20
      rm -rf conftest_build conftest.py conftest.c
@@ -7064,8 +7440,8 @@
=20
=20
                 if test $ac_tcldir =3D no ; then
-       { { echo "$as_me:$LINENO: error: cannot configure without tcl" >&5
-echo "$as_me: error: cannot configure without tcl" >&2;}
+       { { $as_echo "$as_me:$LINENO: error: tcl MUST be installed to confi=
gure" >&5
+$as_echo "$as_me: error: tcl MUST be installed to configure" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -7078,10 +7454,10 @@
     LDFLAGS=3D
     LIBS=3D
=20
-    { echo "$as_me:$LINENO: checking for library containing pow" >&5
-echo $ECHO_N "checking for library containing pow... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking for library containing pow" >&5
+$as_echo_n "checking for library containing pow... " >&6; }
 if test "${ac_cv_search_pow+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7119,26 +7495,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_pow=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_pow+set}" =3D set; then
@@ -7153,22 +7533,22 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
-echo "${ECHO_T}$ac_cv_search_pow" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_pow" >&5
+$as_echo "$ac_cv_search_pow" >&6; }
 ac_res=3D$ac_cv_search_pow
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find required library function (p=
ow)" >&5
-echo "$as_me: error: can't find required library function (pow)" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-    { echo "$as_me:$LINENO: checking for library containing dlopen" >&5
-echo $ECHO_N "checking for library containing dlopen... $ECHO_C" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find standard C library funct=
ion (pow) required by tcl" >&5
+$as_echo "$as_me: error: can't find standard C library function (pow) requ=
ired by tcl" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+    { $as_echo "$as_me:$LINENO: checking for library containing dlopen" >&=
5
+$as_echo_n "checking for library containing dlopen... " >&6; }
 if test "${ac_cv_search_dlopen+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7206,26 +7586,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_dlopen=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_dlopen+set}" =3D set; then
@@ -7240,15 +7624,15 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
-echo "${ECHO_T}$ac_cv_search_dlopen" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_dlopen" >&5
+$as_echo "$ac_cv_search_dlopen" >&6; }
 ac_res=3D$ac_cv_search_dlopen
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find required library function (d=
lopen)" >&5
-echo "$as_me: error: can't find required library function (dlopen)" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: can't find standard library functio=
n (dlopen) required by tcl" >&5
+$as_echo "$as_me: error: can't find standard library function (dlopen) req=
uired by tcl" >&2;}
    { (exit 1); exit 1; }; }
 fi
=20
@@ -7270,8 +7654,8 @@
     LIBS=3D$ac_extlib_save_LIBS
=20
=20
-                        if test $ac_tcldir =3D system -a ! x$oasys_cv_path=
_tcl_h =3D x ; then
-        echo "checking for tcl installation... (cached) $oasys_cv_path_tcl=
_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
+                        if test $ac_tcldir =3D system -a ! x$oasys_cv_path=
_tcl_h =3D x ; then \
+	echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.=
h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
     else
=20
     oasys_cv_path_tcl_h=3D
@@ -7284,9 +7668,9 @@
         ac_tcldir=3Dsystem
         ac_tclincdirs=3D"/usr/include /usr/local/include"
 	for ac_tclver in $ac_tclvers ; do
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver"
-           ac_tclincdirs=3D"$ac_tclincdirs /usr/local/include/tcl$ac_tclve=
r"
-        done
+           ac_tclincdirs=3D"$ac_tclincdirs /usr/include/tcl$ac_tclver /usr=
/local/include/tcl$ac_tclver"
+           ac_tclincdirs=3D"$ac_tclincdirs"
+       done
         ac_tcllibdirs=3D"/usr/lib /usr/local/lib"
     else
         ac_tclincdirs=3D$ac_tcldir/include
@@ -7295,8 +7679,8 @@
=20
     for ac_tclver in $ac_tclvers ; do
         echo ""
-        { echo "$as_me:$LINENO: checking for tcl installation (version $ac=
_tclver)" >&5
-echo "$as_me: checking for tcl installation (version $ac_tclver)" >&6;}
+        { $as_echo "$as_me:$LINENO: checking for tcl installation (version=
 $ac_tclver)" >&5
+$as_echo "$as_me: checking for tcl installation (version $ac_tclver)" >&6;=
}
=20
     for ac_tclincdir in $ac_tclincdirs; do
=20
@@ -7306,8 +7690,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS"
 	LIBS=3D"$ac_save_LIBS"
=20
-					        { echo "$as_me:$LINENO: checking for tcl.h (version $ac_tclve=
r) in $ac_tclincdir" >&5
-echo $ECHO_N "checking for tcl.h (version $ac_tclver) in $ac_tclincdir... =
$ECHO_C" >&6; }
+					        { $as_echo "$as_me:$LINENO: checking for tcl.h (version $ac_t=
clver) in $ac_tclincdir" >&5
+$as_echo_n "checking for tcl.h (version $ac_tclver) in $ac_tclincdir... " =
>&6; }
=20
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7338,33 +7722,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
               continue
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
=20
@@ -7378,8 +7766,8 @@
 		LIBS=3D"-l$ac_tcllib $ac_save_LIBS"
 	fi
=20
-        { echo "$as_me:$LINENO: checking for tcl library in $ac_tcllibdir:=
 $LIBS" >&5
-echo $ECHO_N "checking for tcl library in $ac_tcllibdir: $LIBS... $ECHO_C"=
 >&6; }
+        { $as_echo "$as_me:$LINENO: checking for tcl library in $ac_tcllib=
dir: $LIBS" >&5
+$as_echo_n "checking for tcl library in $ac_tcllibdir: $LIBS... " >&6; }
=20
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -7411,21 +7799,24 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_tcl_h=3D$ac_tclincdir
               oasys_cv_path_tcl_lib=3D$ac_tcllibdir
               oasys_cv_lib_tcl=3D$ac_tcllib
@@ -7439,15 +7830,16 @@
               break 4
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -7460,8 +7852,8 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test x$oasys_cv_path_tcl_h =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable tcl.h" >&5
-echo "$as_me: error: can't find usable tcl.h" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: Please install the tcl develo=
pment files headers and libraries. Can't find usable tcl.h " >&5
+$as_echo "$as_me: error: Please install the tcl development files headers =
and libraries. Can't find usable tcl.h " >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -7501,16 +7893,16 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether to compile with google profil=
ing" >&5
-echo $ECHO_N "checking whether to compile with google profiling... $ECHO_C=
" >&6; }
-    { echo "$as_me:$LINENO: result: $google_profile" >&5
-echo "${ECHO_T}$google_profile" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether to compile with google pr=
ofiling" >&5
+$as_echo_n "checking whether to compile with google profiling... " >&6; }
+    { $as_echo "$as_me:$LINENO: result: $google_profile" >&5
+$as_echo "$google_profile" >&6; }
=20
     GOOGLE_PROFILE_ENABLED=3D0
     if test $google_profile =3D yes ; then
         if test $ac_google_perfdir =3D no ; then
-	   { { echo "$as_me:$LINENO: error: must specify --with-google-perftools =
to use google profiling" >&5
-echo "$as_me: error: must specify --with-google-perftools to use google pr=
ofiling" >&2;}
+	   { { $as_echo "$as_me:$LINENO: error: must specify --with-google-perfto=
ols to use google profiling" >&5
+$as_echo "$as_me: error: must specify --with-google-perftools to use googl=
e profiling" >&2;}
    { (exit 1); exit 1; }; }
 	fi
         GOOGLE_PROFILE_ENABLED=3D1
@@ -7571,8 +7963,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS"
 	LIBS=3D"$ac_save_LIBS"
=20
-					        { echo "$as_me:$LINENO: checking for google perftools header =
profiler.h in $ac_google_perfincdir" >&5
-echo $ECHO_N "checking for google perftools header profiler.h in $ac_googl=
e_perfincdir... $ECHO_C" >&6; }
+					        { $as_echo "$as_me:$LINENO: checking for google perftools hea=
der profiler.h in $ac_google_perfincdir" >&5
+$as_echo_n "checking for google perftools header profiler.h in $ac_google_=
perfincdir... " >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7597,35 +7989,39 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-	      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+	      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_google_perf_h=3D$ac_google_perfincdir
 	      break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 	      continue
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -7638,8 +8034,8 @@
=20
=20
     if test x$oasys_cv_path_google_perf_h =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable google perftool=
s installation" >&5
-echo "$as_me: error: can't find usable google perftools installation" >&2;=
}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable google perf=
tools installation" >&5
+$as_echo "$as_me: error: can't find usable google perftools installation" =
>&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -7655,8 +8051,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS -L$ac_google_perflibdir"
         LIBS=3D"$ac_save_LIBS -lprofiler"
=20
-        { echo "$as_me:$LINENO: checking for google perftolos library libp=
rofiler in $ac_google_perflibdir" >&5
-echo $ECHO_N "checking for google perftolos library libprofiler in $ac_goo=
gle_perflibdir... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for google perftolos library =
libprofiler in $ac_google_perflibdir" >&5
+$as_echo_n "checking for google perftolos library libprofiler in $ac_googl=
e_perflibdir... " >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -7682,34 +8078,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_google_perf_lib=3D$ac_google_perflibdir
               break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -7726,8 +8126,8 @@
=20
=20
     if test x$oasys_cv_path_google_perf_lib =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable google perftool=
s library" >&5
-echo "$as_me: error: can't find usable google perftools library" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable google perf=
tools library" >&5
+$as_echo "$as_me: error: can't find usable google perftools library" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -7759,16 +8159,16 @@
     ac_has_libbluetooth=3D"no"
     ac_has_bluetooth_h=3D"no"
=20
-    { echo "$as_me:$LINENO: checking whether bluetooth support should be e=
nabled" >&5
-echo $ECHO_N "checking whether bluetooth support should be enabled... $ECH=
O_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether bluetooth support should =
be enabled" >&5
+$as_echo_n "checking whether bluetooth support should be enabled... " >&6;=
 }
=20
     if test "$ac_use_bluez" =3D "no"; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-    else
-        { echo "$as_me:$LINENO: result: $ac_use_bluez" >&5
-echo "${ECHO_T}$ac_use_bluez" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+    else
+        { $as_echo "$as_me:$LINENO: result: $ac_use_bluez" >&5
+$as_echo "$ac_use_bluez" >&6; }
=20
=20
     ac_extlib_save_CFLAGS=3D$CFLAGS
@@ -7779,10 +8179,10 @@
     LDFLAGS=3D
     LIBS=3D
=20
-        { echo "$as_me:$LINENO: checking for library containing baswap" >&=
5
-echo $ECHO_N "checking for library containing baswap... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for library containing baswap=
" >&5
+$as_echo_n "checking for library containing baswap... " >&6; }
 if test "${ac_cv_search_baswap+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -7820,26 +8220,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_baswap=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_baswap+set}" =3D set; then
@@ -7854,8 +8258,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_baswap" >&5
-echo "${ECHO_T}$ac_cv_search_baswap" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_baswap" >&5
+$as_echo "$ac_cv_search_baswap" >&6; }
 ac_res=3D$ac_cv_search_baswap
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -7883,20 +8287,21 @@
=20
 for ac_header in bluetooth/bluetooth.h
 do
-as_ac_Header=3D`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-ac_res=3D`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=3D`eval 'as_val=3D${'$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?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $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
@@ -7912,32 +8317,33 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	ac_header_compiler=3Dno
 fi
=20
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
=20
 # Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $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
@@ -7951,69 +8357,73 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
   (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
   ac_status=3D$?
   grep -v '^ *+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $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=3Dyes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
   ac_header_preproc=3Dno
 fi
=20
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
=20
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
   yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
 rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compi=
ler, 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 c=
ompiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's resu=
lt" >&2;}
     ac_header_preproc=3Dyes
     ;;
   no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing pre=
requisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite head=
ers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But=
 Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Com=
piled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
-
-    ;;
-esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+    { $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 docu=
mentation" >&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 p=
reprocessor'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 co=
mpiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will ta=
ke precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   eval "$as_ac_Header=3D\$ac_header_preproc"
 fi
-ac_res=3D`eval echo '${'$as_ac_Header'}'`
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` =3D yes; then
+ac_res=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" =3D x""yes; then
   cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  ac_has_bluetooth_h=3D"yes"
 fi
@@ -8021,8 +8431,8 @@
 done
=20
=20
-                                { echo "$as_me:$LINENO: checking whether b=
luetooth support was found" >&5
-echo $ECHO_N "checking whether bluetooth support was found... $ECHO_C" >&6=
; }
+                                { $as_echo "$as_me:$LINENO: checking wheth=
er bluetooth support was found" >&5
+$as_echo_n "checking whether bluetooth support was found... " >&6; }
=20
                                 if test "$ac_has_libbluetooth" =3D yes -a =
"$ac_has_bluetooth_h" =3D yes; then
=20
@@ -8030,16 +8440,16 @@
 #define OASYS_BLUETOOTH_ENABLED 1
 _ACEOF
=20
-          { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
=20
 	elif test "$ac_use_bluez" =3D "try" ; then
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
=20
         else
-          { { echo "$as_me:$LINENO: error: can't find bluez headers or lib=
rary" >&5
-echo "$as_me: error: can't find bluez headers or library" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: can't find bluez headers or=
 library" >&5
+$as_echo "$as_me: error: can't find bluez headers or library" >&2;}
    { (exit 1); exit 1; }; }
         fi
     fi
@@ -8054,21 +8464,21 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether expat support should be enabl=
ed" >&5
-echo $ECHO_N "checking whether expat support should be enabled... $ECHO_C"=
 >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether expat support should be e=
nabled" >&5
+$as_echo_n "checking whether expat support should be enabled... " >&6; }
=20
                 if test "$ac_expatdir" =3D no ; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     LIBEXPAT_ENABLED=3D0
     else
=20
     if test "$ac_expatdir" =3D try ; then
-       { echo "$as_me:$LINENO: result: try" >&5
-echo "${ECHO_T}try" >&6; }
-    else
-       { echo "$as_me:$LINENO: result: yes (dir $ac_expatdir)" >&5
-echo "${ECHO_T}yes (dir $ac_expatdir)" >&6; }
+       { $as_echo "$as_me:$LINENO: result: try" >&5
+$as_echo "try" >&6; }
+    else
+       { $as_echo "$as_me:$LINENO: result: yes (dir $ac_expatdir)" >&5
+$as_echo "yes (dir $ac_expatdir)" >&6; }
     fi
                             if test "$ac_expatdir" =3D yes -a ! x$oasys_cv=
_path_expat_h =3D x ; then
         if test ! "$oasys_cv_lib_expat" =3D "" ; then
@@ -8110,8 +8520,8 @@
 		LIBS=3D"-l$ac_expatlib $ac_save_LIBS"
 	fi
=20
-        { echo "$as_me:$LINENO: checking for expat in $ac_expatincdir, $ac=
_expatlibdir, -l$ac_expatlib" >&5
-echo $ECHO_N "checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$a=
c_expatlib... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for expat in $ac_expatincdir,=
 $ac_expatlibdir, -l$ac_expatlib" >&5
+$as_echo_n "checking for expat in $ac_expatincdir, $ac_expatlibdir, -l$ac_=
expatlib... " >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -8138,39 +8548,43 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_c_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_expat_h=3D$ac_expatincdir
               oasys_cv_path_expat_lib=3D$ac_expatlibdir
               oasys_cv_lib_expat=3D$ac_expatlib
               break 4
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
               oasys_cv_path_expat_h=3D
               oasys_cv_path_expat_lib=3D
               oasys_cv_lib_expat=3D
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -8180,17 +8594,17 @@
     LDFLAGS=3D"$ac_save_LDFLAGS"
     LIBS=3D"$ac_save_LIBS"
=20
-    { echo "$as_me:$LINENO: checking whether libexpat was found" >&5
-echo $ECHO_N "checking whether libexpat was found... $ECHO_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether libexpat was found" >&5
+$as_echo_n "checking whether libexpat was found... " >&6; }
     if test ! x$oasys_cv_path_expat_h =3D x ; then
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
     elif test $ac_expatdir =3D try ; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-    else
-        { { echo "$as_me:$LINENO: error: can't find usable expat installat=
ion" >&5
-echo "$as_me: error: can't find usable expat installation" >&2;}
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+    else
+        { { $as_echo "$as_me:$LINENO: error: can't find usable expat insta=
llation" >&5
+$as_echo "$as_me: error: can't find usable expat installation" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -8229,24 +8643,28 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether xerces-c support should be en=
abled" >&5
-echo $ECHO_N "checking whether xerces-c support should be enabled... $ECHO=
_C" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether xerces-c support should b=
e enabled" >&5
+$as_echo_n "checking whether xerces-c support should be enabled... " >&6; =
}
=20
                 if test "$ac_with_xerces_c" =3D no; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         XERCES_C_ENABLED=3D0
+	echo ""
+	{ $as_echo "$as_me:$LINENO: Proceeding without xerces-c support as reques=
ted" >&5
+$as_echo "$as_me: Proceeding without xerces-c support as requested" >&6;}
+	echo ""
     else
=20
                 if test "$ac_with_xerces_c" =3D try \
          -o "$ac_with_xerces_c" =3D yes \
          -o "$ac_with_xerces_c" =3D "" ; then
-        { echo "$as_me:$LINENO: result: try" >&5
-echo "${ECHO_T}try" >&6; }
+        { $as_echo "$as_me:$LINENO: result: try" >&5
+$as_echo "try" >&6; }
         ac_xerces_inst_dirs=3D"/usr /usr/local"
     else
-        { echo "$as_me:$LINENO: result: yes (dir $ac_with_xerces_c)" >&5
-echo "${ECHO_T}yes (dir $ac_with_xerces_c)" >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes (dir $ac_with_xerces_c)" >=
&5
+$as_echo "yes (dir $ac_with_xerces_c)" >&6; }
         ac_xerces_inst_dirs=3D"$ac_with_xerces_c"
     fi
=20
@@ -8254,10 +8672,10 @@
     ac_save_LDFLAGS=3D"$LDFLAGS"
     ac_save_LIBS=3D"$LIBS"
=20
-    { echo "$as_me:$LINENO: checking whether xerces-c (>=3D v2.6.0) was fo=
und" >&5
-echo $ECHO_N "checking whether xerces-c (>=3D v2.6.0) was found... $ECHO_C=
" >&6; }
+    { $as_echo "$as_me:$LINENO: checking whether xerces-c (>=3D v2.6.0) wa=
s found" >&5
+$as_echo_n "checking whether xerces-c (>=3D v2.6.0) was found... " >&6; }
     if test "${oasys_cv_path_xerces_c+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
=20
         for ac_xerces_inst_dir in $ac_xerces_inst_dirs; do
@@ -8311,24 +8729,27 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
=20
                         oasys_cv_path_xerces_c=3D"$ac_xerces_inst_dir"
                         break
=20
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
=20
@@ -8337,6 +8758,7 @@
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
             fi
@@ -8350,12 +8772,12 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test -z "$oasys_cv_path_xerces_c"; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
         XERCES_C_ENABLED=3D0
     else
-	{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+	{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
         XERCES_C_ENABLED=3D1
=20
 cat >>confdefs.h <<\_ACEOF
@@ -8371,6 +8793,241 @@
=20
     fi
=20
+ac_ext=3Dcpp
+ac_cpp=3D'$CXXCPP $CPPFLAGS'
+ac_compile=3D'$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link=3D'$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftes=
t.$ac_ext $LIBS >&5'
+ac_compiler_gnu=3D$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if test "${ac_cv_prog_CXXCPP+set}" =3D set; then
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=3Dfalse
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try=3D"$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try=3D"$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; 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=3D:
+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
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=3D$CXXCPP
+
+fi
+  CXXCPP=3D$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=3D$CXXCPP
+fi
+{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=3Dfalse
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <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
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if { (ac_try=3D"$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  :
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  # 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
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if { (ac_try=3D"$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; 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=3D:
+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
+  :
+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: C++ preprocessor \"$CXXCPP\" fails sa=
nity check
+See \`config.log' for more details." >&5
+$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details." >&2;}
+   { (exit 1); exit 1; }; }; }
+fi
+
+ac_ext=3Dcpp
+ac_cpp=3D'$CXXCPP $CPPFLAGS'
+ac_compile=3D'$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link=3D'$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftes=
t.$ac_ext $LIBS >&5'
+ac_compiler_gnu=3D$ac_cv_cxx_compiler_gnu
+
+
+
+#ac_tclreadlinedir=3D'system'
=20
=20
 # Check whether --with-tclreadline was given.
@@ -8381,22 +9038,21 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether tclreadline support should be=
 enabled" >&5
-echo $ECHO_N "checking whether tclreadline support should be enabled... $E=
CHO_C" >&6; }
-
-                if test "$ac_tclreadline" =3D no ; then
-    { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+            	{ $as_echo "$as_me:$LINENO: checking whether tclreadline supp=
ort should be enabled" >&5
+$as_echo_n "checking whether tclreadline support should be enabled... " >&=
6; }
+    if test "$ac_tclreadline" =3D no ; then
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
     TCLREADLINE_ENABLED=3D0
=20
     else
=20
                 if test "$ac_tclreadline" =3D try ; then
-       { echo "$as_me:$LINENO: result: try" >&5
-echo "${ECHO_T}try" >&6; }
-    else
-       { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+       { $as_echo "$as_me:$LINENO: result: try" >&5
+$as_echo "try" >&6; }
+    else
+       { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
     fi
=20
                 if test $BUILD_SYSTEM =3D 'CYGWIN' ; then
@@ -8411,10 +9067,160 @@
     LDFLAGS=3D
     LIBS=3D
=20
-        { echo "$as_me:$LINENO: checking for library containing readline" =
>&5
-echo $ECHO_N "checking for library containing readline... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking searching for the readline li=
brary development headers" >&5
+$as_echo_n "checking searching for the readline library development header=
s... " >&6; }
+
+for ac_header in readline/readline.h
+do
+as_ac_Header=3D`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
+  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
+  $as_echo_n "(cached) " >&6
+fi
+ac_res=3D`eval 'as_val=3D${'$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=3D"$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=3Dyes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=3Dno
+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=3D"$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
+  *) ac_try_echo=3D$ac_try;;
+esac
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=3Dyes
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=3Dno
+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_cxx_preproc_warn_flag in
+  yes:no: )
+    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compi=
ler, 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 c=
ompiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's resu=
lt" >&2;}
+    ac_header_preproc=3Dyes
+    ;;
+  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 docu=
mentation" >&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 p=
reprocessor'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 co=
mpiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will ta=
ke precedence" >&2;}
+
+    ;;
+esac
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
+if { as_var=3D$as_ac_Header; eval "test \"\${$as_var+set}\" =3D set"; }; t=
hen
+  $as_echo_n "(cached) " >&6
+else
+  eval "$as_ac_Header=3D\$ac_header_preproc"
+fi
+ac_res=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+
+fi
+as_val=3D`eval 'as_val=3D${'$as_ac_Header'}
+		 $as_echo "$as_val"'`
+   if test "x$as_val" =3D x""yes; then
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+_ACEOF
+ TCLREADLINE_ENABLED=3D1
+else
+  TCLREADLINE_ENABLED=3D0
+fi
+
+done
+
+	{ $as_echo "$as_me:$LINENO: checking for library containing readline" >&5
+$as_echo_n "checking for library containing readline... " >&6; }
 if test "${ac_cv_search_readline+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8452,26 +9258,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_readline=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_readline+set}" =3D set; then
@@ -8486,8 +9296,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_readline" >&5
-echo "${ECHO_T}$ac_cv_search_readline" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_readline" >&5
+$as_echo "$ac_cv_search_readline" >&6; }
 ac_res=3D$ac_cv_search_readline
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -8515,11 +9325,11 @@
=20
     fi
=20
-                    if test $TCLREADLINE_ENABLED =3D 1 ; then
-         { echo "$as_me:$LINENO: checking whether readline is GNU readline=
 or BSD editline" >&5
-echo $ECHO_N "checking whether readline is GNU readline or BSD editline...=
 $ECHO_C" >&6; }
+                    if test "$TCLREADLINE_ENABLED" =3D 1; then
+         { $as_echo "$as_me:$LINENO: checking whether readline is GNU read=
line or BSD editline" >&5
+$as_echo_n "checking whether readline is GNU readline or BSD editline... "=
 >&6; }
 if test "${oasys_cv_readline_is_editline+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -8549,31 +9359,35 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   oasys_cv_readline_is_editline=3DGNU
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 	oasys_cv_readline_is_editline=3Deditline
 fi
=20
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $oasys_cv_readline_is_editline" >&5
-echo "${ECHO_T}$oasys_cv_readline_is_editline" >&6; }
+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: $oasys_cv_readline_is_editline" >&5
+$as_echo "$oasys_cv_readline_is_editline" >&6; }
         if test $oasys_cv_readline_is_editline =3D editline ; then
=20
 cat >>confdefs.h <<_ACEOF
@@ -8582,15 +9396,48 @@
=20
         fi
=20
-		{ echo "$as_me:$LINENO: checking whether tclreadline support was found" =
>&5
-echo $ECHO_N "checking whether tclreadline support was found... $ECHO_C" >=
&6; }
-        { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-    else
-		{ echo "$as_me:$LINENO: checking whether tclreadline support was found" =
>&5
-echo $ECHO_N "checking whether tclreadline support was found... $ECHO_C" >=
&6; }
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+		{ $as_echo "$as_me:$LINENO: checking whether tclreadline support was fou=
nd" >&5
+$as_echo_n "checking whether tclreadline support was found... " >&6; }
+        { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+    else
+
+		{ $as_echo "$as_me:$LINENO: checking whether tclreadline support was fou=
nd" >&5
+$as_echo_n "checking whether tclreadline support was found... " >&6; }
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+	if test "$ac_tclreadline" =3D yes; then
+
+cat <<EOF
+
+Configure error with tclreadline...
+
+If you do not want tclreadline support at all, you can specify
+--without-tclreadline.
+
+Download tclreadline from http://tclreadline.sourceforge.net/
+
+Before trying to compile tclreadline you should do the following things:
+
+    (a) Make sure you have tcl 8.0 or higher.
+        tclreadline relies on a proper tcl installation:
+        It uses the tclConfig.sh file, which should reside somewhere
+        in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
+
+    (b) Make sure you have gnu readline 2.2 or higher.
+        tclreadline uses the gnu readline callback handler
+
+    (c) The usual ./configure; make; make install sequence should do the r=
est.
+
+
+EOF
+
+
+	{ { $as_echo "$as_me:$LINENO: error: can't find usable tclreadline" >&5
+$as_echo "$as_me: error: can't find usable tclreadline" >&2;}
+   { (exit 1); exit 1; }; }
+	fi
     fi
=20
     fi # ac_tclreadline !=3D no
@@ -8612,16 +9459,16 @@
 fi
=20
=20
-    { echo "$as_me:$LINENO: checking whether zlib support should be enable=
d" >&5
-echo $ECHO_N "checking whether zlib support should be enabled... $ECHO_C" =
>&6; }
+    { $as_echo "$as_me:$LINENO: checking whether zlib support should be en=
abled" >&5
+$as_echo_n "checking whether zlib support should be enabled... " >&6; }
=20
     if test "$ac_use_zlib" =3D "no"; then
-        { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-    else
-        { echo "$as_me:$LINENO: result: $ac_use_zlib" >&5
-echo "${ECHO_T}$ac_use_zlib" >&6; }
+        { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+    else
+        { $as_echo "$as_me:$LINENO: result: $ac_use_zlib" >&5
+$as_echo "$ac_use_zlib" >&6; }
=20
=20
     ac_extlib_save_CFLAGS=3D$CFLAGS
@@ -8632,10 +9479,10 @@
     LDFLAGS=3D
     LIBS=3D
=20
-        { echo "$as_me:$LINENO: checking for library containing compress" =
>&5
-echo $ECHO_N "checking for library containing compress... $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for library containing compre=
ss" >&5
+$as_echo_n "checking for library containing compress... " >&6; }
 if test "${ac_cv_search_compress+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8673,26 +9520,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_compress=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_compress+set}" =3D set; then
@@ -8707,18 +9558,18 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
-echo "${ECHO_T}$ac_cv_search_compress" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
+$as_echo "$ac_cv_search_compress" >&6; }
 ac_res=3D$ac_cv_search_compress
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
   ac_has_libz=3D"yes"
 fi
=20
-        { echo "$as_me:$LINENO: checking for library containing compressBo=
und" >&5
-echo $ECHO_N "checking for library containing compressBound... $ECHO_C" >&=
6; }
+        { $as_echo "$as_me:$LINENO: checking for library containing compre=
ssBound" >&5
+$as_echo_n "checking for library containing compressBound... " >&6; }
 if test "${ac_cv_search_compressBound+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -8756,26 +9607,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_compressBound=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_compressBound+set}" =3D set; then
@@ -8790,8 +9645,8 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_compressBound" >&5
-echo "${ECHO_T}$ac_cv_search_compressBound" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compressBound" >&5
+$as_echo "$ac_cv_search_compressBound" >&6; }
 ac_res=3D$ac_cv_search_compressBound
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
@@ -8816,8 +9671,8 @@
     LIBS=3D$ac_extlib_save_LIBS
=20
=20
-                                { echo "$as_me:$LINENO: checking whether z=
lib support was found" >&5
-echo $ECHO_N "checking whether zlib support was found... $ECHO_C" >&6; }
+                                { $as_echo "$as_me:$LINENO: checking wheth=
er zlib support was found" >&5
+$as_echo_n "checking whether zlib support was found... " >&6; }
=20
                                 if test "$ac_has_libz" =3D yes ; then
=20
@@ -8825,8 +9680,8 @@
 #define OASYS_ZLIB_ENABLED 1
 _ACEOF
=20
-          { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+          { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
=20
 	  if test "$ac_zlib_has_compressBound" =3D yes ; then
=20
@@ -8837,12 +9692,12 @@
 	  fi
=20
 	elif test "$ac_use_zlib" =3D "try" ; then
-          { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+          { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
=20
         else
-          { { echo "$as_me:$LINENO: error: can't find zlib library" >&5
-echo "$as_me: error: can't find zlib library" >&2;}
+          { { $as_echo "$as_me:$LINENO: error: can't find zlib library" >&=
5
+$as_echo "$as_me: error: can't find zlib library" >&2;}
    { (exit 1); exit 1; }; }
         fi
     fi
@@ -8860,10 +9715,10 @@
     if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}$ac_with_xsd_tool", so it =
can be a program name with args.
 set dummy ${ac_tool_prefix}$ac_with_xsd_tool; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_XSD_TOOL+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$XSD_TOOL"; then
   ac_cv_prog_XSD_TOOL=3D"$XSD_TOOL" # Let the user override the test.
@@ -8876,7 +9731,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_XSD_TOOL=3D"${ac_tool_prefix}$ac_with_xsd_tool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8887,11 +9742,11 @@
 fi
 XSD_TOOL=3D$ac_cv_prog_XSD_TOOL
 if test -n "$XSD_TOOL"; then
-  { echo "$as_me:$LINENO: result: $XSD_TOOL" >&5
-echo "${ECHO_T}$XSD_TOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $XSD_TOOL" >&5
+$as_echo "$XSD_TOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
=20
@@ -8900,10 +9755,10 @@
   ac_ct_XSD_TOOL=3D$XSD_TOOL
   # Extract the first word of "$ac_with_xsd_tool", so it can be a program =
name with args.
 set dummy $ac_with_xsd_tool; ac_word=3D$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_XSD_TOOL+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_XSD_TOOL"; then
   ac_cv_prog_ac_ct_XSD_TOOL=3D"$ac_ct_XSD_TOOL" # Let the user override th=
e test.
@@ -8916,7 +9771,7 @@
   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_w=
ord$ac_exec_ext"; }; then
     ac_cv_prog_ac_ct_XSD_TOOL=3D"$ac_with_xsd_tool"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
 done
@@ -8927,11 +9782,11 @@
 fi
 ac_ct_XSD_TOOL=3D$ac_cv_prog_ac_ct_XSD_TOOL
 if test -n "$ac_ct_XSD_TOOL"; then
-  { echo "$as_me:$LINENO: result: $ac_ct_XSD_TOOL" >&5
-echo "${ECHO_T}$ac_ct_XSD_TOOL" >&6; }
-else
-  { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_XSD_TOOL" >&5
+$as_echo "$ac_ct_XSD_TOOL" >&6; }
+else
+  { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 fi
=20
   if test "x$ac_ct_XSD_TOOL" =3D x; then
@@ -8939,12 +9794,8 @@
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect c=
ross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet.  If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with h=
ost triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triple=
t" >&2;}
 ac_tool_warned=3Dyes ;;
 esac
     XSD_TOOL=3D$ac_ct_XSD_TOOL
@@ -8954,14 +9805,14 @@
 fi
=20
     if test -z "$XSD_TOOL" ; then
-       { echo "$as_me:$LINENO: Cannot find a working xsd tool" >&5
-echo "$as_me: Cannot find a working xsd tool" >&6;}
-       { echo "$as_me:$LINENO:    You will not be able to regenerate XML s=
chema bindings" >&5
-echo "$as_me:    You will not be able to regenerate XML schema bindings" >=
&6;}
-       { echo "$as_me:$LINENO:    if you make changes to the .xsd file" >&=
5
-echo "$as_me:    if you make changes to the .xsd file" >&6;}
-       { echo "$as_me:$LINENO:    Use --with-xsd-tool=3D(name) to specify =
the location of this tool" >&5
-echo "$as_me:    Use --with-xsd-tool=3D(name) to specify the location of t=
his tool" >&6;}
+       { $as_echo "$as_me:$LINENO: Cannot find a working xsd tool" >&5
+$as_echo "$as_me: Cannot find a working xsd tool" >&6;}
+       { $as_echo "$as_me:$LINENO:    You will not be able to regenerate X=
ML schema bindings" >&5
+$as_echo "$as_me:    You will not be able to regenerate XML schema binding=
s" >&6;}
+       { $as_echo "$as_me:$LINENO:    if you make changes to the .xsd file=
" >&5
+$as_echo "$as_me:    if you make changes to the .xsd file" >&6;}
+       { $as_echo "$as_me:$LINENO:    Use --with-xsd-tool=3D(name) to spec=
ify the location of this tool" >&5
+$as_echo "$as_me:    Use --with-xsd-tool=3D(name) to specify the location =
of this tool" >&6;}
     fi
=20
=20
@@ -9040,8 +9891,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS"
 	LIBS=3D"$ac_save_LIBS"
=20
-					        { echo "$as_me:$LINENO: checking for Berkeley DB header (vers=
ion $ac_dbver) in $ac_dbincdir" >&5
-echo $ECHO_N "checking for Berkeley DB header (version $ac_dbver) in $ac_d=
bincdir... $ECHO_C" >&6; }
+					        { $as_echo "$as_me:$LINENO: checking for Berkeley DB header (=
version $ac_dbver) in $ac_dbincdir" >&5
+$as_echo_n "checking for Berkeley DB header (version $ac_dbver) in $ac_dbi=
ncdir... " >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9071,33 +9922,37 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-	      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+	      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+
+else
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 	      continue
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
=20
@@ -9111,8 +9966,8 @@
                   LIBS=3D"-l$ac_dblib $ac_save_LIBS"
           fi
=20
-          { echo "$as_me:$LINENO: checking for Berkeley DB library in $ac_=
dblibdir, -l$ac_dblib" >&5
-echo $ECHO_N "checking for Berkeley DB library in $ac_dblibdir, -l$ac_dbli=
b... $ECHO_C" >&6; }
+          { $as_echo "$as_me:$LINENO: checking for Berkeley DB library in =
$ac_dblibdir, -l$ac_dblib" >&5
+$as_echo_n "checking for Berkeley DB library in $ac_dblibdir, -l$ac_dblib.=
.. " >&6; }
           cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9139,36 +9994,40 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-                { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+                { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
                 oasys_cv_db_incpath=3D$ac_dbincdir
                 oasys_cv_db_libpath=3D$ac_dblibdir
                 oasys_cv_db_lib=3D$ac_dblib
                 break 5
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-                { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+                { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
=20
@@ -9215,8 +10074,8 @@
 EOF
=20
=20
-        { { echo "$as_me:$LINENO: error: can't find usable Berkeley DB ins=
tallation" >&5
-echo "$as_me: error: can't find usable Berkeley DB installation" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable Berkeley DB=
 installation" >&5
+$as_echo "$as_me: error: can't find usable Berkeley DB installation" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -9270,10 +10129,12 @@
 _ACEOF
=20
=20
-       { echo "$as_me:$LINENO: checking for library containing request_ini=
t" >&5
-echo $ECHO_N "checking for library containing request_init... $ECHO_C" >&6=
; }
+	{ $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: ch=
ecking for request_init() in libwrap" >&5
+$as_echo_n "checking for mysql external dependencies.: checking for reques=
t_init() in libwrap... " >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for library containing request_init"=
 >&5
+$as_echo_n "checking for library containing request_init... " >&6; }
 if test "${ac_cv_search_request_init+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -9311,26 +10172,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_request_init=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_request_init+set}" =3D set; then
@@ -9345,22 +10210,24 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_request_init" >&5
-echo "${ECHO_T}$ac_cv_search_request_init" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_request_init" >&5
+$as_echo "$ac_cv_search_request_init" >&6; }
 ac_res=3D$ac_cv_search_request_init
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find request_init() in libwrap" >=
&5
-echo "$as_me: error: can't find request_init() in libwrap" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-       { echo "$as_me:$LINENO: checking for library containing exp" >&5
-echo $ECHO_N "checking for library containing exp... $ECHO_C" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find request_init() in libwra=
p" >&5
+$as_echo "$as_me: error: can't find request_init() in libwrap" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+	{ $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: ch=
ecking for exp() in libm" >&5
+$as_echo_n "checking for mysql external dependencies.: checking for exp() =
in libm... " >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for library containing exp" >&5
+$as_echo_n "checking for library containing exp... " >&6; }
 if test "${ac_cv_search_exp+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -9398,26 +10265,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_exp=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_exp+set}" =3D set; then
@@ -9432,22 +10303,24 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_exp" >&5
-echo "${ECHO_T}$ac_cv_search_exp" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_exp" >&5
+$as_echo "$ac_cv_search_exp" >&6; }
 ac_res=3D$ac_cv_search_exp
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find exp() in libm" >&5
-echo "$as_me: error: can't find exp() in libm" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-       { echo "$as_me:$LINENO: checking for library containing crypt" >&5
-echo $ECHO_N "checking for library containing crypt... $ECHO_C" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find exp() in libm" >&5
+$as_echo "$as_me: error: can't find exp() in libm" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+	{ $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: ch=
ecking for crypt() in libcrypt" >&5
+$as_echo_n "checking for mysql external dependencies.: checking for crypt(=
) in libcrypt... " >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for library containing crypt" >&5
+$as_echo_n "checking for library containing crypt... " >&6; }
 if test "${ac_cv_search_crypt+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -9485,26 +10358,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_crypt=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_crypt+set}" =3D set; then
@@ -9519,22 +10396,24 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
-echo "${ECHO_T}$ac_cv_search_crypt" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_crypt" >&5
+$as_echo "$ac_cv_search_crypt" >&6; }
 ac_res=3D$ac_cv_search_crypt
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find crypt() in libcrypt" >&5
-echo "$as_me: error: can't find crypt() in libcrypt" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-       { echo "$as_me:$LINENO: checking for library containing compress" >=
&5
-echo $ECHO_N "checking for library containing compress... $ECHO_C" >&6; }
+  { { $as_echo "$as_me:$LINENO: error: can't find crypt() in libcrypt" >&5
+$as_echo "$as_me: error: can't find crypt() in libcrypt" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+	{ $as_echo "$as_me:$LINENO: checking for mysql external dependencies.: ch=
ecking for compress() in libz" >&5
+$as_echo_n "checking for mysql external dependencies.: checking for compre=
ss() in libz... " >&6; }
+	{ $as_echo "$as_me:$LINENO: checking for library containing compress" >&5
+$as_echo_n "checking for library containing compress... " >&6; }
 if test "${ac_cv_search_compress+set}" =3D set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=3D$LIBS
 cat >conftest.$ac_ext <<_ACEOF
@@ -9572,26 +10451,30 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
   ac_cv_search_compress=3D$ac_res
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
+  $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
   if test "${ac_cv_search_compress+set}" =3D set; then
@@ -9606,15 +10489,15 @@
 rm conftest.$ac_ext
 LIBS=3D$ac_func_search_save_LIBS
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
-echo "${ECHO_T}$ac_cv_search_compress" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_compress" >&5
+$as_echo "$ac_cv_search_compress" >&6; }
 ac_res=3D$ac_cv_search_compress
 if test "$ac_res" !=3D no; then
   test "$ac_res" =3D "none required" || LIBS=3D"$ac_res $LIBS"
=20
 else
-  { { echo "$as_me:$LINENO: error: can't find compress() in libz" >&5
-echo "$as_me: error: can't find compress() in libz" >&2;}
+  { { $as_echo "$as_me:$LINENO: error: can't find compress() in libz" >&5
+$as_echo "$as_me: error: can't find compress() in libz" >&2;}
    { (exit 1); exit 1; }; }
 fi
=20
@@ -9655,8 +10538,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS"
 	LIBS=3D"$ac_save_LIBS"
=20
-					        { echo "$as_me:$LINENO: checking for mysql header mysql.h in =
$ac_mysqlincdir" >&5
-echo $ECHO_N "checking for mysql header mysql.h in $ac_mysqlincdir... $ECH=
O_C" >&6; }
+					        { $as_echo "$as_me:$LINENO: checking for mysql header mysql.h=
 in $ac_mysqlincdir" >&5
+$as_echo_n "checking for mysql header mysql.h in $ac_mysqlincdir... " >&6;=
 }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9681,42 +10564,46 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-	      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+	      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_mysql_h=3D$ac_mysqlincdir
 	      break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 	      continue
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
=20
     if test x$oasys_cv_path_mysql_h =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable mysql installat=
ion" >&5
-echo "$as_me: error: can't find usable mysql installation" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable mysql insta=
llation" >&5
+$as_echo "$as_me: error: can't find usable mysql installation" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -9729,8 +10616,8 @@
  	    LIBS=3D"$ac_save_LIBS -lmysqld"
         fi
=20
-        { echo "$as_me:$LINENO: checking for mysql library libmysql in $ac=
_mysqllibdir" >&5
-echo $ECHO_N "checking for mysql library libmysql in $ac_mysqllibdir... $E=
CHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for mysql library libmysql in=
 $ac_mysqllibdir" >&5
+$as_echo_n "checking for mysql library libmysql in $ac_mysqllibdir... " >&=
6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9757,34 +10644,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_mysql_lib=3D$ac_mysqllibdir
               break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -9800,8 +10691,8 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test x$oasys_cv_path_mysql_lib =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable mysql library" =
>&5
-echo "$as_me: error: can't find usable mysql library" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable mysql libra=
ry" >&5
+$as_echo "$as_me: error: can't find usable mysql library" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -9873,8 +10764,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS"
 	LIBS=3D"$ac_save_LIBS"
=20
-					        { echo "$as_me:$LINENO: checking for postgres header libpq-fe=
.h in $ac_postgresincdir" >&5
-echo $ECHO_N "checking for postgres header libpq-fe.h in $ac_postgresincdi=
r... $ECHO_C" >&6; }
+					        { $as_echo "$as_me:$LINENO: checking for postgres header libp=
q-fe.h in $ac_postgresincdir" >&5
+$as_echo_n "checking for postgres header libpq-fe.h in $ac_postgresincdir.=
.. " >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9899,42 +10790,46 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-	      { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+	      { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_postgres_h=3D$ac_postgresincdir
 	      break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
 	      continue
=20
 fi
=20
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
=20
     if test x$oasys_cv_path_postgres_h =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable postgres instal=
lation" >&5
-echo "$as_me: error: can't find usable postgres installation" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable postgres in=
stallation" >&5
+$as_echo "$as_me: error: can't find usable postgres installation" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -9943,8 +10838,8 @@
 	LDFLAGS=3D"$ac_save_LDFLAGS -L$ac_postgreslibdir"
 	LIBS=3D"$ac_save_LIBS -lpq"
=20
-        { echo "$as_me:$LINENO: checking for postgres library libpq in $ac=
_postgreslibdir" >&5
-echo $ECHO_N "checking for postgres library libpq in $ac_postgreslibdir...=
 $ECHO_C" >&6; }
+        { $as_echo "$as_me:$LINENO: checking for postgres library libpq in=
 $ac_postgreslibdir" >&5
+$as_echo_n "checking for postgres library libpq in $ac_postgreslibdir... "=
 >&6; }
 	cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -9970,34 +10865,38 @@
   *\"* | *\`* | *\\*) ac_try_echo=3D\$ac_try;;
   *) ac_try_echo=3D$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=3D$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-
-              { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+eval ac_try_echo=3D"\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  $as_echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_cxx_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" =3D yes ||
+	 $as_test_x conftest$ac_exeext
+       }; then
+
+              { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
               oasys_cv_path_postgres_lib=3D$ac_postgreslibdir
               break
=20
 else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-              { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-
-fi
-
+  $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+              { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+
+rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       conftest$ac_exeext conftest.$ac_ext
     done
@@ -10007,8 +10906,8 @@
     LIBS=3D"$ac_save_LIBS"
=20
     if test x$oasys_cv_path_postgres_lib =3D x ; then
-        { { echo "$as_me:$LINENO: error: can't find usable postgres librar=
y" >&5
-echo "$as_me: error: can't find usable postgres library" >&2;}
+        { { $as_echo "$as_me:$LINENO: error: can't find usable postgres li=
brary" >&5
+$as_echo "$as_me: error: can't find usable postgres library" >&2;}
    { (exit 1); exit 1; }; }
     fi
=20
@@ -10037,8 +10936,8 @@
         EXTERNAL_DS_ENABLED=3D0
     else
         if test ! "$XERCES_C_ENABLED" =3D 1 ; then
-	    { { echo "$as_me:$LINENO: error: external data store support requires=
 xerces... install it or configure --disable-eds" >&5
-echo "$as_me: error: external data store support requires xerces... instal=
l it or configure --disable-eds" >&2;}
+	    { { $as_echo "$as_me:$LINENO: error: external data store support requ=
ires xerces... install it or configure --disable-eds" >&5
+$as_echo "$as_me: error: external data store support requires xerces... in=
stall it or configure --disable-eds" >&2;}
    { (exit 1); exit 1; }; }
         fi
         EXTERNAL_DS_ENABLED=3D1
@@ -10130,11 +11029,11 @@
=20
=20
=20
-rm -rf include share
-mkdir include
-mkdir share
-ln -s $SRCDIR include/oasys
-ln -s $SRCDIR share/oasys
+#rm -rf include share
+#mkdir include
+#mkdir share
+#ln -s $SRCDIR include/oasys
+#ln -s $SRCDIR share/oasys
=20
 if test ! $SRCDIR =3D `pwd` ; then
=20
@@ -10169,11 +11068,12 @@
     case $ac_val in #(
     *${as_nl}*)
       case $ac_var in #(
-      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var cont=
ains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;=
;
+      *_cv_*) { $as_echo "$as_me:$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=3D ;; #(
       *) $as_unset $ac_var ;;
       esac ;;
     esac
@@ -10206,12 +11106,12 @@
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
     test "x$cache_file" !=3D "x/dev/null" &&
-      { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
     cat confcache >$cache_file
   else
-    { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file"=
 >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
   fi
 fi
 rm -f confcache
@@ -10227,7 +11127,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" =3D x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_script=3D's/\$U\././;s/\.o$//;s/\.obj$//'
-  ac_i=3D`echo "$ac_i" | sed "$ac_script"`
+  ac_i=3D`$as_echo "$ac_i" | sed "$ac_script"`
   # 2. Prepend LIBOBJDIR.  When used with automake>=3D1.10 LIBOBJDIR
   #    will be set to the directory where LIBOBJS objects are built.
   ac_libobjs=3D"$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -10240,11 +11140,12 @@
=20
=20
 : ${CONFIG_STATUS=3D./config.status}
+ac_write_fail=3D0
 ac_clean_files_save=3D$ac_clean_files
 ac_clean_files=3D"$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
 #! $SHELL
 # Generated by $as_me.
 # Run this file to recreate the current configuration.
@@ -10257,7 +11158,7 @@
 SHELL=3D\${CONFIG_SHELL-$SHELL}
 _ACEOF
=20
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 ## --------------------- ##
 ## M4sh Initialization.  ##
 ## --------------------- ##
@@ -10267,7 +11168,7 @@
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   emulate sh
   NULLCMD=3D:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   # is contrary to our usage.  Disable this feature.
   alias -g '${1+"$@"}'=3D'"$@"'
   setopt NO_GLOB_SUBST
@@ -10289,17 +11190,45 @@
 as_cr_digits=3D'0123456789'
 as_cr_alnum=3D$as_cr_Letters$as_cr_digits
=20
+as_nl=3D'
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo=3D'\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\=
\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=3D$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=3D$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" =3D "X$as_echo") 2>/dev/null; then
+  as_echo=3D'printf %s\n'
+  as_echo_n=3D'printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" =3D "X-n $as_ech=
o"; then
+    as_echo_body=3D'eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n=3D'/usr/ucb/echo -n'
+  else
+    as_echo_body=3D'eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body=3D'eval
+      arg=3D$1;
+      case $arg in
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=3D`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n=3D'sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo=3D'sh -c $as_echo_body as_echo'
+fi
+
 # The user is always right.
 if test "${PATH_SEPARATOR+set}" !=3D set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH=3D"/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=3D';'
-  else
-    PATH_SEPARATOR=3D:
-  fi
-  rm -f conf$$.sh
+  PATH_SEPARATOR=3D:
+  (PATH=3D'/bin;/bin'; FPATH=3D$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH=3D'/bin:/bin'; FPATH=3D$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=3D';'
+  }
 fi
=20
 # Support unset when possible.
@@ -10315,8 +11244,6 @@
 # there to prevent editors from complaining about space-tab.
 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
 # splitting by setting IFS to empty value.)
-as_nl=3D'
-'
 IFS=3D" ""	$as_nl"
=20
 # Find who we are.  Look in the path if we contain no directory separator.
@@ -10339,7 +11266,7 @@
   as_myself=3D$0
 fi
 if test ! -f "$as_myself"; then
-  echo "$as_myself: error: cannot find myself; rerun with an absolute file=
 name" >&2
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute =
file name" >&2
   { (exit 1); exit 1; }
 fi
=20
@@ -10352,17 +11279,10 @@
 PS4=3D'+ '
=20
 # NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
-    eval $as_var=3DC; export $as_var
-  else
-    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-  fi
-done
+LC_ALL=3DC
+export LC_ALL
+LANGUAGE=3DC
+export LANGUAGE
=20
 # Required to use basename.
 if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -10384,7 +11304,7 @@
 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
 	 X"$0" : 'X\(//\)$' \| \
 	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
     sed '/^.*\/\([^/][^/]*\)\/*$/{
 	    s//\1/
 	    q
@@ -10435,7 +11355,7 @@
       s/-\n.*//
     ' >$as_me.lineno &&
   chmod +x "$as_me.lineno" ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX=
 shell" >&2
+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a P=
OSIX shell" >&2
    { (exit 1); exit 1; }; }
=20
   # Don't try to exec as it changes $[0], causing all sort of problems
@@ -10463,7 +11383,6 @@
 *)
   ECHO_N=3D'-n';;
 esac
-
 if expr a : '\(a\)' >/dev/null 2>&1 &&
    test "X`expr 00001 : '.*\(...\)'`" =3D X001; then
   as_expr=3Dexpr
@@ -10476,19 +11395,22 @@
   rm -f conf$$.dir/conf$$.file
 else
   rm -f conf$$.dir
-  mkdir conf$$.dir
-fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=3D'ln -s'
-  # ... but there are two gotchas:
-  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-  # In both cases, we have to default to `cp -p'.
-  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=3D'ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executabl=
e.
+    # In both cases, we have to default to `cp -p'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s=3D'cp -p'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=3Dln
+  else
     as_ln_s=3D'cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=3Dln
+  fi
 else
   as_ln_s=3D'cp -p'
 fi
@@ -10513,10 +11435,10 @@
   as_test_x=3D'
     eval sh -c '\''
       if test -d "$1"; then
-        test -d "$1/.";
+	test -d "$1/.";
       else
 	case $1 in
-        -*)set "./$1";;
+	-*)set "./$1";;
 	esac;
 	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
 	???[sx]*):;;*)false;;esac;fi
@@ -10539,7 +11461,7 @@
 # values after options handling.
 ac_log=3D"
 This file was extended by $as_me, which was
-generated by GNU Autoconf 2.61.  Invocation command line was
+generated by GNU Autoconf 2.63.  Invocation command line was
=20
   CONFIG_FILES    =3D $CONFIG_FILES
   CONFIG_HEADERS  =3D $CONFIG_HEADERS
@@ -10552,29 +11474,39 @@
=20
 _ACEOF
=20
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=3D$*;;
+esac
+
+case $ac_config_headers in *"
+"*) set x $ac_config_headers; shift; ac_config_headers=3D$*;;
+esac
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
 # Files that config.status was made for.
 config_files=3D"$ac_config_files"
 config_headers=3D"$ac_config_headers"
=20
 _ACEOF
=20
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 ac_cs_usage=3D"\
 \`$as_me' instantiates files from templates according to the
 current configuration.
=20
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
=20
   -h, --help       print this help, then exit
   -V, --version    print version number and configuration settings, then e=
xit
-  -q, --quiet      do not print progress messages
+  -q, --quiet, --silent
+                   do not print progress messages
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
-  --file=3DFILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=3DFILE[:TEMPLATE]
-		   instantiate the configuration header FILE
+      --file=3DFILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+      --header=3DFILE[:TEMPLATE]
+                   instantiate the configuration header FILE
=20
 Configuration files:
 $config_files
@@ -10585,24 +11517,25 @@
 Report bugs to <bug-autoconf@gnu.org>."
=20
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
 ac_cs_version=3D"\\
 config.status
-configured by $0, generated by GNU Autoconf 2.61,
-  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\=
\\\&/g'`\\"
-
-Copyright (C) 2006 Free Software Foundation, Inc.
+configured by $0, generated by GNU Autoconf 2.63,
+  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\=
$]/\\\\&/g'`\\"
+
+Copyright (C) 2008 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
=20
 ac_pwd=3D'$ac_pwd'
 srcdir=3D'$srcdir'
 INSTALL=3D'$INSTALL'
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
+AWK=3D'$AWK'
+test -n "\$AWK" || AWK=3Dawk
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
+# The default lists apply if the user does not specify any file.
 ac_need_defaults=3D:
 while test $# !=3D 0
 do
@@ -10624,30 +11557,36 @@
   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
     ac_cs_recheck=3D: ;;
   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-    echo "$ac_cs_version"; exit ;;
+    $as_echo "$ac_cs_version"; exit ;;
   --debug | --debu | --deb | --de | --d | -d )
     debug=3D: ;;
   --file | --fil | --fi | --f )
     $ac_shift
-    CONFIG_FILES=3D"$CONFIG_FILES $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=3D`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_FILES=3D"$CONFIG_FILES '$ac_optarg'"
     ac_need_defaults=3Dfalse;;
   --header | --heade | --head | --hea )
     $ac_shift
-    CONFIG_HEADERS=3D"$CONFIG_HEADERS $ac_optarg"
+    case $ac_optarg in
+    *\'*) ac_optarg=3D`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    esac
+    CONFIG_HEADERS=3D"$CONFIG_HEADERS '$ac_optarg'"
     ac_need_defaults=3Dfalse;;
   --he | --h)
     # Conflict between --help and --header
-    { echo "$as_me: error: ambiguous option: $1
+    { $as_echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; };;
   --help | --hel | -h )
-    echo "$ac_cs_usage"; exit ;;
+    $as_echo "$ac_cs_usage"; exit ;;
   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
   | -silent | --silent | --silen | --sile | --sil | --si | --s)
     ac_cs_silent=3D: ;;
=20
   # This is an error.
-  -*) { echo "$as_me: error: unrecognized option: $1
+  -*) { $as_echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2
    { (exit 1); exit 1; }; } ;;
=20
@@ -10666,30 +11605,32 @@
 fi
=20
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
 if \$ac_cs_recheck; then
-  echo "running CONFIG_SHELL=3D$SHELL $SHELL $0 "$ac_configure_args \$ac_c=
onfigure_extra_args " --no-create --no-recursion" >&6
-  CONFIG_SHELL=3D$SHELL
+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-cr=
eate --no-recursion
+  shift
+  \$as_echo "running CONFIG_SHELL=3D$SHELL \$*" >&6
+  CONFIG_SHELL=3D'$SHELL'
   export CONFIG_SHELL
-  exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create=
 --no-recursion
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+  exec "\$@"
+fi
+
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 exec 5>>config.log
 {
   echo
   sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
-  echo "$ac_log"
+  $as_echo "$ac_log"
 } >&5
=20
 _ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
+_ACEOF
+
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
=20
 # Handling of arguments.
 for ac_config_target in $ac_config_targets
@@ -10700,8 +11641,8 @@
     "System.make") CONFIG_FILES=3D"$CONFIG_FILES System.make" ;;
     "Makefile") CONFIG_FILES=3D"$CONFIG_FILES Makefile:Makefile-Builddir.i=
n" ;;
=20
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target"=
 >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_tar=
get" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
 done
@@ -10741,158 +11682,143 @@
   (umask 077 && mkdir "$tmp")
 } ||
 {
-   echo "$me: cannot create a temporary directory in ." >&2
+   $as_echo "$as_me: cannot create a temporary directory in ." >&2
    { (exit 1); exit 1; }
 }
=20
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
 if test -n "$CONFIG_FILES"; then
=20
-_ACEOF
-
-
-
+
+ac_cr=3D'=0D'
+ac_cs_awk_cr=3D`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" =3D "a${ac_cr}b"; then
+  ac_cs_awk_cr=3D'\\r'
+else
+  ac_cs_awk_cr=3D$ac_cr
+fi
+
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
+_ACEOF
+
+
+{
+  echo "cat >conf$$subs.awk <<_ACEOF" &&
+  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; }; }
+ac_delim_num=3D`echo "$ac_subst_vars" | grep -c '$'`
 ac_delim=3D'%!_!# '
 for ac_last_try in false false false false false :; do
-  cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-SRCDIR!$SRCDIR$ac_delim
-BUILDDIR!$BUILDDIR$ac_delim
-TARGET!$TARGET$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-CPP!$CPP$ac_delim
-DEPFLAGS!$DEPFLAGS$ac_delim
-AR!$AR$ac_delim
-RANLIB!$RANLIB$ac_delim
-DEBUG!$DEBUG$ac_delim
-OPTIMIZE!$OPTIMIZE$ac_delim
-OPTIMIZE_WARN!$OPTIMIZE_WARN$ac_delim
-PROFILE!$PROFILE$ac_delim
-STATIC!$STATIC$ac_delim
-SHLIBS!$SHLIBS$ac_delim
-SHLIB_EXT!$SHLIB_EXT$ac_delim
-PICFLAGS!$PICFLAGS$ac_delim
-RPATH!$RPATH$ac_delim
-LDFLAGS_SHLIB!$LDFLAGS_SHLIB$ac_delim
-EXTRA_CFLAGS!$EXTRA_CFLAGS$ac_delim
-EXTRA_LDFLAGS!$EXTRA_LDFLAGS$ac_delim
-BUILD_SYSTEM!$BUILD_SYSTEM$ac_delim
-AWK!$AWK$ac_delim
-INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
-INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
-INSTALL_DATA!$INSTALL_DATA$ac_delim
-SET_MAKE!$SET_MAKE$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-SYS_CFLAGS!$SYS_CFLAGS$ac_delim
-PYTHON!$PYTHON$ac_delim
-PYTHON_BUILD_EXT!$PYTHON_BUILD_EXT$ac_delim
-TCL_LDFLAGS!$TCL_LDFLAGS$ac_delim
-XSD_TOOL!$XSD_TOOL$ac_delim
-INCFLAGS!$INCFLAGS$ac_delim
-OASYS_INCDIR!$OASYS_INCDIR$ac_delim
-OASYS_LIBDIR!$OASYS_LIBDIR$ac_delim
-OASYS_ETCDIR!$OASYS_ETCDIR$ac_delim
-OASYS_LDFLAGS!$OASYS_LDFLAGS$ac_delim
-OASYS_LDFLAGS_STATIC!$OASYS_LDFLAGS_STATIC$ac_delim
-OASYS_COMPAT_LDFLAGS!$OASYS_COMPAT_LDFLAGS$ac_delim
-OASYS_VERSION!$OASYS_VERSION$ac_delim
-EXTLIB_CFLAGS!$EXTLIB_CFLAGS$ac_delim
-EXTLIB_LDFLAGS!$EXTLIB_LDFLAGS$ac_delim
-SYS_EXTLIB_CFLAGS!$SYS_EXTLIB_CFLAGS$ac_delim
-SYS_EXTLIB_LDFLAGS!$SYS_EXTLIB_LDFLAGS$ac_delim
-SUBDIR!$SUBDIR$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
-
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` =3D 94=
; then
+  . ./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; }; }
+
+  ac_delim_n=3D`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+  if test $ac_delim_n =3D $ac_delim_num; then
     break
   elif $ac_last_try; then
-    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+    { { $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; }; }
   else
     ac_delim=3D"$ac_delim!$ac_delim _$ac_delim!! "
   fi
 done
-
-ac_eof=3D`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
-  ac_eof=3D`echo "$ac_eof" | sort -nru | sed 1q`
-  ac_eof=3D`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS <conf$$subs.sed
-rm -f conf$$subs.sed
-cat >>$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
-_ACEOF
-
+rm -f conf$$subs.sh
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=3D/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' <conf$$subs.awk | sed '
+/^[^""]/{
+  N
+  s/\n//
+}
+' >>$CONFIG_STATUS || ac_write_fail=3D1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] =3D 1
+  FS =3D "=07"
+
+}
+{
+  line =3D $ 0
+  nfields =3D split(line, field, "@")
+  substed =3D 0
+  len =3D length(field[1])
+  for (i =3D 2; i < nfields; i++) {
+    key =3D field[i]
+    keylen =3D length(key)
+    if (S_is_set[key]) {
+      value =3D S[key]
+      line =3D substr(line, 1, len) "" value "" substr(line, len + keylen =
+ 3)
+      len +=3D length(value) + length(field[++i])
+      substed =3D 1
+    } else
+      len +=3D 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+  || { { $as_echo "$as_me:$LINENO: error: could not setup config files mac=
hinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+   { (exit 1); exit 1; }; }
+_ACEOF
=20
 # VPATH may cause trouble with some makes, so we remove $(srcdir),
 # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -10909,19 +11835,133 @@
 }'
 fi
=20
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 fi # test -n "$CONFIG_FILES"
=20
-
-for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS
+# Set up the scripts for CONFIG_HEADERS section.
+# No need to generate them if there are no CONFIG_HEADERS.
+# This happens for instance with `./config.status Makefile'.
+if test -n "$CONFIG_HEADERS"; then
+cat >"$tmp/defines.awk" <<\_ACAWK ||
+BEGIN {
+_ACEOF
+
+# Transform confdefs.h into an awk script `defines.awk', embedded as
+# here-document in config.status, that substitutes the proper values into
+# config.h.in to produce config.h.
+
+# Create a delimiter string that does not exist in confdefs.h, to ease
+# handling of long lines.
+ac_delim=3D'%!_!# '
+for ac_last_try in false false :; do
+  ac_t=3D`sed -n "/$ac_delim/p" confdefs.h`
+  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; }; }
+  else
+    ac_delim=3D"$ac_delim!$ac_delim _$ac_delim!! "
+  fi
+done
+
+# For the awk script, D is an array of macro values keyed by name,
+# likewise P contains macro parameters if any.  Preserve backslash
+# newline sequences.
+
+ac_word_re=3D[_$as_cr_Letters][_$as_cr_alnum]*
+sed -n '
+s/.\{148\}/&'"$ac_delim"'/g
+t rset
+:rset
+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
+t def
+d
+:def
+s/\\$//
+t bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]=3D"\2"\
+D["\1"]=3D" \3"/p
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=3D" \2"/p
+d
+:bsnl
+s/["\\]/\\&/g
+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]=3D"\2"\
+D["\1"]=3D" \3\\\\\\n"\\/p
+t cont
+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=3D" \2\\\\\\n"\\/p
+t cont
+d
+:cont
+n
+s/.\{148\}/&'"$ac_delim"'/g
+t clear
+:clear
+s/\\$//
+t bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/"/p
+d
+:bsnlc
+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
+b cont
+' <confdefs.h | sed '
+s/'"$ac_delim"'/"\\\
+"/g' >>$CONFIG_STATUS || ac_write_fail=3D1
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
+  for (key in D) D_is_set[key] =3D 1
+  FS =3D "=07"
+}
+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
+  line =3D \$ 0
+  split(line, arg, " ")
+  if (arg[1] =3D=3D "#") {
+    defundef =3D arg[2]
+    mac1 =3D arg[3]
+  } else {
+    defundef =3D substr(arg[1], 2)
+    mac1 =3D arg[2]
+  }
+  split(mac1, mac2, "(") #)
+  macro =3D mac2[1]
+  prefix =3D substr(line, 1, index(line, defundef) - 1)
+  if (D_is_set[macro]) {
+    # Preserve the white space surrounding the "#".
+    print prefix "define", macro P[macro] D[macro]
+    next
+  } else {
+    # Replace #undef with comments.  This is necessary, for example,
+    # in the case of _POSIX_SOURCE, which is predefined and required
+    # on some systems where configure will not decide to define it.
+    if (defundef =3D=3D "undef") {
+      print "/*", prefix defundef, macro, "*/"
+      next
+    }
+  }
+}
+{ print }
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
+  { { $as_echo "$as_me:$LINENO: error: could not setup config headers mach=
inery" >&5
+$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
+   { (exit 1); exit 1; }; }
+fi # test -n "$CONFIG_HEADERS"
+
+
+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    "
+shift
+for ac_tag
 do
   case $ac_tag in
   :[FHLC]) ac_mode=3D$ac_tag; continue;;
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+  :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; }; };;
   :[FH]-) ac_tag=3D-:-;;
   :[FH]*) ac_tag=3D$ac_tag:$ac_tag.in;;
@@ -10950,26 +11990,38 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f=3D"$srcdir/$ac_f";;
 	   esac ||
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+	   { { $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; }; };;
       esac
-      ac_file_inputs=3D"$ac_file_inputs $ac_f"
+      case $ac_f in *\'*) ac_f=3D`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/=
g"`;; esac
+      ac_file_inputs=3D"$ac_file_inputs '$ac_f'"
     done
=20
     # Let's still pretend it is `configure' which instantiates (i.e., don'=
t
     # use $as_me), people would be surprised to read:
     #    /* config.h.  Generated by config.status.  */
-    configure_input=3D"Generated from "`IFS=3D:
-	  echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+    configure_input=3D'Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
     if test x"$ac_file" !=3D x-; then
       configure_input=3D"$ac_file.  $configure_input"
-      { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    fi
+      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement stri=
ngs.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=3D`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=3D$configure_input;;
+    esac
=20
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin";;
+    *:-:* | *:-) 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; }; } ;;
     esac
     ;;
   esac
@@ -10979,7 +12031,7 @@
 	 X"$ac_file" : 'X\(//\)[^/]' \| \
 	 X"$ac_file" : 'X\(//\)$' \| \
 	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -11005,7 +12057,7 @@
     as_dirs=3D
     while :; do
       case $as_dir in #(
-      *\'*) as_qdir=3D`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #(
+      *\'*) as_qdir=3D`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
       *) as_qdir=3D$as_dir;;
       esac
       as_dirs=3D"'$as_qdir' $as_dirs"
@@ -11014,7 +12066,7 @@
 	 X"$as_dir" : 'X\(//\)[^/]' \| \
 	 X"$as_dir" : 'X\(//\)$' \| \
 	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 	    s//\1/
 	    q
@@ -11035,17 +12087,17 @@
       test -d "$as_dir" && break
     done
     test -z "$as_dirs" || eval "mkdir $as_dirs"
-  } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create=
 directory $as_dir" >&5
-echo "$as_me: error: cannot create directory $as_dir" >&2;}
+  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot cr=
eate directory $as_dir" >&5
+$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
    { (exit 1); exit 1; }; }; }
   ac_builddir=3D.
=20
 case "$ac_dir" in
 .) ac_dir_suffix=3D ac_top_builddir_sub=3D. ac_top_build_prefix=3D ;;
 *)
-  ac_dir_suffix=3D/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+  ac_dir_suffix=3D/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   # A ".." for each directory in $ac_dir_suffix.
-  ac_top_builddir_sub=3D`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/=
,,'`
+  ac_top_builddir_sub=3D`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g=
;s|/||'`
   case $ac_top_builddir_sub in
   "") ac_top_builddir_sub=3D. ac_top_build_prefix=3D ;;
   *)  ac_top_build_prefix=3D$ac_top_builddir_sub/ ;;
@@ -11085,12 +12137,13 @@
   esac
 _ACEOF
=20
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 # 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=3D; ac_datarootdir_seen=3D
=20
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot=3D'
+/datarootdir/ {
   p
   q
 }
@@ -11099,13 +12152,14 @@
 /@infodir@/p
 /@localedir@/p
 /@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=3Dyes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
-  { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --d=
atarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir s=
etting" >&2;}
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the=
 --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootd=
ir setting" >&2;}
+_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
   ac_datarootdir_hack=3D'
   s&@datadir@&$datadir&g
   s&@docdir@&$docdir&g
@@ -11119,15 +12173,16 @@
 # Neutralize VPATH when `$srcdir' =3D `.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
+ac_sed_extra=3D"$ac_vpsub
 $extrasub
 _ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=3D1
 :t
 /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
 s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
 s&@srcdir@&$ac_srcdir&;t t
 s&@abs_srcdir@&$ac_abs_srcdir&;t t
 s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -11137,119 +12192,58 @@
 s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
 s&@INSTALL@&$ac_INSTALL&;t t
 $ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$=
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; }; }
=20
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
   { ac_out=3D`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; =
} &&
   { ac_out=3D`sed -n '/^[	 ]*datarootdir[	 ]*:*=3D/p' "$tmp/out"`; test -z=
 "$ac_out"; } &&
-  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the va=
riable \`datarootdir'
+  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to th=
e variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`dat=
arootdir'
+$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;}
=20
   rm -f "$tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out"; rm -f "$tmp/out";;
-  *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
-  esac
+  -) 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; }; }
  ;;
   :H)
   #
   # CONFIG_HEADER
   #
-_ACEOF
-
-# Transform confdefs.h into a sed script `conftest.defines', that
-# substitutes the proper values into config.h.in to produce config.h.
-rm -f conftest.defines conftest.tail
-# First, append a space to every undef/define line, to ease matching.
-echo 's/$/ /' >conftest.defines
-# Then, protect against being on the right side of a sed subst, or in
-# an unquoted here document, in config.status.  If some macros were
-# called several times there might be several #defines for the same
-# symbol, which is useless.  But do not sort them, since the last
-# AC_DEFINE must be honored.
-ac_word_re=3D[_$as_cr_Letters][_$as_cr_alnum]*
-# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", whe=
re
-# NAME is the cpp macro being defined, VALUE is the value it is being give=
n.
-# PARAMS is the parameter list in the macro definition--in most cases, it'=
s
-# just an empty string.
-ac_dA=3D's,^\\([	 #]*\\)[^	 ]*\\([	 ]*'
-ac_dB=3D'\\)[	 (].*,\\1define\\2'
-ac_dC=3D' '
-ac_dD=3D' ,'
-
-uniq confdefs.h |
-  sed -n '
-	t rset
-	:rset
-	s/^[	 ]*#[	 ]*define[	 ][	 ]*//
-	t ok
-	d
-	:ok
-	s/[\\&,]/\\&/g
-	s/^\('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/ '"$ac_dA"'\1'"$ac_dB"'\2'"=
${ac_dC}"'\3'"$ac_dD"'/p
-	s/^\('"$ac_word_re"'\)[	 ]*\(.*\)/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"=
'/p
-  ' >>conftest.defines
-
-# Remove the space that was appended to ease matching.
-# Then replace #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-# (The regexp can be short, since the line contains either #define or #und=
ef.)
-echo 's/ $//
-s,^[	 #]*u.*,/* & */,' >>conftest.defines
-
-# Break up conftest.defines:
-ac_max_sed_lines=3D50
-
-# First sed command is:	 sed -f defines.sed $ac_file_inputs >"$tmp/out1"
-# Second one is:	 sed -f defines.sed "$tmp/out1" >"$tmp/out2"
-# Third one will be:	 sed -f defines.sed "$tmp/out2" >"$tmp/out1"
-# et cetera.
-ac_in=3D'$ac_file_inputs'
-ac_out=3D'"$tmp/out1"'
-ac_nxt=3D'"$tmp/out2"'
-
-while :
-do
-  # Write a here document:
-    cat >>$CONFIG_STATUS <<_ACEOF
-    # First, check the format of the line:
-    cat >"\$tmp/defines.sed" <<\\CEOF
-/^[	 ]*#[	 ]*undef[	 ][	 ]*$ac_word_re[	 ]*\$/b def
-/^[	 ]*#[	 ]*define[	 ][	 ]*$ac_word_re[(	 ]/b def
-b
-:def
-_ACEOF
-  sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-  ac_in=3D$ac_out; ac_out=3D$ac_nxt; ac_nxt=3D$ac_in
-  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-  grep . conftest.tail >/dev/null || break
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines conftest.tail
-
-echo "ac_result=3D$ac_in" >>$CONFIG_STATUS
-cat >>$CONFIG_STATUS <<\_ACEOF
   if test x"$ac_file" !=3D x-; then
-    echo "/* $configure_input  */" >"$tmp/config.h"
-    cat "$ac_result" >>"$tmp/config.h"
-    if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      rm -f $ac_file
-      mv "$tmp/config.h" $ac_file
-    fi
-  else
-    echo "/* $configure_input  */"
-    cat "$ac_result"
-  fi
-  rm -f "$tmp/out12"
+    {
+      $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; }; }
+    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: $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; }; }
+    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; }; }
+  fi
  ;;
=20
=20
@@ -11263,6 +12257,11 @@
 chmod +x $CONFIG_STATUS
 ac_clean_files=3D$ac_clean_files_save
=20
+test $ac_write_fail =3D 0 ||
+  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STAT=
US" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+   { (exit 1); exit 1; }; }
+
=20
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
@@ -11284,7 +12283,12 @@
   # would make configure fail if this is the last instruction.
   $ac_cs_success || { (exit 1); exit 1; }
 fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" !=3D =
no; then
+  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecogni=
zed_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&=
2;}
+fi
=20
=20
 make buildopts
=20
+
diff -r de4c4743ca6a -r 7afb46b9c821 configure.ac
--- a/configure.ac	Mon Jun 15 12:15:45 2009 +0100
+++ b/configure.ac	Mon Oct 26 16:58:36 2009 -0700
@@ -148,11 +148,11 @@
 dnl option to point to a source directory or a build directory.
 dnl
=20
-rm -rf include share
-mkdir include
-mkdir share
-ln -s $SRCDIR include/oasys
-ln -s $SRCDIR share/oasys
+#rm -rf include share
+#mkdir include
+#mkdir share
+#ln -s $SRCDIR include/oasys
+#ln -s $SRCDIR share/oasys
=20
 if test ! $SRCDIR =3D `pwd` ; then
    AC_SUBST([SUBDIR])
@@ -163,3 +163,4 @@
=20
 make buildopts
=20
+
diff -r de4c4743ca6a -r 7afb46b9c821 debian/changelog
--- a/debian/changelog	Mon Jun 15 12:15:45 2009 +0100
+++ b/debian/changelog	Mon Oct 26 16:58:36 2009 -0700
@@ -1,3 +1,9 @@
+oasys (2.6.0) unstable; urgency=3Dlow
+
+  * 2.6.0 build 2.6.0 build=20
+
+ -- Alex McMahon <alex.mcmahon@cs.tcd.ie>  Fri, 08 May 2009 16:46:17 +0100
+
 oasys (1.3.0-2) unstable; urgency=3Dlow
=20
   * tweak autoconf and build rules*=20
diff -r de4c4743ca6a -r 7afb46b9c821 debian/control
--- a/debian/control	Mon Jun 15 12:15:45 2009 +0100
+++ b/debian/control	Mon Oct 26 16:58:36 2009 -0700
@@ -1,8 +1,8 @@
 Source: oasys
 Section: libs
 Priority: optional
-Maintainer: Michael Demmer <demmer@cs.berkeley.edu>
-Build-Depends: make, gcc, g++, debhelper (>=3D 5), tcl8.3-dev | tcl8.4-dev=
, libdb4.3-dev | libdb4.4-dev, libxerces27-dev
+Maintainer: dtn-users mailing list [dtn-users@mailman.dtnrg.org]
+Build-Depends: make, gcc, g++, debhelper (>=3D 5), tcl8.3-dev | tcl8.4-dev=
 | tcl8.5-dev, libdb4.3-dev | libdb4.4-dev | libdb4.5-dev |libdb4.6-dev | l=
ibdb4.7-dev, libxerces27-dev | libxerces-c2-dev | libxerces28-dev
=20
=20
 Package: liboasys
diff -r de4c4743ca6a -r 7afb46b9c821 doc/doxyfile
--- a/doc/doxyfile	Mon Jun 15 12:15:45 2009 +0100
+++ b/doc/doxyfile	Mon Oct 26 16:58:36 2009 -0700
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.4
+# Doxyfile 1.5.8
=20
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,6 +14,14 @@
 # Project related configuration options
 #-------------------------------------------------------------------------=
--
=20
+# This tag specifies the encoding used for all characters in the config fi=
le=20
+# that follow. The default is UTF-8 which is also the encoding used for al=
l=20
+# text before the first occurrence of this tag. Doxygen uses libiconv (or =
the=20
+# iconv built into libc) for the transcoding. See=20
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      =3D UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded=
=20
 # by quotes) that should identify the project.
=20
@@ -32,27 +40,28 @@
=20
 OUTPUT_DIRECTORY       =3D doc/doxygen
=20
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create=20
+# 4096 sub-directories (in 2 levels) under the output directory of each ou=
tput=20
+# format and will distribute the generated files over these directories.=20
+# Enabling this option can be useful when feeding doxygen a huge amount of=
=20
+# source files, where putting all generated files in the same directory wo=
uld=20
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         =3D NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all=20
 # documentation generated by doxygen is written. Doxygen will use this=20
 # information to generate all constant output in the proper language.=20
 # The default language is English, other supported languages are:=20
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danis=
h, Dutch,=20
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-e=
n=20
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese,=
=20
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrai=
nian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,=20
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek,=20
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English message=
s),=20
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish,=20
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene=
,=20
+# Spanish, Swedish, and Ukrainian.
=20
 OUTPUT_LANGUAGE        =3D English
=20
-# This tag can be used to specify the encoding used in the generated outpu=
t.=20
-# The encoding is not always determined by the language that is chosen,=20
-# but also whether or not the output is meant for Windows or non-Windows u=
sers.=20
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to Y=
ES=20
-# forces the Windows encoding (this is the default for the Windows binary)=
,=20
-# whereas setting the tag to NO uses a Unix-style encoding (the default fo=
r=20
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   =3D NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will=20
 # include brief member descriptions after the members that are listed in=20
 # the file and class documentation (similar to JavaDoc).=20
@@ -67,16 +76,28 @@
=20
 REPEAT_BRIEF           =3D YES
=20
+# This tag implements a quasi-intelligent brief description abbreviator=20
+# that is used to form the text in various listings. Each string=20
+# in this list, if found as the leading text of the brief description, wil=
l be=20
+# stripped from the text and the result after processing the whole list, i=
s=20
+# used as the annotated text. Otherwise, the brief description is used as-=
is.=20
+# If left blank, the following values are used ("$name" is automatically=20
+# replaced with the name of the entity): "The $name class" "The $name widg=
et"=20
+# "The $name file" "is" "provides" "specifies" "contains"=20
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       =3D=20
+
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES the=
n=20
 # Doxygen will generate a detailed section even if there is only a brief=20
 # description.
=20
 ALWAYS_DETAILED_SEC    =3D YES
=20
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all in=
herited=20
-# members of a class in the documentation of that class as if those member=
s were=20
-# ordinary class members. Constructors, destructors and assignment operato=
rs of=20
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all=20
+# inherited members of a class in the documentation of that class as if th=
ose=20
+# members were ordinary class members. Constructors, destructors and assig=
nment=20
+# operators of the base classes will not be shown.
=20
 INLINE_INHERITED_MEMB  =3D NO
=20
@@ -89,10 +110,21 @@
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag=20
 # can be used to strip a user-defined part of the path. Stripping is=20
 # only done if one of the specified strings matches the left-hand part of=20
-# the path. It is allowed to use relative paths in the argument list.
+# the path. The tag can be used to show relative paths in the file list.=20
+# If left blank the directory from which doxygen is run is used as the=20
+# path to strip.
=20
 STRIP_FROM_PATH        =3D=20
=20
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of=20
+# the path mentioned in the documentation of a class, which tells=20
+# the reader which header file to include in order to use a class.=20
+# If left blank only the name of the header file containing the class=20
+# definition is used. Otherwise one should specify the include paths that=20
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    =3D=20
+
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter=
=20
 # (but less readable) file names. This can be useful is your file systems=20
 # doesn't support long names like on DOS, Mac, or CD-ROM.
@@ -102,11 +134,19 @@
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen=20
 # will interpret the first line (until the first dot) of a JavaDoc-style=20
 # comment as the brief description. If set to NO, the JavaDoc=20
-# comments will behave just like the Qt-style comments (thus requiring an=20
-# explict @brief command for a brief description.
+# comments will behave just like regular Qt-style comments=20
+# (thus requiring an explicit @brief command for a brief description.)
=20
 JAVADOC_AUTOBRIEF      =3D YES
=20
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will=20
+# interpret the first line (until the first dot) of a Qt-style=20
+# comment as the brief description. If set to NO, the comments=20
+# will behave just like regular Qt-style comments (thus requiring=20
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           =3D NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen=20
 # treat a multi-line C++ special comment block (i.e. a block of //! or ///=
=20
 # comments) as a brief description. This used to be the default behaviour.=
=20
@@ -115,25 +155,17 @@
=20
 MULTILINE_CPP_IS_BRIEF =3D NO
=20
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen=20
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member=20
-# documentation.
-
-DETAILS_AT_TOP         =3D YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented=
=20
 # member inherits the documentation from any documented member that it=20
-# reimplements.
+# re-implements.
=20
 INHERIT_DOCS           =3D YES
=20
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP=
_DOC=20
-# tag is set to YES, then doxygen will reuse the documentation of the firs=
t=20
-# member in the group (if any) for the other members of the group. By defa=
ult=20
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produc=
e=20
+# a new page for each member. If set to NO, the documentation of a member =
will=20
+# be part of the file/class/namespace that contains it.
=20
-DISTRIBUTE_GROUP_DOC   =3D YES
+SEPARATE_MEMBER_PAGES  =3D NO
=20
 # The TAB_SIZE tag can be used to set the number of spaces in a tab.=20
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -149,20 +181,79 @@
=20
 ALIASES                =3D=20
=20
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C s=
ources=20
-# only. Doxygen will then generate output that is more tailored for C.=20
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C=20
+# sources only. Doxygen will then generate output that is more tailored fo=
r C.=20
 # For instance, some of the names that are used will be different. The lis=
t=20
 # of all members will be omitted, etc.
=20
 OPTIMIZE_OUTPUT_FOR_C  =3D NO
=20
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java=
 sources=20
-# only. Doxygen will then generate output that is more tailored for Java.=20
-# For instance, namespaces will be presented as packages, qualified scopes=
=20
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java=
=20
+# sources only. Doxygen will then generate output that is more tailored fo=
r=20
+# Java. For instance, namespaces will be presented as packages, qualified=20
+# scopes will look different, etc.
=20
 OPTIMIZE_OUTPUT_JAVA   =3D NO
=20
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fort=
ran=20
+# sources only. Doxygen will then generate output that is more tailored fo=
r=20
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   =3D NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL=
=20
+# sources. Doxygen will then generate output that is tailored for=20
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   =3D NO
+
+# Doxygen selects the parser to use depending on the extension of the file=
s it parses.=20
+# With this tag you can assign which parser to use for a given extension.=20
+# Doxygen has a built-in mapping, but you can override or extend it using =
this tag.=20
+# The format is ext=3Dlanguage, where ext is a file extension, and languag=
e is one of=20
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, =
PHP,=20
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen=
 treat=20
+# .inc files as Fortran files (default is PHP), and .f files as C (default=
 is Fortran),=20
+# use: inc=3DFortran f=3DC
+
+EXTENSION_MAPPING      =3D=20
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not =
want=20
+# to include (a tag file for) the STL sources as input, then you should=20
+# set this tag to YES in order to let doxygen match functions declarations=
 and=20
+# definitions whose arguments contain STL classes (e.g. func(std::string);=
 v.s.=20
+# func(std::string) {}). This also make the inheritance and collaboration=20
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    =3D NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to Y=
ES to=20
+# enable parsing support.
+
+CPP_CLI_SUPPORT        =3D NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources o=
nly.=20
+# Doxygen will parse them like normal C++ but will assume all classes use =
public=20
+# instead of private inheritance when no explicit protection keyword is pr=
esent.
+
+SIP_SUPPORT            =3D NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate=
 getter=20
+# and setter methods for a property. Setting this option to YES (the defau=
lt)=20
+# will make doxygen to replace the get and set methods by a property in th=
e=20
+# documentation. This will only work if the methods are indeed getting or=20
+# setting a simple type. If this is not the case, or you want to show the=20
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   =3D YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP=
_DOC=20
+# tag is set to YES, then doxygen will reuse the documentation of the firs=
t=20
+# member in the group (if any) for the other members of the group. By defa=
ult=20
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   =3D YES
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member group=
s of=20
 # the same type (for instance a group of public functions) to be put as a=20
 # subgroup of that type (e.g. under the Public Functions section). Set it =
to=20
@@ -171,6 +262,32 @@
=20
 SUBGROUPING            =3D YES
=20
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or e=
num=20
+# is documented as struct, union, or enum with the name of the typedef. So=
=20
+# typedef struct TypeS {} TypeT, will appear in the documentation as a str=
uct=20
+# with name TypeT. When disabled the typedef will appear as a member of a =
file,=20
+# namespace, or class. And the struct will be named TypeS. This can typica=
lly=20
+# be useful for C code in case the coding convention dictates that all com=
pound=20
+# types are typedef'ed and only the typedef is referenced, never the tag n=
ame.
+
+TYPEDEF_HIDES_STRUCT   =3D NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to=20
+# determine which symbols to keep in memory and which to flush to disk.=20
+# When the cache is full, less often used symbols will be written to disk.=
=20
+# For small to medium size projects (<1000 input files) the default value =
is=20
+# probably good enough. For larger projects a too small cache size can cau=
se=20
+# doxygen to be busy swapping symbols to and from disk most of the time=20
+# causing a significant performance penality.=20
+# If the system has enough physical memory increasing the cache will impro=
ve the=20
+# performance by keeping more symbols in memory. Note that the value works=
 on=20
+# a logarithmic scale so increasing the size by one will rougly double the=
=20
+# memory usage. The cache size is given by this formula:=20
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,=20
+# corresponding to a cache size of 2^16 =3D 65536 symbols
+
+SYMBOL_CACHE_SIZE      =3D 0
+
 #-------------------------------------------------------------------------=
--
 # Build related configuration options
 #-------------------------------------------------------------------------=
--
@@ -198,6 +315,21 @@
=20
 EXTRACT_LOCAL_CLASSES  =3D YES
=20
+# This flag is only useful for Objective-C code. When set to YES local=20
+# methods, which are defined in the implementation section but not in=20
+# the interface are included in the documentation.=20
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  =3D NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be=20
+# extracted and appear in the documentation as a namespace called=20
+# 'anonymous_namespace{file}', where file will be replaced with the base=20
+# name of the file that contains the anonymous namespace. By default=20
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   =3D NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all=20
 # undocumented members of documented classes, files or namespaces.=20
 # If set to NO (the default) these members will be included in the=20
@@ -238,7 +370,7 @@
 # file names in lower-case letters. If set to YES upper-case letters are a=
lso=20
 # allowed. This is useful if you have classes or files whose names only di=
ffer=20
 # in case and if your file system supports case sensitive file names. Wind=
ows=20
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
=20
 CASE_SENSE_NAMES       =3D YES
=20
@@ -266,6 +398,29 @@
=20
 SORT_MEMBER_DOCS       =3D YES
=20
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the=20
+# brief documentation of file, namespace and class members alphabetically=20
+# by member name. If set to NO (the default) the members will appear in=20
+# declaration order.
+
+SORT_BRIEF_DOCS        =3D NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the=20
+# hierarchy of group names into alphabetical order. If set to NO (the defa=
ult)=20
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       =3D NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be=20
+# sorted by fully-qualified names, including namespaces. If set to=20
+# NO (the default), the class list will be sorted only by class name,=20
+# not including the namespace part.=20
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.=20
+# Note: This option applies only to the class list, not to the=20
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     =3D NO
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or=20
 # disable (NO) the todo list. This list is created by putting \todo=20
 # commands in the documentation.
@@ -311,6 +466,44 @@
=20
 SHOW_USED_FILES        =3D YES
=20
+# If the sources in your project are distributed over multiple directories=
=20
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hie=
rarchy=20
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       =3D NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page=
.=20
+# This will remove the Files entry from the Quick Index and from the=20
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             =3D YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the=20
+# Namespaces page.=20
+# This will remove the Namespaces entry from the Quick Index=20
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        =3D YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script t=
hat=20
+# doxygen should invoke to get the current version for each file (typicall=
y from=20
+# the version control system). Doxygen will invoke the program by executin=
g (via=20
+# popen()) the command <command> <input-file>, where <command> is the valu=
e of=20
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input fi=
le=20
+# provided by doxygen. Whatever the program writes to standard output=20
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    =3D=20
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be p=
arsed by=20
+# doxygen. The layout file controls the global structure of the generated =
output files=20
+# in an output format independent way. The create the layout file that rep=
resents=20
+# doxygen's defaults, run doxygen with the -l option. You can optionally s=
pecify a=20
+# file name after the option, if omitted DoxygenLayout.xml will be used as=
 the name=20
+# of the layout file.
+
+LAYOUT_FILE            =3D=20
+
 #-------------------------------------------------------------------------=
--
 # configuration options related to warning and progress messages
 #-------------------------------------------------------------------------=
--
@@ -339,10 +532,20 @@
=20
 WARN_IF_DOC_ERROR      =3D YES
=20
+# This WARN_NO_PARAMDOC option can be abled to get warnings for=20
+# functions that are documented, but have no documentation for their param=
eters=20
+# or return value. If set to NO (the default) doxygen will only warn about=
=20
+# wrong or incomplete parameter documentation, but not about the absence o=
f=20
+# documentation.
+
+WARN_NO_PARAMDOC       =3D NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that=20
 # doxygen can produce. The string should contain the $file, $line, and $te=
xt=20
 # tags, which will be replaced by the file and line number from which the=20
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may conta=
in=20
+# $version, which will be replaced by the version of the file (if it could=
=20
+# be obtained via FILE_VERSION_FILTER)
=20
 WARN_FORMAT            =3D "$file:$line: $text"
=20
@@ -363,12 +566,20 @@
=20
 INPUT                  =3D .
=20
+# This tag can be used to specify the character encoding of the source fil=
es=20
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which i=
s=20
+# also the default input encoding. Doxygen uses libiconv (or the iconv bui=
lt=20
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv=
 for=20
+# the list of possible encodings.
+
+INPUT_ENCODING         =3D UTF-8
+
 # If the value of the INPUT tag contains directories, you can use the=20
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp=20
 # and *.h) to filter out the source-files in the directories. If left=20
 # blank the following patterns are tested:=20
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh =
*.hxx *.hpp=20
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh =
*.hxx=20
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
=20
 FILE_PATTERNS          =3D=20
=20
@@ -384,16 +595,28 @@
=20
 EXCLUDE                =3D debug/Formatter.cc
=20
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or dire=
ctories=20
-# that are symbolic links (a Unix filesystem feature) are excluded from th=
e input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or=20
+# directories that are symbolic links (a Unix filesystem feature) are excl=
uded=20
+# from the input.
=20
 EXCLUDE_SYMLINKS       =3D NO
=20
 # If the value of the INPUT tag contains directories, you can use the=20
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude=
=20
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matche=
d=20
+# against the file with absolute path, so to exclude all test directories=20
+# for example use the pattern */test/*
=20
-EXCLUDE_PATTERNS       =3D gdtoa* arith*.h
+EXCLUDE_PATTERNS       =3D gdtoa* \
+                         arith*.h
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names=20
+# (namespaces, classes, functions, etc.) that should be excluded from the=20
+# output. The symbol name can be a fully qualified name, a word, or if the=
=20
+# wildcard * is used, a substring. Examples: ANamespace, AClass,=20
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        =3D=20
=20
 # The EXAMPLE_PATH tag can be used to specify one or more files or=20
 # directories that contain example code fragments that are included (see=20
@@ -426,10 +649,23 @@
 # by executing (via popen()) the command <filter> <input-file>, where <fil=
ter>=20
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an=
=20
 # input file. Doxygen will then use the output that the filter program wri=
tes=20
-# to standard output.
+# to standard output.=20
+# If FILTER_PATTERNS is specified, this tag will be=20
+# ignored.
=20
 INPUT_FILTER           =3D=20
=20
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pat=
tern=20
+# basis.=20
+# Doxygen will compare the file name with each pattern and apply the=20
+# filter if there is a match.=20
+# The filters are a list of the form:=20
+# pattern=3Dfilter (like *.cpp=3Dmy_cpp_filter). See INPUT_FILTER for furt=
her=20
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER=20
+# is applied to all files.
+
+FILTER_PATTERNS        =3D=20
+
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set u=
sing=20
 # INPUT_FILTER) will be used to filter the input files when producing sour=
ce=20
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
@@ -441,7 +677,9 @@
 #-------------------------------------------------------------------------=
--
=20
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will=
=20
-# be generated. Documented entities will be cross-referenced with these so=
urces.
+# be generated. Documented entities will be cross-referenced with these so=
urces.=20
+# Note: To get rid of all source code in the generated output, make sure a=
lso=20
+# VERBATIM_HEADERS is set to NO.
=20
 SOURCE_BROWSER         =3D YES
=20
@@ -456,18 +694,34 @@
=20
 STRIP_CODE_COMMENTS    =3D YES
=20
-# If the REFERENCED_BY_RELATION tag is set to YES (the default)=20
+# If the REFERENCED_BY_RELATION tag is set to YES=20
 # then for each documented function all documented=20
 # functions referencing it will be listed.
=20
 REFERENCED_BY_RELATION =3D YES
=20
-# If the REFERENCES_RELATION tag is set to YES (the default)=20
+# If the REFERENCES_RELATION tag is set to YES=20
 # then for each documented function all documented entities=20
 # called/used by that function will be listed.
=20
 REFERENCES_RELATION    =3D YES
=20
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)=20
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from=20
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will=20
+# link to the source code.=20
+# Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE =3D YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code=20
+# will point to the HTML generated by the htags(1) tool instead of doxygen=
=20
+# built-in source browser. The htags tool is part of GNU's global source=20
+# tagging system (see http://www.gnu.org/software/global/global.html). You=
=20
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              =3D NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen=20
 # will generate a verbatim copy of the header file for each class for=20
 # which an include is specified. Set to NO to disable this.
@@ -533,7 +787,9 @@
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading=20
 # style sheet that is used by each HTML page. It can be used to=20
 # fine-tune the look of the HTML output. If the tag is left blank doxygen=20
-# will generate a default style sheet
+# will generate a default style sheet. Note that doxygen will try to copy=20
+# the style sheet file to the HTML output directory, so don't put your own=
=20
+# stylesheet in the HTML output directory as well, or it will be erased!
=20
 HTML_STYLESHEET        =3D doc/doxygen/style.css
=20
@@ -543,9 +799,43 @@
=20
 HTML_ALIGN_MEMBERS     =3D YES
=20
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML=20
+# documentation will contain sections that can be hidden and shown after t=
he=20
+# page has loaded. For this to work a browser that supports=20
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox=20
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  =3D NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files=20
+# will be generated that can be used as input for Apple's Xcode 3=20
+# integrated development environment, introduced with OSX 10.5 (Leopard).=20
+# To create a documentation set, doxygen will generate a Makefile in the=20
+# HTML output directory. Running make will produce the docset in that=20
+# directory and running "make install" will install the docset in=20
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find=
=20
+# it at startup.=20
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for=
 more information.
+
+GENERATE_DOCSET        =3D NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of =
the=20
+# feed. A documentation feed provides an umbrella under which multiple=20
+# documentation sets from a single provider (such as a company or product =
suite)=20
+# can be grouped.
+
+DOCSET_FEEDNAME        =3D "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that=
=20
+# should uniquely identify the documentation set bundle. This should be a=20
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen=20
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       =3D org.doxygen.Project
+
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files=20
 # will be generated that can be used as input for tools like the=20
-# Microsoft HTML help workshop to generate a compressed HTML help file (.c=
hm)=20
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm=
)=20
 # of the generated HTML documentation.
=20
 GENERATE_HTMLHELP      =3D NO
@@ -553,7 +843,7 @@
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can=20
 # be used to specify the file name of the resulting .chm file. You=20
 # can add a path in front of the file if the result should not be=20
-# written to the html output dir.
+# written to the html output directory.
=20
 CHM_FILE               =3D=20
=20
@@ -570,6 +860,12 @@
=20
 GENERATE_CHI           =3D NO
=20
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING=20
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file=20
+# content.
+
+CHM_INDEX_ENCODING     =3D=20
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag=20
 # controls whether a binary table of contents is generated (YES) or a=20
 # normal table of contents (NO) in the .chm file.
@@ -581,6 +877,55 @@
=20
 TOC_EXPAND             =3D NO
=20
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIR=
TUAL_FOLDER=20
+# are set, an additional index file will be generated that can be used as =
input for=20
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the gener=
ated=20
+# HTML documentation.
+
+GENERATE_QHP           =3D NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can=20
+# be used to specify the file name of the resulting .qch file.=20
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               =3D=20
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating=20
+# Qt Help Project output. For more information please see=20
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          =3D=20
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generatin=
g=20
+# Qt Help Project output. For more information please see=20
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     =3D doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter=
 to add.=20
+# For more information please see=20
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   =3D=20
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the =
custom filter to add.For more information please see=20
+# <a href=3D"http://doc.trolltech.com/qthelpproject.html#custom-filters">Q=
t Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  =3D=20
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this =
project's=20
+# filter section matches.=20
+# <a href=3D"http://doc.trolltech.com/qthelpproject.html#filter-attributes=
">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  =3D=20
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can=20
+# be used to specify the location of Qt's qhelpgenerator.=20
+# If non-empty doxygen will try to run qhelpgenerator on the generated=20
+# .qhp file.
+
+QHG_LOCATION           =3D=20
+
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at=20
 # top of each HTML page. The value NO (the default) enables the index and=20
 # the value YES disables it.
@@ -592,12 +937,20 @@
=20
 ENUM_VALUES_PER_LINE   =3D 4
=20
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that=
=20
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index=20
+# structure should be generated to display hierarchical information.=20
+# If the tag value is set to FRAME, a side panel will be generated=20
+# containing a tree-like index structure (just like the one that=20
 # is generated for HTML Help). For this to work a browser that supports=20
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+=
,=20
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are=20
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values=20
+# for this tag are: HIERARCHIES, which will generate the Groups, Directori=
es,=20
+# and Class Hierarchy pages using a tree view instead of an ordered list;=20
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, whi=
ch=20
+# disables this behavior completely. For backwards compatibility with prev=
ious=20
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and N=
ONE=20
+# respectively.
=20
 GENERATE_TREEVIEW      =3D YES
=20
@@ -607,6 +960,14 @@
=20
 TREEVIEW_WIDTH         =3D 200
=20
+# Use this tag to change the font size of Latex formulas included=20
+# as images in the HTML documentation. The default is 10. Note that=20
+# when you change the font size after a successful doxygen run you need=20
+# to manually remove any form_*.png images from the HTML output directory=20
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       =3D 10
+
 #-------------------------------------------------------------------------=
--
 # configuration options related to the LaTeX output
 #-------------------------------------------------------------------------=
--
@@ -688,7 +1049,7 @@
 #-------------------------------------------------------------------------=
--
=20
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output=20
-# The RTF output is optimised for Word 97 and may not look very pretty wit=
h=20
+# The RTF output is optimized for Word 97 and may not look very pretty wit=
h=20
 # other RTF readers or editors.
=20
 GENERATE_RTF           =3D NO
@@ -715,7 +1076,7 @@
 RTF_HYPERLINKS         =3D NO
=20
 # Load stylesheet definitions from file. Syntax is similar to doxygen's=20
-# config file, i.e. a series of assigments. You only have to provide=20
+# config file, i.e. a series of assignments. You only have to provide=20
 # replacements, missing definitions are set to their default value.
=20
 RTF_STYLESHEET_FILE    =3D=20
@@ -759,9 +1120,7 @@
=20
 # If the GENERATE_XML tag is set to YES Doxygen will=20
 # generate an XML file that captures the structure of=20
-# the code including all documentation. Note that this=20
-# feature is still experimental and incomplete at the=20
-# moment.
+# the code including all documentation.
=20
 GENERATE_XML           =3D NO
=20
@@ -783,6 +1142,13 @@
=20
 XML_DTD                =3D=20
=20
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will=20
+# dump the program listings (including syntax highlighting=20
+# and cross-referencing information) to the XML output. Note that=20
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     =3D YES
+
 #-------------------------------------------------------------------------=
--
 # configuration options for the AutoGen Definitions output
 #-------------------------------------------------------------------------=
--
@@ -814,8 +1180,10 @@
 PERLMOD_LATEX          =3D NO
=20
 # If the PERLMOD_PRETTY tag is set to YES the Perl module output will be=20
-# nicely formatted so it can be parsed by a human reader.  This is useful=20
-# if you want to understand what is going on.  On the other hand, if this=20
+# nicely formatted so it can be parsed by a human reader.=20
+# This is useful=20
+# if you want to understand what is going on.=20
+# On the other hand, if this=20
 # tag is set to NO the size of the Perl module output will be much smaller=
=20
 # and Perl will parse it just the same.
=20
@@ -847,7 +1215,7 @@
=20
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES=20
 # then the macro expansion is limited to the macros specified with the=20
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
=20
 EXPAND_ONLY_PREDEF     =3D YES
=20
@@ -873,9 +1241,12 @@
 # are defined before the preprocessor is started (similar to the -D option=
 of=20
 # gcc). The argument of the tag is a list of macros of the form: name=20
 # or name=3Ddefinition (no spaces). If the definition and the =3D are=20
-# omitted =3D1 is assumed.
+# omitted =3D1 is assumed. To prevent a macro definition from being=20
+# undefined via #undef or recursively expanded use the :=3D operator=20
+# instead of the =3D operator.
=20
-PREDEFINED             =3D "PRINTFLIKE(x, y)=3D" "DOXYGEN"
+PREDEFINED             =3D "PRINTFLIKE(x, y)=3D" \
+                         "DOXYGEN"
=20
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then=20
 # this tag can be used to specify a list of macro names that should be exp=
anded.=20
@@ -887,27 +1258,29 @@
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then=20
 # doxygen's preprocessor will remove all function-like macros that are alo=
ne=20
 # on a line, have an all uppercase name, and do not end with a semicolon. =
Such=20
-# function macros are typically used for boiler-plate code, and will confu=
se the=20
-# parser if not removed.
+# function macros are typically used for boiler-plate code, and will confu=
se=20
+# the parser if not removed.
=20
 SKIP_FUNCTION_MACROS   =3D YES
=20
 #-------------------------------------------------------------------------=
--
-# Configuration::addtions related to external references  =20
+# Configuration::additions related to external references  =20
 #-------------------------------------------------------------------------=
--
=20
 # The TAGFILES option can be used to specify one or more tagfiles.=20
 # Optionally an initial location of the external documentation=20
 # can be added for each tagfile. The format of a tag file without=20
 # this location is as follows:=20
-#   TAGFILES =3D file1 file2 ...=20
+# =20
+# TAGFILES =3D file1 file2 ...=20
 # Adding location for the tag files is done as follows:=20
-#   TAGFILES =3D file1=3Dloc1 "file2 =3D loc2" ...=20
+# =20
+# TAGFILES =3D file1=3Dloc1 "file2 =3D loc2" ...=20
 # where "loc1" and "loc2" can be relative or absolute paths or=20
 # URLs. If a location is present for each tag, the installdox tool=20
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
+# does not have to be run to correct the links.=20
+# Note that each tag file must have a unique name=20
+# (where the name does NOT include the path)=20
 # If a tag file is not located in the directory in which doxygen=20
 # is run, you must also specify the path to the tagfile here.
=20
@@ -940,13 +1313,23 @@
 #-------------------------------------------------------------------------=
--
=20
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will=20
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with=
 base or=20
-# super classes. Setting the tag to NO turns the diagrams off. Note that t=
his=20
-# option is superceded by the HAVE_DOT option below. This is only a fallba=
ck. It is=20
-# recommended to install and use dot, since it yields more powerful graphs=
.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with=
 base=20
+# or super classes. Setting the tag to NO turns the diagrams off. Note tha=
t=20
+# this option is superseded by the HAVE_DOT option below. This is only a=20
+# fallback. It is recommended to install and use dot, since it yields more=
=20
+# powerful graphs.
=20
 CLASS_DIAGRAMS         =3D YES
=20
+# You can define message sequence charts within doxygen comments using the=
 \msc=20
+# command. Doxygen will then run the mscgen tool (see=20
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in=
 the=20
+# documentation. The MSCGEN_PATH tag allows you to specify the directory w=
here=20
+# the mscgen tool resides. If left empty the tool is assumed to be found i=
n the=20
+# default search path.
+
+MSCGEN_PATH            =3D=20
+
 # If set to YES, the inheritance and collaboration graphs will hide=20
 # inheritance and usage relations if the target is undocumented=20
 # or is not a class.
@@ -960,6 +1343,29 @@
=20
 HAVE_DOT               =3D NO
=20
+# By default doxygen will write a font called FreeSans.ttf to the output=20
+# directory and reference it in all dot files that doxygen generates. This=
=20
+# font does not include all possible unicode characters however, so when y=
ou need=20
+# these (or just want a differently looking font) you can specify the font=
 name=20
+# using DOT_FONTNAME. You need need to make sure dot is able to find the f=
ont,=20
+# which can be done by putting it in a standard location or by setting the=
=20
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the direc=
tory=20
+# containing the font.
+
+DOT_FONTNAME           =3D FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot grap=
hs.=20
+# The default size is 10pt.
+
+DOT_FONTSIZE           =3D 10
+
+# By default doxygen will tell dot to use the output directory to look for=
 the=20
+# FreeSans.ttf font (which doxygen will put there itself). If you specify =
a=20
+# different font using DOT_FONTNAME you can set the path where dot=20
+# can find it using this tag.
+
+DOT_FONTPATH           =3D=20
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen=20
 # will generate a graph for each documented class showing the direct and=20
 # indirect inheritance relations. Setting this tag to YES will force the=20
@@ -974,8 +1380,13 @@
=20
 COLLABORATION_GRAPH    =3D YES
=20
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen=20
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           =3D YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and=20
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling=
=20
+# collaboration diagrams in a style similar to the OMG's Unified Modeling=20
 # Language.
=20
 UML_LOOK               =3D NO
@@ -999,27 +1410,42 @@
=20
 INCLUDED_BY_GRAPH      =3D YES
=20
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will=20
-# generate a call dependency graph for every global function or class meth=
od.=20
-# Note that enabling this option will significantly increase the time of a=
 run.=20
-# So in most cases it will be better to enable call graphs for selected=20
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then=20
+# doxygen will generate a call dependency graph for every global function=20
+# or class method. Note that enabling this option will significantly incre=
ase=20
+# the time of a run. So in most cases it will be better to enable call gra=
phs=20
+# for selected functions only using the \callgraph command.
=20
 CALL_GRAPH             =3D NO
=20
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then=20
+# doxygen will generate a caller dependency graph for every global functio=
n=20
+# or class method. Note that enabling this option will significantly incre=
ase=20
+# the time of a run. So in most cases it will be better to enable caller=20
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           =3D NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen=
=20
 # will graphical hierarchy of all classes instead of a textual one.
=20
 GRAPHICAL_HIERARCHY    =3D YES
=20
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YE=
S=20
+# then doxygen will show the dependencies a directory has on other directo=
ries=20
+# in a graphical way. The dependency relations are determined by the #incl=
ude=20
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        =3D YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the imag=
es=20
-# generated by dot. Possible values are png, jpg, or gif
+# generated by dot. Possible values are png, jpg, or gif=20
 # If left blank png will be used.
=20
 DOT_IMAGE_FORMAT       =3D png
=20
 # The tag DOT_PATH can be used to specify the path where the dot tool can =
be=20
-# found. If left blank, it is assumed the dot tool can be found on the pat=
h.
+# found. If left blank, it is assumed the dot tool can be found in the pat=
h.
=20
 DOT_PATH               =3D=20
=20
@@ -1029,33 +1455,41 @@
=20
 DOTFILE_DIRS           =3D=20
=20
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width=
=20
-# (in pixels) of the graphs generated by dot. If a graph becomes larger th=
an=20
-# this value, doxygen will try to truncate the graph, so that it fits with=
in=20
-# the specified constraint. Beware that most browsers cannot cope with ver=
y=20
-# large images.
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of=20
+# nodes that will be shown in the graph. If the number of nodes in a graph=
=20
+# becomes larger than this value, doxygen will truncate the graph, which i=
s=20
+# visualized by representing a node as a red box. Note that doxygen if the=
=20
+# number of direct children of the root node in a graph is already larger =
than=20
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note=20
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPT=
H.
=20
-MAX_DOT_GRAPH_WIDTH    =3D 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows heigh=
t=20
-# (in pixels) of the graphs generated by dot. If a graph becomes larger th=
an=20
-# this value, doxygen will try to truncate the graph, so that it fits with=
in=20
-# the specified constraint. Beware that most browsers cannot cope with ver=
y=20
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   =3D 1024
+DOT_GRAPH_MAX_NODES    =3D 50
=20
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the=20
 # graphs generated by dot. A depth value of 3 means that only nodes reacha=
ble=20
-# from the root by following a path via at most 3 edges will be shown. Nod=
es that=20
-# lay further from the root node will be omitted. Note that setting this o=
ption to=20
-# 1 or 2 may greatly reduce the computation time needed for large code bas=
es. Also=20
-# note that a graph may be further truncated if the graph's image dimensio=
ns are=20
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRA=
PH_HEIGHT).=20
-# If 0 is used for the depth value (the default), the graph is not depth-c=
onstrained.
+# from the root by following a path via at most 3 edges will be shown. Nod=
es=20
+# that lay further from the root node will be omitted. Note that setting t=
his=20
+# option to 1 or 2 may greatly reduce the computation time needed for larg=
e=20
+# code bases. Also note that the size of a graph can be further restricted=
 by=20
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
=20
 MAX_DOT_GRAPH_DEPTH    =3D 0
=20
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent=
=20
+# background. This is disabled by default, because dot on Windows does not=
=20
+# seem to support this out of the box. Warning: Depending on the platform =
used,=20
+# enabling this option may lead to badly anti-aliased labels on the edges =
of=20
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        =3D NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple outp=
ut=20
+# files in one run (i.e. multiple -o and -T options on the command line). =
This=20
+# makes dot run faster, but since only newer versions of dot (>1.8.10)=20
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      =3D NO
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will=20
 # generate a legend page explaining the meaning of the various boxes and=20
 # arrows in the dot generated graphs.
@@ -1069,7 +1503,7 @@
 DOT_CLEANUP            =3D YES
=20
 #-------------------------------------------------------------------------=
--
-# Configuration::addtions related to the search engine  =20
+# Options related to the search engine
 #-------------------------------------------------------------------------=
--
=20
 # The SEARCHENGINE tag specifies whether or not a search engine should be=20
diff -r de4c4743ca6a -r 7afb46b9c821 oasys-config.h.in
--- a/oasys-config.h.in	Mon Jun 15 12:15:45 2009 +0100
+++ b/oasys-config.h.in	Mon Oct 26 16:58:36 2009 -0700
@@ -63,6 +63,9 @@
 /* Define to 1 if the system has the type `ptrdiff_t'. */
 #undef HAVE_PTRDIFF_T
=20
+/* Define to 1 if you have the <readline/readline.h> header file. */
+#undef HAVE_READLINE_READLINE_H
+
 /* wether sched_yield exists */
 #undef HAVE_SCHED_YIELD
=20

--=-b9jDyyNmvIrVlMgIzBjN
Content-Disposition: attachment; filename="dtn-build.patch"
Content-Type: text/x-patch; name="dtn-build.patch"; charset="UTF-8"
Content-Transfer-Encoding: 7bit

# HG changeset patch
# User Alex McMahon <alex.mcmahon@cs.tcd.ie>
# Date 1256598740 25200
# Node ID 9e02c01152bb913af6ea491f4ad5124a88394782
# Parent  75810bc10946d54d575c445a04fc1342dbf51e81
Stop creation of oasys-->../oasys symlinks which
lead to recursion within oasys (i.e. /oasys/include/oasys/include/oasy..n & oasys/share/oasys/share/oa..n).
Restructure of build to create below oasys structure if oasys located at ../ on configuration of DTN2:

oasys
|-- include
| `-- oasys -> ../../../oasys
|-- lib -> ../../oasys/lib
`-- share -> ../../oasys

Provide more searches and feedback during build.

diff -r 75810bc10946 -r 9e02c01152bb Makefile
--- a/Makefile	Fri Jul 17 18:27:36 2009 +0100
+++ b/Makefile	Mon Oct 26 16:12:20 2009 -0700
@@ -195,5 +195,6 @@
 	@echo error -- Makefile did not set SRCDIR properly
 	@exit 1
 
-CFGFILES = Rules.make System.make
+CFGDIRS  := oasys/include oasys
+CFGFILES = Rules.make System.make oasys/include/oasys oasys/share oasys/lib
 GENFILES = doc/manual/man/*.txt
diff -r 75810bc10946 -r 9e02c01152bb README
--- a/README	Fri Jul 17 18:27:36 2009 +0100
+++ b/README	Mon Oct 26 16:12:20 2009 -0700
@@ -34,8 +34,9 @@
 
 Reporting Bugs / Other Help
 ---------------------------
-As of this release, there is no bug tracking system in place. Please
-direct questions and/or bug reports to dtn-bugs@mailman.dtnrg.org.
+A bug tracking system is in place. Please direct bug reports to 
+http://sourceforge.net/tracker/?group_id=101657&atid=630167 and
+direct questions to dtn-bugs@mailman.dtnrg.org.
 
 DTN2 Directory Structure
 ------------------------
@@ -46,40 +47,106 @@
 daemon/			dtn router daemon sources
 ideas/			temporary code idea repository
 servlib/		dtn router internals
-servlib/bundling/	bundle management and forwarding logic
-servlib/contacts/	next hop structures and link types
-servlib/cmd/		tcl based command interface
-servlib/conv_layers/	convergence layers
-servlib/naming/		endpoint identifier schemes
-servlib/reg/		local registrations
-servlib/routing/	bundle routing logic
-servlib/storage/	persistent storage management
+|-- bundling		bundle management and forwarding logic
+|-- cmd			tcl based command interface
+|-- contacts
+|-- conv_layers		convergence layers
+|-- discovery
+|-- gcm
+|-- naming		endpoint identifier schemes
+|-- prophet		prophet router 
+|-- reg			local registrations
+|-- routing		bundle routing logic
+|-- security		bundle security protocol
+|-- session
+`-- storage		persistent storage management
 sim/			simulation framework
 test/			unit tests and other test files
 test-utils/		test scripts and utilities
 
-oasys/compat/		portability and compatibility logic
-oasys/debug/		debugging and logging support code
-oasys/io/		I/O and networking support code
-oasys/memory/		memory management and debugging support
-oasys/serialize/	object serialization support
-oasys/smtp/		SMTP (mail) protocol handlers
-oasys/storage/		persistant storage interface 
-oasys/tclcmd/		tcl command infrastructure and support
-oasys/test/		unit tests and other test files
-oasys/thread/		thread / lock support implementation
-oasys/util/		miscellaneous utility classes
-
 External Requirements
 ---------------------
-
+oasys-1.3.0+ (see Note - Oasys)
 gcc/g++
-pthreads
-tcl8.3+
 
 Optional External Packages
 --------------------------
-tclreadline
-tclx
-tcllib
-BerkeleyDB
+bonjour
+
+Optional Internal Packages
+--------------------------
+NORM convergence layer support
+Bundle Security Protocol support (see Note BSP)
+
+
+
+Note - Oasys
+--------------------------
+Before compiling DTN2 please compile Oasys-1.3.0+ (must be 
+installed or located in DTN2 or ../). Support for the
+following DTN2 options should be specified when configuring
+oasys
+
+specify location / support of:
+    
+    Python 
+    tcl                  
+    google perftools
+    expat
+    xerces-c
+    xsd tool
+    Berkeley DB                  
+    mysql 
+    postgres             
+
+compile with or without support for:
+
+    bluetooth 
+    zlib 
+    tclreadline
+    profiling
+    google profiling
+    assembly-based atomic functions
+
+enable or disable:
+
+    oasys debugging
+    oasys memory debugging
+    oasys lock debugging
+    oasys optimization
+
+
+Note - BSP
+--------------------------
+The standard ciphersuites require, amongst other things, 
+an implementation of sha-256 message digest algorithm.
+
+The DTN reference code uses OpenSSL for cryptographic
+and related functions. Unfortunately, some versions of
+OpenSSL do not include sha-256.
+
+The "configure" process checks for the availability of
+sha-256 and provides an error if it is not found.
+
+If your system's OpenSSL does not have sha-256 then you 
+can either upgrade it or build and use a local  version 
+of OpenSSL. OpenSSL can be obtained from
+http://www.openssl.org
+
+OpenSSL 0.9.8 version include sha-256 by default. If your
+system uses version 0.9.7 and you do not wish to upgrade
+then you can enable sha-256 in later versions of 0.9.7,
+such as 0.9.7l and 0.9.7m. To enable sha-256, specify "fips"
+when running "Configure".
+
+If you wish to leave you system installation untouched and
+build against a local version, then configure dtn using
+./configure --with-bsp --with-openssl=/path/to/openssl
+
+Mac OS X note: for Mac OS X users ONLY. If you build dtn
+against a local OpenSSL using "--with-openssl=/path/to/openssl"
+you MUST also specify with it LDFLAGS="-Wl,-search_paths_first". 
+The configuration for OS X users would then be 
+./configure --with-bsp --with-openssl=/path/to/openssl LDFLAGS="-Wl,-search_paths_first"
+Note that the quotes are required for the LDFLAGS argument.
+
diff -r 75810bc10946 -r 9e02c01152bb aclocal.m4
--- a/aclocal.m4	Fri Jul 17 18:27:36 2009 +0100
+++ b/aclocal.m4	Mon Oct 26 16:12:20 2009 -0700
@@ -483,7 +483,26 @@
 dnl Autoconf support for configuring whether Apple's Bonjour stack is 
 dnl available on the system
 dnl
+AC_DEFUN(AC_BONJOUR_HELP, [
+cat <<EOF
 
+Configure error with bonjour...
+
+The default is to try to compile in bonjour support and
+if development headers and libraries are not present
+proceed. You appear to have stated '[$ac_use_bonjour]' 
+when asked whether bonjour support should be enabled
+Can't find the required development headers (dns_sd.h) or 
+function (DNSServiceRegister) in dns_sd of the Avahi 
+Apple Bonjour library. 
+
+
+If you do not want bonjour support at all, you can specify
+--without-bonjour.
+
+
+EOF
+])
 AC_DEFUN(AC_CONFIG_BONJOUR, [
 
     AC_ARG_WITH(bonjour,
@@ -497,16 +516,18 @@
 
     AC_MSG_CHECKING([whether bonjour support should be enabled])
 
-    if test "$ac_use_bonjour" = "no"; then
-        AC_MSG_RESULT(no)
 
-    else
-        AC_MSG_RESULT($ac_use_bonjour)
+	if test "$ac_use_bonjour" = "no"; then
+	AC_MSG_RESULT(no)
+
+	else
+	AC_MSG_RESULT($ac_use_bonjour)
 	
 	dnl look for the library and the header
 	AC_EXTLIB_PREPARE
-        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes)
-        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes)
+	AC_MSG_CHECKING([searching for the bonjour library development headers])
+        AC_CHECK_HEADERS([dns_sd.h], ac_has_bonjour_h=yes, AC_MSG_RESULT(bonjour header not found))
+        AC_SEARCH_LIBS(DNSServiceRegister, dns_sd, ac_has_bonjour_lib=yes, AC_MSG_RESULT(function not found in bonjour library))
 	AC_EXTLIB_SAVE
 
 	dnl print the result
@@ -520,7 +541,8 @@
           AC_MSG_RESULT(no)
 
         else
-          AC_MSG_ERROR([can't find bonjour headers or library])
+	AC_BONJOUR_HELP
+          AC_MSG_ERROR([can't find the required development headers for the Avahi Apple Bonjour library])
         fi
     fi
 ])
@@ -585,7 +607,7 @@
 
     AC_ARG_WITH(dbver,
         AC_HELP_STRING([--with-dbver=VERSION],
-    		   Berkeley DB versions to try (default 4.5-4.2)),
+    		   Berkeley DB versions to try (default 4.7-4.2)),
         ac_dbvers=$withval)
 
     dnl
@@ -1026,8 +1048,8 @@
                        ac_with_cxx=$withval)
     
     if test "x$ac_with_cc" = "x" ; then
-        ac_try_cc="gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
-        ac_try_cxx="g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
+        ac_try_cc="gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
+        ac_try_cxx="g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
     else
         ac_try_cc=$ac_with_cc
 
@@ -1629,13 +1651,17 @@
        AC_DEFINE_UNQUOTED(LIBMYSQLD_ENABLED, 1, 
            [whether the mysql embedded server is enabled])
 
-       AC_SEARCH_LIBS(request_init, wrap, [], 
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for request_init() in libwrap])
+	AC_SEARCH_LIBS(request_init, wrap, [], 
                       AC_MSG_ERROR([can't find request_init() in libwrap]))
-       AC_SEARCH_LIBS(exp, m, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for exp() in libm])
+	AC_SEARCH_LIBS(exp, m, [],
                       AC_MSG_ERROR([can't find exp() in libm]))
-       AC_SEARCH_LIBS(crypt, crypt, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for crypt() in libcrypt])
+	AC_SEARCH_LIBS(crypt, crypt, [],
                       AC_MSG_ERROR([can't find crypt() in libcrypt]))
-       AC_SEARCH_LIBS(compress, z, [],
+	AC_MSG_CHECKING([for mysql external dependencies.: checking for compress() in libz])
+	AC_SEARCH_LIBS(compress, z, [],
                       AC_MSG_ERROR([can't find compress() in libz]))
     fi
 
@@ -1767,6 +1793,39 @@
         AC_MSG_ERROR([can't find usable mysql library])
     fi
 ])
+
+dnl
+dnl Check if oasys has support for the given feature. Returns result
+dnl in ac_oasys_supports_result.
+dnl
+AC_DEFUN(AC_OASYS_SUPPORTS, [
+    AC_MSG_CHECKING(whether oasys is configured with $1)
+
+    if test x$cv_oasys_supports_$1 != x ; then
+        ac_oasys_supports_result=$cv_oasys_supports_$1
+        AC_MSG_RESULT($ac_oasys_supports_result (cached))
+    else
+
+    ac_save_CPPFLAGS="$CPPFLAGS"
+    CPPFLAGS="$CPPFLAGS -I$OASYS_INCDIR"
+    AC_LINK_IFELSE(
+      AC_LANG_PROGRAM(
+        [
+            #include <oasys/oasys-config.h>
+            #ifndef $1
+            #error $1 not configured
+            #endif
+        ], [] ),
+      ac_oasys_supports_result=yes,
+      ac_oasys_supports_result=no)
+
+    cv_oasys_supports_$1=$ac_oasys_supports_result
+    
+    AC_MSG_RESULT([$ac_oasys_supports_result])
+    CPPFLAGS=$ac_save_CPPFLAGS
+
+    fi
+])
 dnl
 dnl    Copyright 2007 Intel Corporation
 dnl 
@@ -1790,7 +1849,7 @@
 
 AC_DEFUN(AC_OASYS_CONFIG_HELP, [
 cat <<EOF
-
+    
 Configure error finding oasys.
 
 This script first looks for an oasys installation in the same location
@@ -1804,6 +1863,11 @@
 If problems still exist, then look in the config.log to see exactly
 what the failing command was.
 
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later) 
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir. 
+You will then probably have to run ./configure and make  
+in the oasys code tree in order to be able to compile DTN2
+
 EOF
 
 ])
@@ -1828,36 +1892,49 @@
 
     ac_oasysdir_ver=`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_base.* | tail -1`
     if test "$ac_oasysdir" = "" ; then
-       if test -d "$ac_oasysdir_ver" ; then
-          ac_oasysdir=$ac_oasysdir_ver
-       elif test -d ../oasys ; then
-          ac_oasysdir=../oasys
-       else
-          ac_oasysdir=/usr
-       fi
+	if test -d "$ac_oasysdir_ver" ; then
+	    ac_oasysdir=$ac_oasysdir_ver
+	elif test -d ../oasys ; then
+	    ac_oasysdir=../oasys
+
+	else
+	    ac_oasysdir=/usr
+	    # Set the oasys paths properly. OASYS_INCDIR points to the parent
+	    # directory containing the oasys header files or the source
+	    # directory itself with a symlink (include/oasys -> .),
+	    # OASYS_LIBDIR points to the directory where the libraries are.
+	    # OASYS_ETCDIR points to where the various scripts are.
+	    #
+	    OASYS_INCDIR="$ac_oasysdir/include"
+	    OASYS_LIBDIR="$ac_oasysdir/lib"
+	    OASYS_ETCDIR="$ac_oasysdir/share/oasys"
+	fi
+    	if test -d oasys ; then
+	    	rm -rf oasys
+	fi
+	    mkdir oasys oasys/include
+	    OASYS_INCDIR="oasys/include/oasys"
+	    OASYS_LIBDIR="oasys/lib"
+	    OASYS_ETCDIR="oasys/share"
+	    ln -s ../../$ac_oasysdir $OASYS_INCDIR
+	    ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
+	    ln -s ../$ac_oasysdir $OASYS_ETCDIR
     fi
 
     #
-    # Set the oasys paths properly. OASYS_INCDIR points to the parent
-    # directory containing the oasys header files or the source
-    # directory itself with a symlink (include/oasys -> .),
-    # OASYS_LIBDIR points to the directory where the libraries are.
-    # OASYS_ETCDIR points to where the various scripts are.
-    #
-    OASYS_INCDIR="$ac_oasysdir/include"
-    OASYS_LIBDIR="$ac_oasysdir/lib"
-    OASYS_ETCDIR="$ac_oasysdir/share/oasys"
-
-    if test ! -d $OASYS_INCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
+    if test ! -d $OASYS_INCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys include directory $OASYS_INCDIR)
     fi
 
-    if test ! -d $OASYS_LIBDIR ; then
-       AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
+    if test ! -d $OASYS_LIBDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys library directory $OASYS_LIBDIR)
     fi
 
-    if test ! -d $OASYS_ETCDIR ; then
-       AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
+    if test ! -d $OASYS_ETCDIR ; then echo ""
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR(nonexistent oasys tools directory $OASYS_ETCDIR)
     fi
 
     if test "$ac_oasysver_major" = "" ; then
@@ -1879,31 +1956,27 @@
     ac_save_LDFLAGS=$LDFLAGS
     LDFLAGS="$LDFLAGS $OASYS_LDFLAGS"
     AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-      [
+	AC_LANG_PROGRAM(
+    [
 	#include <oasys/oasys-version.h>
 	#if (OASYS_VERSION_MAJOR != ${ac_oasysver_major}) || \
             (OASYS_VERSION_MINOR <  ${ac_oasysver_minor})
 	#error incorrect oasys version (wanted ${ac_oasysver_major}.${ac_oasysver_minor})
 	#endif
-      ], 
-      [
-          const char* s = oasys_version;
-	  (void)s;
-      ]),
-      [ 
-          AC_MSG_RESULT($ac_oasysdir)
-      ],
-      [
-          AC_MSG_RESULT([no])
-	  AC_MSG_ERROR([can't find compatible oasys install (version $ac_oasysver_major.$ac_oasysver_minor or better) at $ac_oasysdir])
+    ], 
+    [
+	const char* s = oasys_version;
+	(void)s;
+    ]),
+    [ 
+    AC_MSG_RESULT($ac_oasysdir)
+    ],
+    [
+    AC_MSG_RESULT([no])
+    AC_OASYS_CONFIG_HELP
+    AC_MSG_ERROR([Can't find compatible oasys libraries which are a required for DTN2.]) 
       ])
 
-    #
-    # Create a symlink to the oasys directory for the test scripts
-    #
-    ln -s $ac_oasysdir oasys
-
     CFLAGS=$ac_save_CFLAGS
     LDFLAGS=$ac_save_LDFLAGS
 ])
@@ -1952,39 +2025,6 @@
     AC_SUBST(SYS_EXTLIB_CFLAGS)
     AC_SUBST(SYS_EXTLIB_LDFLAGS)
 ])
-
-dnl
-dnl Check if oasys has support for the given feature. Returns result
-dnl in ac_oasys_supports_result.
-dnl
-AC_DEFUN(AC_OASYS_SUPPORTS, [
-    AC_MSG_CHECKING(whether oasys is configured with $1)
-
-    if test x$cv_oasys_supports_$1 != x ; then
-        ac_oasys_supports_result=$cv_oasys_supports_$1
-        AC_MSG_RESULT($ac_oasys_supports_result (cached))
-    else
-
-    ac_save_CPPFLAGS="$CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS -I$OASYS_INCDIR"
-    AC_LINK_IFELSE(
-      AC_LANG_PROGRAM(
-        [
-            #include <oasys/oasys-config.h>
-            #ifndef $1
-            #error $1 not configured
-            #endif
-        ], [] ),
-      ac_oasys_supports_result=yes,
-      ac_oasys_supports_result=no)
-
-    cv_oasys_supports_$1=$ac_oasys_supports_result
-    
-    AC_MSG_RESULT([$ac_oasys_supports_result])
-    CPPFLAGS=$ac_save_CPPFLAGS
-
-    fi
-])
 dnl
 dnl    Copyright 2005-2006 Intel Corporation
 dnl 
@@ -2477,14 +2517,14 @@
 
     AC_ARG_WITH(tclver,
         AC_HELP_STRING([--with-tclver=VERSION],
-    		   [tcl version to use (default 8.4 or 8.3)]),
+    		   [tcl version to use (default 8.5 - 8.3)]),
         ac_tclvers=$withval)
 
     dnl
     dnl We don't accept --without-tcl
     dnl
     if test $ac_tcldir = no ; then
-       AC_MSG_ERROR([cannot configure without tcl])
+       AC_MSG_ERROR([tcl MUST be installed to configure])
     fi
 
     dnl
@@ -2492,9 +2532,9 @@
     dnl
     AC_EXTLIB_PREPARE
     AC_SEARCH_LIBS(pow, m, [],
-      AC_MSG_ERROR([can't find required library function (pow)]))
+      AC_MSG_ERROR([can't find standard C library function (pow) required by tcl]))
     AC_SEARCH_LIBS(dlopen, dl, [],
-      AC_MSG_ERROR([can't find required library function (dlopen)]))
+      AC_MSG_ERROR([can't find standard library function (dlopen) required by tcl]))
     AC_EXTLIB_SAVE
 
     dnl
@@ -2502,8 +2542,8 @@
     dnl specified something with --with-tcl, in which case we force 
     dnl it to redo the checks (i.e. ignore the cached values).
     dnl
-    if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then
-        echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
+    if test $ac_tcldir = system -a ! x$oasys_cv_path_tcl_h = x ; then \
+	echo "checking for tcl installation... (cached) $oasys_cv_path_tcl_h/tcl.h, $oasys_cv_path_tcl_lib -l$oasys_cv_lib_tcl"
     else
         AC_FIND_TCL
     fi
@@ -2539,9 +2579,9 @@
         ac_tcldir=system
         ac_tclincdirs="/usr/include /usr/local/include"
 	for ac_tclver in $ac_tclvers ; do
-           ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver"
-           ac_tclincdirs="$ac_tclincdirs /usr/local/include/tcl$ac_tclver"
-        done
+           ac_tclincdirs="$ac_tclincdirs /usr/include/tcl$ac_tclver /usr/local/include/tcl$ac_tclver"
+           ac_tclincdirs="$ac_tclincdirs"
+       done
         ac_tcllibdirs="/usr/lib /usr/local/lib"
     else
         ac_tclincdirs=$ac_tcldir/include
@@ -2643,7 +2683,7 @@
     LIBS="$ac_save_LIBS"
 
     if test x$oasys_cv_path_tcl_h = x ; then
-        AC_MSG_ERROR([can't find usable tcl.h])
+        AC_MSG_ERROR([Please install the tcl development files headers and libraries. Can't find usable tcl.h ])
     fi
 ])
 dnl
@@ -2667,20 +2707,50 @@
 dnl
 
 dnl
+dnl help 
+dnl
+AC_DEFUN(AC_TCLRL_HELP, [
+cat <<EOF
+
+Configure error with tclreadline...
+
+If you do not want tclreadline support at all, you can specify
+--without-tclreadline.
+
+Download tclreadline from http://tclreadline.sourceforge.net/
+
+Before trying to compile tclreadline you should do the following things:
+
+    (a) Make sure you have tcl 8.0 or higher.
+        tclreadline relies on a proper tcl installation:
+        It uses the tclConfig.sh file, which should reside somewhere
+        in /usr/local/lib/ or /usr/local/lib/tcl8.0/...
+
+    (b) Make sure you have gnu readline 2.2 or higher.
+        tclreadline uses the gnu readline callback handler
+
+    (c) The usual ./configure; make; make install sequence should do the rest.
+
+
+EOF
+
+])
+dnl
 dnl Main macro for finding a usable db installation 
 dnl
 AC_DEFUN(AC_CONFIG_TCLREADLINE, [
+#ac_tclreadlinedir='system'
+
     AC_ARG_WITH(tclreadline,
         AC_HELP_STRING([--with-tclreadline],
     		   [enable or disable tclreadline (default try)]),
         [ac_tclreadline=$withval],
         [ac_tclreadline=try])
 
-    AC_MSG_CHECKING([whether tclreadline support should be enabled])
-
     dnl
     dnl First make sure we even want it
     dnl
+	AC_MSG_CHECKING([whether tclreadline support should be enabled])
     if test "$ac_tclreadline" = no ; then
     AC_MSG_RESULT([no])
     TCLREADLINE_ENABLED=0
@@ -2702,11 +2772,13 @@
     if test $BUILD_SYSTEM = 'CYGWIN' ; then
         TCLREADLINE_ENABLED=0
     else 
-        AC_EXTLIB_PREPARE
-        AC_SEARCH_LIBS(readline, 
-                       readline, 
-	    	       [TCLREADLINE_ENABLED=1],
-	    	       [TCLREADLINE_ENABLED=0])
+    dnl	
+    dnl look for the library and the header
+    dnl
+	AC_EXTLIB_PREPARE
+        AC_MSG_CHECKING([searching for the readline library development headers])
+        AC_CHECK_HEADERS([readline/readline.h], TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
+	AC_SEARCH_LIBS(readline, readline, TCLREADLINE_ENABLED=1, TCLREADLINE_ENABLED=0)
         AC_EXTLIB_SAVE
     fi
 
@@ -2714,7 +2786,7 @@
     dnl Find out if we're using the BSD libedit implementation of 
     dnl readline functionality.
     dnl
-    if test $TCLREADLINE_ENABLED = 1 ; then
+    if test "$TCLREADLINE_ENABLED" = 1; then
          AC_CACHE_CHECK([whether readline is GNU readline or BSD editline],
 	  	        [oasys_cv_readline_is_editline],
  		        [AC_LINK_IFELSE([AC_LANG_CALL([], [rl_extend_line_buffer])],
@@ -2728,10 +2800,16 @@
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
         AC_MSG_RESULT([yes])
+
     else
+
 	dnl Finally, spit out an informative message
 	AC_MSG_CHECKING([whether tclreadline support was found])
-        AC_MSG_RESULT([no])
+	AC_MSG_RESULT([no])
+	if test "$ac_tclreadline" = yes; then
+	AC_TCLRL_HELP
+	AC_MSG_ERROR([can't find usable tclreadline])
+	fi
     fi
 
     fi # ac_tclreadline != no
@@ -2782,6 +2860,9 @@
     if test "$ac_with_xerces_c" = no; then
         AC_MSG_RESULT([no])
         XERCES_C_ENABLED=0
+	echo ""
+	AC_MSG_NOTICE([Proceeding without xerces-c support as requested])
+	echo ""
     else
 
     dnl
diff -r 75810bc10946 -r 9e02c01152bb configure
--- a/configure	Fri Jul 17 18:27:36 2009 +0100
+++ b/configure	Mon Oct 26 16:12:20 2009 -0700
@@ -2038,8 +2038,8 @@
 
 
     if test "x$ac_with_cc" = "x" ; then
-        ac_try_cc="gcc gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
-        ac_try_cxx="g++ g++-4.0 g++-4.0 g++-3.4 g++-3.3"
+        ac_try_cc="gcc gcc-4.3 gcc-4.2 gcc-4.1 gcc-4.0 gcc-3.4 gcc-3.3"
+        ac_try_cxx="g++ g++-4.3 g++-4.2 g++-4.1 g++-4.0 g++-3.4 g++-3.3"
     else
         ac_try_cc=$ac_with_cc
 
@@ -4109,40 +4109,122 @@
 
     ac_oasysdir_ver=`find .. -maxdepth 1 -type d -name $ac_oasysdir_ver_base.* | tail -1`
     if test "$ac_oasysdir" = "" ; then
-       if test -d "$ac_oasysdir_ver" ; then
-          ac_oasysdir=$ac_oasysdir_ver
-       elif test -d ../oasys ; then
-          ac_oasysdir=../oasys
-       else
-          ac_oasysdir=/usr
-       fi
-    fi
-
-    #
-    # Set the oasys paths properly. OASYS_INCDIR points to the parent
-    # directory containing the oasys header files or the source
-    # directory itself with a symlink (include/oasys -> .),
-    # OASYS_LIBDIR points to the directory where the libraries are.
-    # OASYS_ETCDIR points to where the various scripts are.
-    #
-    OASYS_INCDIR="$ac_oasysdir/include"
-    OASYS_LIBDIR="$ac_oasysdir/lib"
-    OASYS_ETCDIR="$ac_oasysdir/share/oasys"
-
-    if test ! -d $OASYS_INCDIR ; then
-       { { $as_echo "$as_me:$LINENO: error: nonexistent oasys include directory $OASYS_INCDIR" >&5
+	if test -d "$ac_oasysdir_ver" ; then
+	    ac_oasysdir=$ac_oasysdir_ver
+	elif test -d ../oasys ; then
+	    ac_oasysdir=../oasys
+
+	else
+	    ac_oasysdir=/usr
+	    # Set the oasys paths properly. OASYS_INCDIR points to the parent
+	    # directory containing the oasys header files or the source
+	    # directory itself with a symlink (include/oasys -> .),
+	    # OASYS_LIBDIR points to the directory where the libraries are.
+	    # OASYS_ETCDIR points to where the various scripts are.
+	    #
+	    OASYS_INCDIR="$ac_oasysdir/include"
+	    OASYS_LIBDIR="$ac_oasysdir/lib"
+	    OASYS_ETCDIR="$ac_oasysdir/share/oasys"
+	fi
+    	if test -d oasys ; then
+	    	rm -rf oasys
+	fi
+	    mkdir oasys oasys/include
+	    OASYS_INCDIR="oasys/include/oasys"
+	    OASYS_LIBDIR="oasys/lib"
+	    OASYS_ETCDIR="oasys/share"
+	    ln -s ../../$ac_oasysdir $OASYS_INCDIR
+	    ln -s ../$ac_oasysdir/lib $OASYS_LIBDIR
+	    ln -s ../$ac_oasysdir $OASYS_ETCDIR
+    fi
+
+    #
+    if test ! -d $OASYS_INCDIR ; then echo ""
+
+cat <<EOF
+
+Configure error finding oasys.
+
+This script first looks for an oasys installation in the same location
+as the tool that is using the oasys library (where this configure
+script is run from). In other words, it first tries ../oasys.
+
+If ../oasys does not exist, it looks for an oasys installation in
+/usr. If that is not found, you need to specify the location of oasys
+using the --with-oasys argument to configure.
+
+If problems still exist, then look in the config.log to see exactly
+what the failing command was.
+
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
+You will then probably have to run ./configure and make
+in the oasys code tree in order to be able to compile DTN2
+
+EOF
+
+
+    { { $as_echo "$as_me:$LINENO: error: nonexistent oasys include directory $OASYS_INCDIR" >&5
 $as_echo "$as_me: error: nonexistent oasys include directory $OASYS_INCDIR" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-    if test ! -d $OASYS_LIBDIR ; then
-       { { $as_echo "$as_me:$LINENO: error: nonexistent oasys library directory $OASYS_LIBDIR" >&5
+    if test ! -d $OASYS_LIBDIR ; then echo ""
+
+cat <<EOF
+
+Configure error finding oasys.
+
+This script first looks for an oasys installation in the same location
+as the tool that is using the oasys library (where this configure
+script is run from). In other words, it first tries ../oasys.
+
+If ../oasys does not exist, it looks for an oasys installation in
+/usr. If that is not found, you need to specify the location of oasys
+using the --with-oasys argument to configure.
+
+If problems still exist, then look in the config.log to see exactly
+what the failing command was.
+
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
+You will then probably have to run ./configure and make
+in the oasys code tree in order to be able to compile DTN2
+
+EOF
+
+
+    { { $as_echo "$as_me:$LINENO: error: nonexistent oasys library directory $OASYS_LIBDIR" >&5
 $as_echo "$as_me: error: nonexistent oasys library directory $OASYS_LIBDIR" >&2;}
    { (exit 1); exit 1; }; }
     fi
 
-    if test ! -d $OASYS_ETCDIR ; then
-       { { $as_echo "$as_me:$LINENO: error: nonexistent oasys tools directory $OASYS_ETCDIR" >&5
+    if test ! -d $OASYS_ETCDIR ; then echo ""
+
+cat <<EOF
+
+Configure error finding oasys.
+
+This script first looks for an oasys installation in the same location
+as the tool that is using the oasys library (where this configure
+script is run from). In other words, it first tries ../oasys.
+
+If ../oasys does not exist, it looks for an oasys installation in
+/usr. If that is not found, you need to specify the location of oasys
+using the --with-oasys argument to configure.
+
+If problems still exist, then look in the config.log to see exactly
+what the failing command was.
+
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
+You will then probably have to run ./configure and make
+in the oasys code tree in order to be able to compile DTN2
+
+EOF
+
+
+    { { $as_echo "$as_me:$LINENO: error: nonexistent oasys tools directory $OASYS_ETCDIR" >&5
 $as_echo "$as_me: error: nonexistent oasys tools directory $OASYS_ETCDIR" >&2;}
    { (exit 1); exit 1; }; }
     fi
@@ -4225,36 +4307,36 @@
 main ()
 {
 
-          const char* s = oasys_version;
-	  (void)s;
-
-  ;
-  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: $ac_oasysdir" >&5
+	const char* s = oasys_version;
+	(void)s;
+
+  ;
+  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: $ac_oasysdir" >&5
 $as_echo "$ac_oasysdir" >&6; }
 
 else
@@ -4262,22 +4344,41 @@
 sed 's/^/| /' conftest.$ac_ext >&5
 
 
-          { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-	  { { $as_echo "$as_me:$LINENO: error: can't find compatible oasys install (version $ac_oasysver_major.$ac_oasysver_minor or better) at $ac_oasysdir" >&5
-$as_echo "$as_me: error: can't find compatible oasys install (version $ac_oasysver_major.$ac_oasysver_minor or better) at $ac_oasysdir" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-
-    #
-    # Create a symlink to the oasys directory for the test scripts
-    #
-    ln -s $ac_oasysdir oasys
+    { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+cat <<EOF
+
+Configure error finding oasys.
+
+This script first looks for an oasys installation in the same location
+as the tool that is using the oasys library (where this configure
+script is run from). In other words, it first tries ../oasys.
+
+If ../oasys does not exist, it looks for an oasys installation in
+/usr. If that is not found, you need to specify the location of oasys
+using the --with-oasys argument to configure.
+
+If problems still exist, then look in the config.log to see exactly
+what the failing command was.
+
+Download oasys-$ac_oasysver_major.$ac_oasysver_minor (or later)
+from http://dtn.hg.sourceforge.net/hgweb/dtn/oasys to $ac_oasysdir.
+You will then probably have to run ./configure and make
+in the oasys code tree in order to be able to compile DTN2
+
+EOF
+
+
+    { { $as_echo "$as_me:$LINENO: error: Can't find compatible oasys libraries which are a required for DTN2." >&5
+$as_echo "$as_me: error: Can't find compatible oasys libraries which are a required for DTN2." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
 
     CFLAGS=$ac_save_CFLAGS
     LDFLAGS=$ac_save_LDFLAGS
@@ -4768,12 +4869,13 @@
     { $as_echo "$as_me:$LINENO: checking whether bonjour support should be enabled" >&5
 $as_echo_n "checking whether bonjour support should be enabled... " >&6; }
 
-    if test "$ac_use_bonjour" = "no"; then
-        { $as_echo "$as_me:$LINENO: result: no" >&5
-$as_echo "no" >&6; }
-
-    else
-        { $as_echo "$as_me:$LINENO: result: $ac_use_bonjour" >&5
+
+	if test "$ac_use_bonjour" = "no"; then
+	{ $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+
+	else
+	{ $as_echo "$as_me:$LINENO: result: $ac_use_bonjour" >&5
 $as_echo "$ac_use_bonjour" >&6; }
 
 
@@ -4785,6 +4887,8 @@
     LDFLAGS=
     LIBS=
 
+	{ $as_echo "$as_me:$LINENO: checking searching for the bonjour library development headers" >&5
+$as_echo_n "checking searching for the bonjour library development headers... " >&6; }
 
 for ac_header in dns_sd.h
 do
@@ -4927,6 +5031,9 @@
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
  ac_has_bonjour_h=yes
+else
+  { $as_echo "$as_me:$LINENO: result: bonjour header not found" >&5
+$as_echo "bonjour header not found" >&6; }
 fi
 
 done
@@ -5016,6 +5123,9 @@
 if test "$ac_res" != no; then
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
   ac_has_bonjour_lib=yes
+else
+  { $as_echo "$as_me:$LINENO: result: function not found in bonjour library" >&5
+$as_echo "function not found in bonjour library" >&6; }
 fi
 
 
@@ -5052,8 +5162,28 @@
 $as_echo "no" >&6; }
 
         else
-          { { $as_echo "$as_me:$LINENO: error: can't find bonjour headers or library" >&5
-$as_echo "$as_me: error: can't find bonjour headers or library" >&2;}
+
+cat <<EOF
+
+Configure error with bonjour...
+
+The default is to try to compile in bonjour support and
+if development headers and libraries are not present
+proceed. You appear to have stated '$ac_use_bonjour'
+when asked whether bonjour support should be enabled
+Can't find the required development headers (dns_sd.h) or
+function (DNSServiceRegister) in dns_sd of the Avahi
+Apple Bonjour library.
+
+
+If you do not want bonjour support at all, you can specify
+--without-bonjour.
+
+
+EOF
+
+          { { $as_echo "$as_me:$LINENO: error: can't find the required development headers for the Avahi Apple Bonjour library" >&5
+$as_echo "$as_me: error: can't find the required development headers for the Avahi Apple Bonjour library" >&2;}
    { (exit 1); exit 1; }; }
         fi
     fi
@@ -6045,7 +6175,7 @@
 # Output
 # -------------------------------------------------------------------------
 
-INCFLAGS="-I\$(OASYS_INCDIR)/oasys/ext -I\$(SRCDIR)/servlib"
+INCFLAGS="-I\$(OASYS_INCDIR)/ext -I\$(SRCDIR)/servlib"
 
 
 ac_config_files="$ac_config_files Rules.make:$OASYS_ETCDIR/Rules.make.in"
diff -r 75810bc10946 -r 9e02c01152bb configure.ac
--- a/configure.ac	Fri Jul 17 18:27:36 2009 +0100
+++ b/configure.ac	Mon Oct 26 16:12:20 2009 -0700
@@ -134,7 +134,7 @@
 # Output
 # -------------------------------------------------------------------------
 
-INCFLAGS="-I\$(OASYS_INCDIR)/oasys/ext -I\$(SRCDIR)/servlib"
+INCFLAGS="-I\$(OASYS_INCDIR)/ext -I\$(SRCDIR)/servlib"
 AC_SUBST(INCFLAGS)
 
 AC_CONFIG_FILES([Rules.make:$OASYS_ETCDIR/Rules.make.in])
diff -r 75810bc10946 -r 9e02c01152bb debian/changelog
--- a/debian/changelog	Fri Jul 17 18:27:36 2009 +0100
+++ b/debian/changelog	Mon Oct 26 16:12:20 2009 -0700
@@ -1,3 +1,9 @@
+dtn (2.6.0) unstable; urgency=low
+
+  * 2.6.0 release upgrade
+
+ -- Alex McMahon <ailex.mcmahon@cs.tcd.ie>  Fri, 08 May 2009 20:07:09 +0100
+
 dtn (2.5.1-1) unstable; urgency=low
 
   * 2.5.1 release update
diff -r 75810bc10946 -r 9e02c01152bb debian/control
--- a/debian/control	Fri Jul 17 18:27:36 2009 +0100
+++ b/debian/control	Mon Oct 26 16:12:20 2009 -0700
@@ -1,8 +1,8 @@
 Source: dtn
 Section: net
 Priority: optional
-Maintainer: Michael Demmer [demmer@cs.berkeley.edu]
-Build-Depends: liboasys-dev, python, python2.4-dev
+Maintainer: dtn-users mailing list [dtn-users@mailman.dtnrg.org]
+Build-Depends: liboasys-dev, python2.4-dev | python2.5-dev | python2.6-dev | python3.0-dev
 
 
 Package: dtn
diff -r 75810bc10946 -r 9e02c01152bb debian/control.in
--- a/debian/control.in	Fri Jul 17 18:27:36 2009 +0100
+++ b/debian/control.in	Mon Oct 26 16:12:20 2009 -0700
@@ -4,10 +4,10 @@
 Priority: optional
 Architecture: i386
 Essential: no
-Depends: tcl8.4, libdb4.3
+Depends: tcl8.4 tclx8.4-dev tcllib libxerces-c2-dev libdb4.7, tcl8.4 
 Recommends: tclreadline
 Installed-Size: 2048
-Maintainer: Michael Demmer [demmer@cs.berkeley.edu]
+Maintainer: Alex McMahon [alex.mcmahon@cs.tcd.ie]
 Provides: dtnd
 Description: Delay Tolerant Networking reference implementation.
 	     This package includes the Delay Tolerant Networking (DTN)
diff -r 75810bc10946 -r 9e02c01152bb doc/doxyfile
--- a/doc/doxyfile	Fri Jul 17 18:27:36 2009 +0100
+++ b/doc/doxyfile	Mon Oct 26 16:12:20 2009 -0700
@@ -1,4 +1,4 @@
-# Doxyfile 1.3.4
+# Doxyfile 1.5.8
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project
@@ -14,6 +14,14 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
+# This tag specifies the encoding used for all characters in the config file 
+# that follow. The default is UTF-8 which is also the encoding used for all 
+# text before the first occurrence of this tag. Doxygen uses libiconv (or the 
+# iconv built into libc) for the transcoding. See 
+# http://www.gnu.org/software/libiconv for the list of possible encodings.
+
+DOXYFILE_ENCODING      = UTF-8
+
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
 # by quotes) that should identify the project.
 
@@ -32,27 +40,28 @@
 
 OUTPUT_DIRECTORY       = doc/doxygen
 
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
+# 4096 sub-directories (in 2 levels) under the output directory of each output 
+# format and will distribute the generated files over these directories. 
+# Enabling this option can be useful when feeding doxygen a huge amount of 
+# source files, where putting all generated files in the same directory would 
+# otherwise cause performance problems for the file system.
+
+CREATE_SUBDIRS         = NO
+
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
 # documentation generated by doxygen is written. Doxygen will use this 
 # information to generate all constant output in the proper language. 
 # The default language is English, other supported languages are: 
-# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, 
-# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en 
-# (Japanese with English messages), Korean, Norwegian, Polish, Portuguese, 
-# Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish, and Ukrainian.
+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional, 
+# Croatian, Czech, Danish, Dutch, Farsi, Finnish, French, German, Greek, 
+# Hungarian, Italian, Japanese, Japanese-en (Japanese with English messages), 
+# Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian, Polish, 
+# Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak, Slovene, 
+# Spanish, Swedish, and Ukrainian.
 
 OUTPUT_LANGUAGE        = English
 
-# This tag can be used to specify the encoding used in the generated output. 
-# The encoding is not always determined by the language that is chosen, 
-# but also whether or not the output is meant for Windows or non-Windows users. 
-# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
-# forces the Windows encoding (this is the default for the Windows binary), 
-# whereas setting the tag to NO uses a Unix-style encoding (the default for 
-# all platforms other than Windows).
-
-USE_WINDOWS_ENCODING   = NO
-
 # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
 # include brief member descriptions after the members that are listed in 
 # the file and class documentation (similar to JavaDoc). 
@@ -67,16 +76,38 @@
 
 REPEAT_BRIEF           = YES
 
+# This tag implements a quasi-intelligent brief description abbreviator 
+# that is used to form the text in various listings. Each string 
+# in this list, if found as the leading text of the brief description, will be 
+# stripped from the text and the result after processing the whole list, is 
+# used as the annotated text. Otherwise, the brief description is used as-is. 
+# If left blank, the following values are used ("$name" is automatically 
+# replaced with the name of the entity): "The $name class" "The $name widget" 
+# "The $name file" "is" "provides" "specifies" "contains" 
+# "represents" "a" "an" "the"
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
 # Doxygen will generate a detailed section even if there is only a brief 
 # description.
 
 ALWAYS_DETAILED_SEC    = YES
 
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited 
-# members of a class in the documentation of that class as if those members were 
-# ordinary class members. Constructors, destructors and assignment operators of 
-# the base classes will not be shown.
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
+# inherited members of a class in the documentation of that class as if those 
+# members were ordinary class members. Constructors, destructors and assignment 
+# operators of the base classes will not be shown.
 
 INLINE_INHERITED_MEMB  = NO
 
@@ -89,10 +120,21 @@
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
 # only done if one of the specified strings matches the left-hand part of 
-# the path. It is allowed to use relative paths in the argument list.
+# the path. The tag can be used to show relative paths in the file list. 
+# If left blank the directory from which doxygen is run is used as the 
+# path to strip.
 
 STRIP_FROM_PATH        = 
 
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
+# the path mentioned in the documentation of a class, which tells 
+# the reader which header file to include in order to use a class. 
+# If left blank only the name of the header file containing the class 
+# definition is used. Otherwise one should specify the include paths that 
+# are normally passed to the compiler using the -I flag.
+
+STRIP_FROM_INC_PATH    = 
+
 # If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
 # (but less readable) file names. This can be useful is your file systems 
 # doesn't support long names like on DOS, Mac, or CD-ROM.
@@ -102,11 +144,19 @@
 # If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
 # will interpret the first line (until the first dot) of a JavaDoc-style 
 # comment as the brief description. If set to NO, the JavaDoc 
-# comments will behave just like the Qt-style comments (thus requiring an 
-# explict @brief command for a brief description.
+# comments will behave just like regular Qt-style comments 
+# (thus requiring an explicit @brief command for a brief description.)
 
 JAVADOC_AUTOBRIEF      = YES
 
+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will 
+# interpret the first line (until the first dot) of a Qt-style 
+# comment as the brief description. If set to NO, the comments 
+# will behave just like regular Qt-style comments (thus requiring 
+# an explicit \brief command for a brief description.)
+
+QT_AUTOBRIEF           = NO
+
 # The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
 # treat a multi-line C++ special comment block (i.e. a block of //! or /// 
 # comments) as a brief description. This used to be the default behaviour. 
@@ -115,25 +165,17 @@
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
-# will output the detailed description near the top, like JavaDoc.
-# If set to NO, the detailed description appears after the member 
-# documentation.
-
-DETAILS_AT_TOP         = YES
-
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
-# reimplements.
+# re-implements.
 
 INHERIT_DOCS           = YES
 
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
-# tag is set to YES, then doxygen will reuse the documentation of the first 
-# member in the group (if any) for the other members of the group. By default 
-# all members of a group must be documented explicitly.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce 
+# a new page for each member. If set to NO, the documentation of a member will 
+# be part of the file/class/namespace that contains it.
 
-DISTRIBUTE_GROUP_DOC   = YES
+SEPARATE_MEMBER_PAGES  = NO
 
 # The TAB_SIZE tag can be used to set the number of spaces in a tab. 
 # Doxygen uses this value to replace tabs by spaces in code fragments.
@@ -149,20 +191,79 @@
 
 ALIASES                = 
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources 
-# only. Doxygen will then generate output that is more tailored for C. 
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
+# sources only. Doxygen will then generate output that is more tailored for C. 
 # For instance, some of the names that are used will be different. The list 
 # of all members will be omitted, etc.
 
 OPTIMIZE_OUTPUT_FOR_C  = NO
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
-# only. Doxygen will then generate output that is more tailored for Java. 
-# For instance, namespaces will be presented as packages, qualified scopes 
-# will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Java. For instance, namespaces will be presented as packages, qualified 
+# scopes will look different, etc.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran 
+# sources only. Doxygen will then generate output that is more tailored for 
+# Fortran.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL 
+# sources. Doxygen will then generate output that is tailored for 
+# VHDL.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it parses. 
+# With this tag you can assign which parser to use for a given extension. 
+# Doxygen has a built-in mapping, but you can override or extend it using this tag. 
+# The format is ext=language, where ext is a file extension, and language is one of 
+# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP, 
+# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat 
+# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran), 
+# use: inc=Fortran f=C
+
+EXTENSION_MAPPING      = 
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want 
+# to include (a tag file for) the STL sources as input, then you should 
+# set this tag to YES in order to let doxygen match functions declarations and 
+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s. 
+# func(std::string) {}). This also make the inheritance and collaboration 
+# diagrams that involve STL classes more complete and accurate.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to 
+# enable parsing support.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only. 
+# Doxygen will parse them like normal C++ but will assume all classes use public 
+# instead of private inheritance when no explicit protection keyword is present.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate getter 
+# and setter methods for a property. Setting this option to YES (the default) 
+# will make doxygen to replace the get and set methods by a property in the 
+# documentation. This will only work if the methods are indeed getting or 
+# setting a simple type. If this is not the case, or you want to show the 
+# methods anyway, you should set this option to NO.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
+# tag is set to YES, then doxygen will reuse the documentation of the first 
+# member in the group (if any) for the other members of the group. By default 
+# all members of a group must be documented explicitly.
+
+DISTRIBUTE_GROUP_DOC   = YES
+
 # Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
 # the same type (for instance a group of public functions) to be put as a 
 # subgroup of that type (e.g. under the Public Functions section). Set it to 
@@ -171,6 +272,32 @@
 
 SUBGROUPING            = YES
 
+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum 
+# is documented as struct, union, or enum with the name of the typedef. So 
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct 
+# with name TypeT. When disabled the typedef will appear as a member of a file, 
+# namespace, or class. And the struct will be named TypeS. This can typically 
+# be useful for C code in case the coding convention dictates that all compound 
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
+# determine which symbols to keep in memory and which to flush to disk. 
+# When the cache is full, less often used symbols will be written to disk. 
+# For small to medium size projects (<1000 input files) the default value is 
+# probably good enough. For larger projects a too small cache size can cause 
+# doxygen to be busy swapping symbols to and from disk most of the time 
+# causing a significant performance penality. 
+# If the system has enough physical memory increasing the cache will improve the 
+# performance by keeping more symbols in memory. Note that the value works on 
+# a logarithmic scale so increasing the size by one will rougly double the 
+# memory usage. The cache size is given by this formula: 
+# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
+# corresponding to a cache size of 2^16 = 65536 symbols
+
+SYMBOL_CACHE_SIZE      = 0
+
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -198,6 +325,21 @@
 
 EXTRACT_LOCAL_CLASSES  = YES
 
+# This flag is only useful for Objective-C code. When set to YES local 
+# methods, which are defined in the implementation section but not in 
+# the interface are included in the documentation. 
+# If set to NO (the default) only methods in the interface are included.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be 
+# extracted and appear in the documentation as a namespace called 
+# 'anonymous_namespace{file}', where file will be replaced with the base 
+# name of the file that contains the anonymous namespace. By default 
+# anonymous namespace are hidden.
+
+EXTRACT_ANON_NSPACES   = NO
+
 # If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
 # undocumented members of documented classes, files or namespaces. 
 # If set to NO (the default) these members will be included in the 
@@ -238,7 +380,7 @@
 # file names in lower-case letters. If set to YES upper-case letters are also 
 # allowed. This is useful if you have classes or files whose names only differ 
 # in case and if your file system supports case sensitive file names. Windows 
-# users are advised to set this option to NO.
+# and Mac users are advised to set this option to NO.
 
 CASE_SENSE_NAMES       = YES
 
@@ -266,6 +408,29 @@
 
 SORT_MEMBER_DOCS       = YES
 
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
+# brief documentation of file, namespace and class members alphabetically 
+# by member name. If set to NO (the default) the members will appear in 
+# declaration order.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the 
+# hierarchy of group names into alphabetical order. If set to NO (the default) 
+# the group names will appear in their defined order.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
+# sorted by fully-qualified names, including namespaces. If set to 
+# NO (the default), the class list will be sorted only by class name, 
+# not including the namespace part. 
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. 
+# Note: This option applies only to the class list, not to the 
+# alphabetical list.
+
+SORT_BY_SCOPE_NAME     = NO
+
 # The GENERATE_TODOLIST tag can be used to enable (YES) or 
 # disable (NO) the todo list. This list is created by putting \todo 
 # commands in the documentation.
@@ -311,6 +476,43 @@
 
 SHOW_USED_FILES        = YES
 
+# If the sources in your project are distributed over multiple directories 
+# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
+# in the documentation. The default is NO.
+
+SHOW_DIRECTORIES       = NO
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
+# This will remove the Files entry from the Quick Index and from the 
+# Folder Tree View (if specified). The default is YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the 
+# Namespaces page.  This will remove the Namespaces entry from the Quick Index 
+# and from the Folder Tree View (if specified). The default is YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that 
+# doxygen should invoke to get the current version for each file (typically from 
+# the version control system). Doxygen will invoke the program by executing (via 
+# popen()) the command <command> <input-file>, where <command> is the value of 
+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
+# provided by doxygen. Whatever the program writes to standard output 
+# is used as the file version. See the manual for examples.
+
+FILE_VERSION_FILTER    = 
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by 
+# doxygen. The layout file controls the global structure of the generated output files 
+# in an output format independent way. The create the layout file that represents 
+# doxygen's defaults, run doxygen with the -l option. You can optionally specify a 
+# file name after the option, if omitted DoxygenLayout.xml will be used as the name 
+# of the layout file.
+
+LAYOUT_FILE            = 
+
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
@@ -339,10 +541,20 @@
 
 WARN_IF_DOC_ERROR      = YES
 
+# This WARN_NO_PARAMDOC option can be abled to get warnings for 
+# functions that are documented, but have no documentation for their parameters 
+# or return value. If set to NO (the default) doxygen will only warn about 
+# wrong or incomplete parameter documentation, but not about the absence of 
+# documentation.
+
+WARN_NO_PARAMDOC       = NO
+
 # The WARN_FORMAT tag determines the format of the warning messages that 
 # doxygen can produce. The string should contain the $file, $line, and $text 
 # tags, which will be replaced by the file and line number from which the 
-# warning originated and the warning text.
+# warning originated and the warning text. Optionally the format may contain 
+# $version, which will be replaced by the version of the file (if it could 
+# be obtained via FILE_VERSION_FILTER)
 
 WARN_FORMAT            = "$file:$line: $text"
 
@@ -361,16 +573,26 @@
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = .
+INPUT                  = ../oasys/include/oasys
+
+# This tag can be used to specify the character encoding of the source files 
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
+# also the default input encoding. Doxygen uses libiconv (or the iconv built 
+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for 
+# the list of possible encodings.
+
+INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the 
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
-# *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
+# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
+# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = *.h *.cc *.c 
+FILE_PATTERNS          = *.h \
+                         *.cc \
+                         *.c
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 
@@ -382,25 +604,47 @@
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = doc/ ideas/ test/ \
-			 servlib/routing/router.h servlib/routing/router.cc \
-			 servlib/routing/router-custom.h servlib/routing/router-custom.cc \
-			 servlib/conv_layers/clevent.h servlib/conv_layers/clevent.cc \			 
-			 oasys/compat/ oasys/test/ oasys/xsd/ \
-			 oasys/debug/Formatter.cc oasys/debug/vfprintf.c \
-			 oasys/storage/DS.h oasys/storage/DS.cc \
-			 apps/tca_admin/libs/ 
+EXCLUDE                = doc/ \
+                         ideas/ \
+                         test/ \
+                         servlib/routing/router.h \
+                         servlib/routing/router.cc \
+                         servlib/routing/router-custom.h \
+                         servlib/routing/router-custom.cc \
+                         servlib/conv_layers/clevent.h \
+                         servlib/conv_layers/clevent.cc \
+                         oasys/compat/ \
+                         oasys/test/ \
+                         oasys/xsd/ \
+                         oasys/debug/Formatter.cc \
+                         oasys/debug/vfprintf.c \
+                         oasys/storage/DS.h \
+                         oasys/storage/DS.cc \
+                         apps/tca_admin/libs/
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories 
-# that are symbolic links (a Unix filesystem feature) are excluded from the input.
+# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
+# directories that are symbolic links (a Unix filesystem feature) are excluded 
+# from the input.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the 
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
-# certain files from those directories.
+# certain files from those directories. Note that the wildcards are matched 
+# against the file with absolute path, so to exclude all test directories 
+# for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = gdtoa* arith*.h Atomic-*.h
+EXCLUDE_PATTERNS       = gdtoa* \
+                         arith*.h \
+                         Atomic-*.h
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names 
+# (namespaces, classes, functions, etc.) that should be excluded from the 
+# output. The symbol name can be a fully qualified name, a word, or if the 
+# wildcard * is used, a substring. Examples: ANamespace, AClass, 
+# AClass::ANamespace, ANamespace::*Test
+
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
@@ -433,10 +677,20 @@
 # by executing (via popen()) the command <filter> <input-file>, where <filter> 
 # is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
 # input file. Doxygen will then use the output that the filter program writes 
-# to standard output.
+# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
+# ignored.
 
 INPUT_FILTER           = 
 
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
+# basis.  Doxygen will compare the file name with each pattern and apply the 
+# filter if there is a match.  The filters are a list of the form: 
+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
+# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
+# is applied to all files.
+
+FILTER_PATTERNS        = 
+
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
 # INPUT_FILTER) will be used to filter the input files when producing source 
 # files to browse (i.e. when SOURCE_BROWSER is set to YES).
@@ -448,7 +702,9 @@
 #---------------------------------------------------------------------------
 
 # If the SOURCE_BROWSER tag is set to YES then a list of source files will 
-# be generated. Documented entities will be cross-referenced with these sources.
+# be generated. Documented entities will be cross-referenced with these sources. 
+# Note: To get rid of all source code in the generated output, make sure also 
+# VERBATIM_HEADERS is set to NO.
 
 SOURCE_BROWSER         = YES
 
@@ -463,18 +719,33 @@
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
+# If the REFERENCED_BY_RELATION tag is set to YES 
 # then for each documented function all documented 
 # functions referencing it will be listed.
 
 REFERENCED_BY_RELATION = YES
 
-# If the REFERENCES_RELATION tag is set to YES (the default) 
+# If the REFERENCES_RELATION tag is set to YES 
 # then for each documented function all documented entities 
 # called/used by that function will be listed.
 
 REFERENCES_RELATION    = YES
 
+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default) 
+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from 
+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will 
+# link to the source code.  Otherwise they will link to the documentation.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code 
+# will point to the HTML generated by the htags(1) tool instead of doxygen 
+# built-in source browser. The htags tool is part of GNU's global source 
+# tagging system (see http://www.gnu.org/software/global/global.html). You 
+# will need version 4.8.6 or higher.
+
+USE_HTAGS              = NO
+
 # If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
 # will generate a verbatim copy of the header file for each class for 
 # which an include is specified. Set to NO to disable this.
@@ -540,7 +811,9 @@
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
 # fine-tune the look of the HTML output. If the tag is left blank doxygen 
-# will generate a default style sheet
+# will generate a default style sheet. Note that doxygen will try to copy 
+# the style sheet file to the HTML output directory, so don't put your own 
+# stylesheet in the HTML output directory as well, or it will be erased!
 
 HTML_STYLESHEET        = doc/doxygen/style.css
 
@@ -550,9 +823,43 @@
 
 HTML_ALIGN_MEMBERS     = YES
 
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
+# documentation will contain sections that can be hidden and shown after the 
+# page has loaded. For this to work a browser that supports 
+# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox 
+# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files 
+# will be generated that can be used as input for Apple's Xcode 3 
+# integrated development environment, introduced with OSX 10.5 (Leopard). 
+# To create a documentation set, doxygen will generate a Makefile in the 
+# HTML output directory. Running make will produce the docset in that 
+# directory and running "make install" will install the docset in 
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find 
+# it at startup. 
+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
+
+GENERATE_DOCSET        = NO
+
+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the 
+# feed. A documentation feed provides an umbrella under which multiple 
+# documentation sets from a single provider (such as a company or product suite) 
+# can be grouped.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that 
+# should uniquely identify the documentation set bundle. This should be a 
+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen 
+# will append .docset to the name.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
-# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm) 
 # of the generated HTML documentation.
 
 GENERATE_HTMLHELP      = NO
@@ -560,7 +867,7 @@
 # If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
 # be used to specify the file name of the resulting .chm file. You 
 # can add a path in front of the file if the result should not be 
-# written to the html output dir.
+# written to the html output directory.
 
 CHM_FILE               = 
 
@@ -577,6 +884,12 @@
 
 GENERATE_CHI           = NO
 
+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING 
+# is used to encode HtmlHelp index (hhk), content (hhc) and project file 
+# content.
+
+CHM_INDEX_ENCODING     = 
+
 # If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
 # controls whether a binary table of contents is generated (YES) or a 
 # normal table of contents (NO) in the .chm file.
@@ -588,6 +901,55 @@
 
 TOC_EXPAND             = NO
 
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER 
+# are set, an additional index file will be generated that can be used as input for 
+# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated 
+# HTML documentation.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can 
+# be used to specify the file name of the resulting .qch file. 
+# The path specified is relative to the HTML output folder.
+
+QCH_FILE               = 
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#namespace
+
+QHP_NAMESPACE          = 
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating 
+# Qt Help Project output. For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add. 
+# For more information please see 
+# http://doc.trolltech.com/qthelpproject.html#custom-filters
+
+QHP_CUST_FILTER_NAME   = 
+
+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see 
+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">Qt Help Project / Custom Filters</a>.
+
+QHP_CUST_FILTER_ATTRS  = 
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's 
+# filter section matches. 
+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">Qt Help Project / Filter Attributes</a>.
+
+QHP_SECT_FILTER_ATTRS  = 
+
+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can 
+# be used to specify the location of Qt's qhelpgenerator. 
+# If non-empty doxygen will try to run qhelpgenerator on the generated 
+# .qhp file.
+
+QHG_LOCATION           = 
+
 # The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
 # top of each HTML page. The value NO (the default) enables the index and 
 # the value YES disables it.
@@ -599,12 +961,20 @@
 
 ENUM_VALUES_PER_LINE   = 4
 
-# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
-# generated containing a tree-like index structure (just like the one that 
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index 
+# structure should be generated to display hierarchical information. 
+# If the tag value is set to FRAME, a side panel will be generated 
+# containing a tree-like index structure (just like the one that 
 # is generated for HTML Help). For this to work a browser that supports 
 # JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
 # Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
-# probably better off using the HTML help feature.
+# probably better off using the HTML help feature. Other possible values 
+# for this tag are: HIERARCHIES, which will generate the Groups, Directories, 
+# and Class Hierarchy pages using a tree view instead of an ordered list; 
+# ALL, which combines the behavior of FRAME and HIERARCHIES; and NONE, which 
+# disables this behavior completely. For backwards compatibility with previous 
+# releases of Doxygen, the values YES and NO are equivalent to FRAME and NONE 
+# respectively.
 
 GENERATE_TREEVIEW      = YES
 
@@ -614,6 +984,14 @@
 
 TREEVIEW_WIDTH         = 200
 
+# Use this tag to change the font size of Latex formulas included 
+# as images in the HTML documentation. The default is 10. Note that 
+# when you change the font size after a successful doxygen run you need 
+# to manually remove any form_*.png images from the HTML output directory 
+# to force them to be regenerated.
+
+FORMULA_FONTSIZE       = 10
+
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
@@ -695,7 +1073,7 @@
 #---------------------------------------------------------------------------
 
 # If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
-# The RTF output is optimised for Word 97 and may not look very pretty with 
+# The RTF output is optimized for Word 97 and may not look very pretty with 
 # other RTF readers or editors.
 
 GENERATE_RTF           = NO
@@ -722,7 +1100,7 @@
 RTF_HYPERLINKS         = NO
 
 # Load stylesheet definitions from file. Syntax is similar to doxygen's 
-# config file, i.e. a series of assigments. You only have to provide 
+# config file, i.e. a series of assignments. You only have to provide 
 # replacements, missing definitions are set to their default value.
 
 RTF_STYLESHEET_FILE    = 
@@ -766,9 +1144,7 @@
 
 # If the GENERATE_XML tag is set to YES Doxygen will 
 # generate an XML file that captures the structure of 
-# the code including all documentation. Note that this 
-# feature is still experimental and incomplete at the 
-# moment.
+# the code including all documentation.
 
 GENERATE_XML           = NO
 
@@ -790,6 +1166,13 @@
 
 XML_DTD                = 
 
+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
+# dump the program listings (including syntax highlighting 
+# and cross-referencing information) to the XML output. Note that 
+# enabling this will significantly increase the size of the XML output.
+
+XML_PROGRAMLISTING     = YES
+
 #---------------------------------------------------------------------------
 # configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
@@ -854,7 +1237,7 @@
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
 # then the macro expansion is limited to the macros specified with the 
-# PREDEFINED and EXPAND_AS_PREDEFINED tags.
+# PREDEFINED and EXPAND_AS_DEFINED tags.
 
 EXPAND_ONLY_PREDEF     = YES
 
@@ -880,7 +1263,9 @@
 # are defined before the preprocessor is started (similar to the -D option of 
 # gcc). The argument of the tag is a list of macros of the form: name 
 # or name=definition (no spaces). If the definition and the = are 
-# omitted =1 is assumed.
+# omitted =1 is assumed. To prevent a macro definition from being 
+# undefined via #undef or recursively expanded use the := operator 
+# instead of the = operator.
 
 PREDEFINED             = "PRINTFLIKE(x, y)="
 
@@ -894,13 +1279,13 @@
 # If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
 # doxygen's preprocessor will remove all function-like macros that are alone 
 # on a line, have an all uppercase name, and do not end with a semicolon. Such 
-# function macros are typically used for boiler-plate code, and will confuse the 
-# parser if not removed.
+# function macros are typically used for boiler-plate code, and will confuse 
+# the parser if not removed.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to external references   
+# Configuration::additions related to external references   
 #---------------------------------------------------------------------------
 
 # The TAGFILES option can be used to specify one or more tagfiles. 
@@ -912,9 +1297,9 @@
 #   TAGFILES = file1=loc1 "file2 = loc2" ... 
 # where "loc1" and "loc2" can be relative or absolute paths or 
 # URLs. If a location is present for each tag, the installdox tool 
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
+# does not have to be run to correct the links. 
+# Note that each tag file must have a unique name 
+# (where the name does NOT include the path) 
 # If a tag file is not located in the directory in which doxygen 
 # is run, you must also specify the path to the tagfile here.
 
@@ -947,13 +1332,23 @@
 #---------------------------------------------------------------------------
 
 # If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base or 
-# super classes. Setting the tag to NO turns the diagrams off. Note that this 
-# option is superceded by the HAVE_DOT option below. This is only a fallback. It is 
-# recommended to install and use dot, since it yields more powerful graphs.
+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
+# or super classes. Setting the tag to NO turns the diagrams off. Note that 
+# this option is superseded by the HAVE_DOT option below. This is only a 
+# fallback. It is recommended to install and use dot, since it yields more 
+# powerful graphs.
 
 CLASS_DIAGRAMS         = YES
 
+# You can define message sequence charts within doxygen comments using the \msc 
+# command. Doxygen will then run the mscgen tool (see 
+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the 
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where 
+# the mscgen tool resides. If left empty the tool is assumed to be found in the 
+# default search path.
+
+MSCGEN_PATH            = 
+
 # If set to YES, the inheritance and collaboration graphs will hide 
 # inheritance and usage relations if the target is undocumented 
 # or is not a class.
@@ -967,6 +1362,29 @@
 
 HAVE_DOT               = NO
 
+# By default doxygen will write a font called FreeSans.ttf to the output 
+# directory and reference it in all dot files that doxygen generates. This 
+# font does not include all possible unicode characters however, so when you need 
+# these (or just want a differently looking font) you can specify the font name 
+# using DOT_FONTNAME. You need need to make sure dot is able to find the font, 
+# which can be done by putting it in a standard location or by setting the 
+# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
+# containing the font.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
+# The default size is 10pt.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the output directory to look for the 
+# FreeSans.ttf font (which doxygen will put there itself). If you specify a 
+# different font using DOT_FONTNAME you can set the path where dot 
+# can find it using this tag.
+
+DOT_FONTPATH           = 
+
 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
 # indirect inheritance relations. Setting this tag to YES will force the 
@@ -981,8 +1399,13 @@
 
 COLLABORATION_GRAPH    = YES
 
+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
+# will generate a graph for groups, showing the direct groups dependencies
+
+GROUP_GRAPHS           = YES
+
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
-# collaboration diagrams in a style similiar to the OMG's Unified Modeling 
+# collaboration diagrams in a style similar to the OMG's Unified Modeling 
 # Language.
 
 UML_LOOK               = NO
@@ -1006,27 +1429,42 @@
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
-# generate a call dependency graph for every global function or class method. 
-# Note that enabling this option will significantly increase the time of a run. 
-# So in most cases it will be better to enable call graphs for selected 
-# functions only using the \callgraph command.
+# If the CALL_GRAPH and HAVE_DOT options are set to YES then 
+# doxygen will generate a call dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable call graphs 
+# for selected functions only using the \callgraph command.
 
 CALL_GRAPH             = NO
 
+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
+# doxygen will generate a caller dependency graph for every global function 
+# or class method. Note that enabling this option will significantly increase 
+# the time of a run. So in most cases it will be better to enable caller 
+# graphs for selected functions only using the \callergraph command.
+
+CALLER_GRAPH           = NO
+
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will graphical hierarchy of all classes instead of a textual one.
 
 GRAPHICAL_HIERARCHY    = YES
 
+# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
+# then doxygen will show the dependencies a directory has on other directories 
+# in a graphical way. The dependency relations are determined by the #include 
+# relations between the files in the directories.
+
+DIRECTORY_GRAPH        = YES
+
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
-# generated by dot. Possible values are png, jpg, or gif
+# generated by dot. Possible values are png, jpg, or gif 
 # If left blank png will be used.
 
 DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
-# found. If left blank, it is assumed the dot tool can be found on the path.
+# found. If left blank, it is assumed the dot tool can be found in the path.
 
 DOT_PATH               = 
 
@@ -1036,33 +1474,41 @@
 
 DOTFILE_DIRS           = 
 
-# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of 
+# nodes that will be shown in the graph. If the number of nodes in a graph 
+# becomes larger than this value, doxygen will truncate the graph, which is 
+# visualized by representing a node as a red box. Note that doxygen if the 
+# number of direct children of the root node in a graph is already larger than 
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note 
+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
 
-MAX_DOT_GRAPH_WIDTH    = 1024
-
-# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
-# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
-# this value, doxygen will try to truncate the graph, so that it fits within 
-# the specified constraint. Beware that most browsers cannot cope with very 
-# large images.
-
-MAX_DOT_GRAPH_HEIGHT   = 1024
+DOT_GRAPH_MAX_NODES    = 50
 
 # The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
 # graphs generated by dot. A depth value of 3 means that only nodes reachable 
-# from the root by following a path via at most 3 edges will be shown. Nodes that 
-# lay further from the root node will be omitted. Note that setting this option to 
-# 1 or 2 may greatly reduce the computation time needed for large code bases. Also 
-# note that a graph may be further truncated if the graph's image dimensions are 
-# not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH and MAX_DOT_GRAPH_HEIGHT). 
-# If 0 is used for the depth value (the default), the graph is not depth-constrained.
+# from the root by following a path via at most 3 edges will be shown. Nodes 
+# that lay further from the root node will be omitted. Note that setting this 
+# option to 1 or 2 may greatly reduce the computation time needed for large 
+# code bases. Also note that the size of a graph can be further restricted by 
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
+# background. This is disabled by default, because dot on Windows does not 
+# seem to support this out of the box. Warning: Depending on the platform used, 
+# enabling this option may lead to badly anti-aliased labels on the edges of 
+# a graph (i.e. they become hard to read).
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
+# files in one run (i.e. multiple -o and -T options on the command line). This 
+# makes dot run faster, but since only newer versions of dot (>1.8.10) 
+# support this, this feature is disabled by default.
+
+DOT_MULTI_TARGETS      = NO
+
 # If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
 # generate a legend page explaining the meaning of the various boxes and 
 # arrows in the dot generated graphs.
@@ -1076,7 +1522,7 @@
 DOT_CLEANUP            = YES
 
 #---------------------------------------------------------------------------
-# Configuration::addtions related to the search engine   
+# Options related to the search engine
 #---------------------------------------------------------------------------
 
 # The SEARCHENGINE tag specifies whether or not a search engine should be 

--=-b9jDyyNmvIrVlMgIzBjN--



Received: from ch3.sourceforge.net (ch3.sourceforge.net [216.34.181.60]) by maillists.intel-research.net (8.13.8/8.13.8) with ESMTP id n9LIf5Kn006969 for <dtn-users@mailman.dtnrg.org>; Wed, 21 Oct 2009 11:41:06 -0700
Received: from www by b55xhf1.ch3.sourceforge.com with local (Exim 4.69) (envelope-from <noreply@sourceforge.net>) id 1N0g7O-0003wJ-4w; Wed, 21 Oct 2009 18:41:06 +0000
To: noreply@sourceforge.net
From: "SourceForge.net" <noreply@sourceforge.net>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
X-SourceForge-Tracker-unixname: dtn
X-SourceForge-Tracker-trackerid: 630167
X-SourceForge-Tracker-itemid: 2873196
X-SourceForge-Tracker-itemstatus: Deleted
X-SourceForge-Tracker-itemassignee: nobody
X-SourceForge-Tracker-itemupdate-reason: Comment added
X-SourceForge-Tracker-itemupdate-username: amcmahon
Message-Id: <E1N0g7O-0003wJ-4w@b55xhf1.ch3.sourceforge.com>
Date: Wed, 21 Oct 2009 18:41:06 +0000
Subject: [dtn-users] [ dtn-Bugs-2873196 ] Test bug tracker email to dtnusers list -please ignore
X-BeenThere: dtn-users@maillists.intel-research.net
X-Mailman-Version: 2.1.9
Precedence: list
List-Id: dtn-users mailing list <dtn-users.maillists.intel-research.net>
List-Unsubscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=unsubscribe>
List-Archive: <http://maillists.intel-research.net/pipermail/dtn-users>
List-Post: <mailto:dtn-users@maillists.intel-research.net>
List-Help: <mailto:dtn-users-request@maillists.intel-research.net?subject=help>
List-Subscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=subscribe>
X-List-Received-Date: Wed, 21 Oct 2009 18:41:06 -0000

Bugs item #2873196, was opened at 2009-10-06 00:30
Message generated for change (Comment added) made by amcmahon
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=630167&aid=2873196&group_id=101657

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: Convergence layer
Group: v2.6
Status: Deleted
Resolution: Rejected
Priority: 1
Private: Yes
Submitted By: Alex McMahon (amcmahon)
Assigned to: Nobody/Anonymous (nobody)
Summary: Test bug tracker email to dtnusers list -please ignore

Initial Comment:
bug tracker test ..please ignore

----------------------------------------------------------------------

>Comment By: Alex McMahon (amcmahon)
Date: 2009-10-21 19:41

Message:
testing - please ignore

----------------------------------------------------------------------

Comment By: Alex McMahon (amcmahon)
Date: 2009-10-21 19:36

Message:
please ignoe

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=630167&aid=2873196&group_id=101657


Received: from mail-px0-f179.google.com (mail-px0-f179.google.com [209.85.216.179]) by maillists.intel-research.net (8.13.8/8.13.8) with ESMTP id n960kN8u003772; Mon, 5 Oct 2009 17:46:23 -0700
Received: by pxi9 with SMTP id 9so3454287pxi.4 for <multiple recipients>; Mon, 05 Oct 2009 17:46:24 -0700 (PDT)
Received: by 10.140.128.12 with SMTP id a12mr88611rvd.283.1254789984778; Mon, 05 Oct 2009 17:46:24 -0700 (PDT)
Received: from ?10.212.112.157? (bldmz-nat-161-164.berkeley.intel-research.net [12.155.161.164]) by mx.google.com with ESMTPS id 23sm909612pzk.8.2009.10.05.17.46.22 (version=SSLv3 cipher=RC4-MD5); Mon, 05 Oct 2009 17:46:23 -0700 (PDT)
Sender: Alex McMahon <alexmcm@gmail.com>
From: Alex McMahon <alex.mcmahon@cs.tcd.ie>
To: dtn-users mailing list <dtn-users@mailman.dtnrg.org>
In-Reply-To: <1254339384.4628.185.camel@sphere>
References: <B605B577-74C2-4C91-87A2-B0338CAA7FBC@cs.berkeley.edu> <1254339384.4628.185.camel@sphere>
Content-Type: text/plain
Organization: Trinity College Dublin
Date: Mon, 05 Oct 2009 17:46:21 -0700
Message-Id: <1254789981.26151.35.camel@sphere>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.1
Content-Transfer-Encoding: 7bit
Cc: Delay Tolerant Networking Interest List <dtn-interest@mailman.dtnrg.org>
Subject: Re: [dtn-users] dtn on sourceforge - Restructuring work on repositories scheduled for Monday (05/10/09) at 23:00:00 UTC.
X-BeenThere: dtn-users@maillists.intel-research.net
X-Mailman-Version: 2.1.9
Precedence: list
Reply-To: alex.mcmahon@cs.tcd.ie
List-Id: dtn-users mailing list <dtn-users.maillists.intel-research.net>
List-Unsubscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=unsubscribe>
List-Archive: <http://maillists.intel-research.net/pipermail/dtn-users>
List-Post: <mailto:dtn-users@maillists.intel-research.net>
List-Help: <mailto:dtn-users-request@maillists.intel-research.net?subject=help>
List-Subscribe: <http://maillists.intel-research.net/mailman/listinfo/dtn-users>, <mailto:dtn-users-request@maillists.intel-research.net?subject=subscribe>
X-List-Received-Date: Tue, 06 Oct 2009 00:46:23 -0000

The restructuring work is now complete. DTNRG repositories are available
and in a supported configuration by SourceForge. SourceForge
documentation relating to use and administration of the repositories
applies. 

You will want to start pushing and pulling your changes from the new
location and I have updated the relevant wiki pages on
http://www.dtnrg.org accordingly to refer to the new source repository
locations (see http://www.dtnrg.org/wiki/Code) . The access mechanisms
as described in
https://sourceforge.net/apps/trac/sourceforge/wiki/Mercurial#Access now
apply. 


Alex




On Wed, 2009-09-30 at 12:36 -0700, Alex McMahon wrote:
> On 2009-08-13 SourceForge rolled out multiple repository support 
> per-project for Mercurial repositories (https://sourceforge.net/apps/wordpress/sourceforge/2009/08/05/mercurial-multiple-repository-support/ ).
> Consequently some work will have to be done in order to restructure the DTNRG 
> repositories so that they are in a supported configuration by SourceForge 
> and so that the SourceForge documentation relating to use and administration 
> of the repositories applies. 
> 
> The restructuring work will interrupt repository function for a short
> period of time (a suitable evening). After which, you will want to start
> pushing and pulling your changes from the new location. I shall update
> the relevant wiki pages on http://www.dtnrg.org accordingly to refer to
> the new source repository locations. Once completed the access
> mechanisms as described in
> https://sourceforge.net/apps/trac/sourceforge/wiki/Mercurial#Access
> shall apply. For example to clone DTN2 from the new location and where
> "USERNAME" represents your SourceForge.net user account.
> 
> hg clone ssh://USERNAME@dtn.hg.sourceforge.net/hgroot/dtn/DTN2 
> 
> If I do not receive posts to indicate otherwise I shall assume it is OK
> to proceed with restructuring work outlined next Monday (05/10/09) at
> 23:00:00 UTC. The work should take no longer than two hours and I shall
> post an update on completion. At time of transition I shall take the old
> repositories offline and about month later decommission so as to avoid
> confusion.
> 
> If this is not a good time I can reschedule. My apologies for the
> inconvenience in this transition. 
> 
> Alex
> 
> 
> _______________________________________________
> dtn-users mailing list
> dtn-users@maillists.intel-research.net
> http://maillists.intel-research.net/mailman/listinfo/dtn-users