rev 5348 - in trunk/packages/kdetoys/debian: . patches

Modestas Vainius modax-guest at alioth.debian.org
Wed Jan 17 17:46:20 CET 2007


Author: modax-guest
Date: 2007-01-17 17:46:16 +0100 (Wed, 17 Jan 2007)
New Revision: 5348

Removed:
   trunk/packages/kdetoys/debian/patches/01_kweather_stations_from_kde3.5_branch.diff
   trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff
Modified:
   trunk/packages/kdetoys/debian/changelog
   trunk/packages/kdetoys/debian/control
   trunk/packages/kdetoys/debian/patches/98_buildprep.diff
Log:
Update for kdetoys 3.5.6

Modified: trunk/packages/kdetoys/debian/changelog
===================================================================
--- trunk/packages/kdetoys/debian/changelog	2007-01-17 16:36:47 UTC (rev 5347)
+++ trunk/packages/kdetoys/debian/changelog	2007-01-17 16:46:16 UTC (rev 5348)
@@ -1,3 +1,13 @@
+kdetoys (4:3.5.6-1) experimental; urgency=low
+
+  * New upstream release
+
+  +++ Changes by Modestas Vainius:
+  * Remove patches 01, 04. Applied upstream.
+  * Add myself to Uploaders.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Jan 2007 18:16:41 +0200
+
 kdetoys (4:3.5.5-3) unstable; urgency=medium
 
   +++ Changes by Modestas Vainius:

Modified: trunk/packages/kdetoys/debian/control
===================================================================
--- trunk/packages/kdetoys/debian/control	2007-01-17 16:36:47 UTC (rev 5347)
+++ trunk/packages/kdetoys/debian/control	2007-01-17 16:46:16 UTC (rev 5348)
@@ -2,7 +2,7 @@
 Section: kde
 Priority: optional
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>
+Uploaders: Isaac Clerencia <isaac at debian.org>, Pierre Habouzit <madcoder at debian.org>, Christopher Martin <chrsmrtn at debian.org>, Adeodato Simó <dato at net.com.org.es>, Josh Metzler <joshdeb at metzlers.org>, Ana Beatriz Guerrero Lopez <ana at debian.org>, Modestas Vainius <geromanas at mailas.com>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, kdelibs4-dev (>= 4:3.5.5), gawk, gettext, sharutils
 Standards-Version: 3.7.2
 

Deleted: trunk/packages/kdetoys/debian/patches/01_kweather_stations_from_kde3.5_branch.diff

Deleted: trunk/packages/kdetoys/debian/patches/04_kweather_station_selection_bug.diff

Modified: trunk/packages/kdetoys/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdetoys/debian/patches/98_buildprep.diff	2007-01-17 16:36:47 UTC (rev 5347)
+++ trunk/packages/kdetoys/debian/patches/98_buildprep.diff	2007-01-17 16:46:16 UTC (rev 5348)
@@ -3835,44 +3835,6 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
---- aclocal.m4
-+++ aclocal.m4
-@@ -501,6 +501,35 @@
- rmdir .tst 2>/dev/null
- AC_SUBST([am__leading_dot])])
- 
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
- # Check to see how 'make' treats includes.	            -*- Autoconf -*-
- 
- # Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
 --- amor/data/Makefile.in
 +++ amor/data/Makefile.in
 @@ -117,6 +117,7 @@
@@ -3970,6 +3932,15 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
+@@ -703,7 +712,7 @@
+ .NOEXPORT:
+ 
+ #>+ 2
+-KDE_DIST=eyesrc billyrc bonhommerc Makefile.in bsdrc taorc ghostrc blobrc nekorc pingurc tips-en wormrc Makefile.am tuxrc 
++KDE_DIST=eyesrc billyrc bonhommerc bsdrc Makefile.in taorc blobrc ghostrc nekorc pingurc tips-en Makefile.am wormrc tuxrc 
+ 
+ #>+ 2
+ docs-am:
 --- amor/data/pics/animated/blob/Makefile.in
 +++ amor/data/pics/animated/blob/Makefile.in
 @@ -101,6 +101,7 @@
@@ -4072,7 +4043,7 @@
  
  #>+ 2
 -KDE_DIST=blob_r225.png blob_s3.png blob_gl1.png blob_l_jet3.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_fire11.png blob_f3.png blob_sl3.png blob_ex1.png blob_BeamUp7.png blob_jet4.png blob_BeamUp1.png blob_BeamDown7.png blob_fire3.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_l_turn3.png blob_l_turn1.png blob_fire4.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_BeamUp3.png blob_fire6.png blob_fire9.png blob_r180.png blob_h3.png blob_l_turn4.png blob_BeamUp2.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_f1.png blob_r135.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_f2.png blob_BeamUp9.png blob_BeamDown9.png blob_l_jet2.png blob_BeamDown5.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png Makefile.am blob_BeamDown1.png blob_fire10.png blob_gl3.png blob_l_jet4.png 
-+KDE_DIST=blob_s3.png blob_r225.png blob_gl1.png blob_l_jet3.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_f3.png blob_fire11.png blob_sl3.png blob_BeamUp7.png blob_ex1.png blob_jet4.png blob_BeamUp1.png blob_fire3.png blob_BeamDown7.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_fire4.png blob_l_turn3.png blob_l_turn1.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_BeamUp3.png blob_fire9.png blob_fire6.png blob_r180.png blob_h3.png blob_BeamUp2.png blob_l_turn4.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_sl4.png blob_l_jet1.png blob_BeamDown3.png blob_r135.png blob_f1.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_BeamUp9.png blob_f2.png blob_BeamDown9.png blob_BeamDown5.png blob_l_jet2.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png blob_BeamDown1.png Makefile.am blob_fire10.png blob_l_jet4.png blob_gl3.png 
++KDE_DIST=blob_l_jet3.png blob_r225.png blob_s3.png blob_gl1.png blob_BeamUp6.png blob_fire8.png blob_z1.png blob_BeamUp8.png blob_f3.png blob_sl3.png blob_fire11.png blob_BeamUp7.png blob_ex1.png blob_jet4.png blob_BeamUp1.png blob_BeamDown7.png blob_fire3.png blob_e1.png blob_BeamDown4.png blob_r315.png blob_r_turn1.png blob_BeamUp10.png blob_l_turn3.png blob_l_turn1.png blob_fire4.png blob_z3.png blob_h1.png blob_jet2.png blob_g2.png blob_gl2.png blob_fire9.png blob_BeamUp3.png blob_fire6.png blob_r180.png blob_h3.png blob_BeamUp2.png blob_l_turn4.png blob_BeamDown2.png blob_z2.png blob_r_turn3.png blob_g1.png blob_r45.png blob_l_jet1.png blob_sl4.png blob_BeamDown3.png blob_r135.png blob_f1.png blob_sl2.png blob_r270.png blob_BeamUp4.png blob_b1.png blob_r_turn4.png blob_s1.png blob_fire5.png blob_BeamUp5.png blob_fire2.png blob_BeamUp9.png blob_f2.png blob_BeamDown9.png blob_BeamDown5.png blob_l_jet2.png blob_fire7.png blob_r90.png blob_jet1.png Makefile.in blob_BeamDown6.png blob_sl1.png blob_l_turn2.png blob_b2.png blob_s2.png blob_BeamDown8.png blob_r_turn2.png blob_h2.png blob_jet3.png blob.png Makefile.am blob_BeamDown1.png blob_fire10.png blob_gl3.png blob_l_jet4.png 
  
  #>+ 2
  docs-am:
@@ -4178,7 +4149,7 @@
  
  #>+ 2
 -KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png b4.png bpof1.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bdrib6.png bpof4.png bgo7.png 
-+KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png bpof6.png bpof1.png b4.png bdrib7.png b4-r.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png Makefile.in sa2.png bgo4.png b1-r.png bgo1.png Makefile.am bdrib6.png bgo7.png bpof4.png 
++KDE_DIST=b-f.png bdrib4.png bpof5.png b-f2.png b3-r.png bgo3.png bh1.png bpof2.png b2.png bgo6.png bgo5.png bdrop.png bcol1.png b4.png bpof6.png bpof1.png b4-r.png bdrib7.png bdrib3.png salut.png sa1.png bdrib5.png b3.png bdrib1.png bpof3.png bgo2.png b1.png salut1.png sa2b.png bcol2.png b2-r.png bdrib2.png sa2c.png sa2a.png sa2.png Makefile.in bgo4.png b1-r.png bgo1.png Makefile.am bgo7.png bdrib6.png bpof4.png 
  
  #>+ 2
  docs-am:
@@ -4284,7 +4255,7 @@
  
  #>+ 2
 -KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_d.png eye_z2.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_s3.png eye_1.png eye_s2.png eye_z5.png Makefile.am eye_m1.png 
-+KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_z2.png eye_d.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_m5.png eye_l.png eye_m3.png Makefile.in eye_m4.png eye_1.png eye_s3.png eye_s2.png eye_z5.png Makefile.am eye_m1.png 
++KDE_DIST=eye_z1.png eye_h2.png eye_z3.png eye_m2.png eye_z4.png eye_2.png eye_z2.png eye_d.png eye_s1.png eye_m7.png eye_m6.png eye_u.png eye_b.png eye_h4.png eye_e.png eye_s4.png eye_h3.png eye_h1.png eye_l.png eye_m5.png eye_m3.png Makefile.in eye_m4.png eye_s3.png eye_1.png eye_s2.png eye_z5.png Makefile.am eye_m1.png 
  
  #>+ 2
  docs-am:
@@ -4584,7 +4555,7 @@
  
  #>+ 2
 -KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png run3.png jumpl2.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am run1.png sit.png 
-+KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png jumpl2.png run3.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am run1.png sit.png 
++KDE_DIST=run2.png claw2.png jump4.png jump1.png scratch4.png yawn.png lick2.png jump2.png surprise.png scratch2.png scratch1.png jumpl2.png run3.png run4.png jumpl4.png sleep2.png sleep1.png claw1.png jumpl1.png scratch3.png jump3.png lick.png Makefile.in tail.png sitleft.png jumpl3.png Makefile.am sit.png run1.png 
  
  #>+ 2
  docs-am:
@@ -4690,7 +4661,7 @@
  
  #>+ 2
 -KDE_DIST=walk_l4.png bash_r2.png walk_r1.png digger2.png floater7.png floater3.png bash_l3.png blocker1.png bash_r7.png bash_r3.png tumble7.png walk_l1.png bash_l5.png faller5.png digger1.png bomber7.png floater5.png walk_l5.png blocker4.png blocker2.png bomber16.png faller4.png bash_l4.png bash_r11.png walk_l3.png walk_r6.png bash_r9.png bash_r5.png tumble6.png bash_l1.png floater1.png bomber11.png tumble5.png digger9.png walk_l7.png bomber6.png bash_r12.png bash_l10.png bash_r10.png tumble3.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png bash_l9.png digger10.png blocker6.png tumble1.png bash_l2.png bomber10.png bash_l11.png bash_l8.png digger12.png walk_r5.png digger11.png bomber12.png digger4.png floater2.png bash_l12.png floater4.png bomber2.png floater8.png faller6.png bash_r6.png walk_r4.png bomber14.png digger5.png bomber5.png bomber3.png bash_r1.png walk_l6.png digger7.png faller7.png digger8.png bomber4.png digger3.png digger13.png digger6.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png digger14.png bomber1.png tumble4.png bash_l6.png faller2.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png 
-+KDE_DIST=bash_r2.png walk_l4.png walk_r1.png digger2.png floater7.png floater3.png blocker1.png bash_l3.png bash_r7.png bash_r3.png tumble7.png walk_l1.png faller5.png bash_l5.png bomber7.png floater5.png digger1.png blocker4.png walk_l5.png blocker2.png bomber16.png faller4.png bash_r11.png walk_r6.png walk_l3.png bash_l4.png bash_r9.png bash_r5.png tumble6.png floater1.png bash_l1.png bomber11.png tumble5.png digger9.png bomber6.png walk_l7.png bash_r12.png bash_l10.png tumble3.png bash_r10.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png blocker6.png bash_l9.png digger10.png tumble1.png bomber10.png bash_l2.png bash_l11.png walk_r5.png bash_l8.png digger12.png digger11.png bomber12.png floater2.png digger4.png floater4.png bash_l12.png bomber2.png floater8.png faller6.png walk_r4.png bash_r6.png bomber14.png bomber5.png bomber3.png digger5.png bash_r1.png walk_l6.png digger7.png faller7.png bomber4.png digger8.png digger3.png digger13.png digger6.png faller1.png walk_r3.png Makefile.in bash_r4.png bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png bomber1.png digger14.png tumble4.png faller2.png bash_l6.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png 
++KDE_DIST=bash_r2.png walk_l4.png walk_r1.png digger2.png floater7.png floater3.png blocker1.png bash_l3.png bash_r7.png bash_r3.png tumble7.png walk_l1.png faller5.png bash_l5.png floater5.png bomber7.png digger1.png walk_l5.png blocker4.png blocker2.png bomber16.png faller4.png bash_l4.png walk_r6.png bash_r11.png walk_l3.png tumble6.png bash_r9.png bash_r5.png floater1.png bash_l1.png bomber11.png tumble5.png digger9.png walk_l7.png bomber6.png bash_l10.png bash_r12.png tumble3.png bash_r10.png walk_l2.png walk_l8.png floater6.png tumble8.png bash_r8.png bomber15.png blocker6.png digger10.png bash_l9.png tumble1.png bash_l2.png bomber10.png bash_l11.png bash_l8.png walk_r5.png digger12.png digger11.png bomber12.png digger4.png floater2.png floater4.png bash_l12.png bomber2.png floater8.png walk_r4.png faller6.png bash_r6.png bomber14.png digger5.png bomber5.png bomber3.png bash_r1.png walk_l6.png digger7.png faller7.png digger8.png bomber4.png digger3.png digger6.png digger13.png faller1.png walk_r3.png bash_r4.png Makefile.in bomber13.png bomber9.png faller3.png bomber8.png tumble2.png walk_r2.png tumble4.png digger14.png bomber1.png bash_l6.png faller2.png walk_r7.png faller8.png walk_r8.png bash_l7.png Makefile.am blocker3.png blocker5.png 
  
  #>+ 2
  docs-am:
@@ -4796,7 +4767,7 @@
  
  #>+ 2
 -KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yyx6.png yy195.png yyx18.png yy-3.png yy45.png yyx22.png yy-5.png yyx14.png yy90.png yyx26.png yy270.png yyx28.png yy-6.png yy.png yy210.png yy-2.png yy285.png yy105.png yy300.png yy-1.png yy15.png yyx16.png yyx30.png yy150.png yy-7.png yy315.png yyx8.png yyx12.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png 
-+KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yy195.png yyx6.png yyx18.png yy-3.png yy45.png yyx22.png yyx14.png yy-5.png yy90.png yyx26.png yy.png yyx28.png yy270.png yy-6.png yy210.png yy-2.png yy285.png yy300.png yy105.png yy-1.png yyx16.png yy15.png yyx30.png yy150.png yy-7.png yyx12.png yy315.png yyx8.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yyx20.png yy240.png Makefile.am yy165.png 
++KDE_DIST=yy-9.png yy-4.png yy135.png yy330.png yy120.png yy180.png yyx24.png yy-8.png yy195.png yyx6.png yyx18.png yy-3.png yy45.png yyx22.png yy-5.png yyx14.png yy90.png yyx26.png yyx28.png yy.png yy270.png yy-6.png yy210.png yy-2.png yy285.png yy300.png yy105.png yy-1.png yyx16.png yy15.png yyx30.png yy150.png yy-7.png yyx8.png yyx12.png yy315.png yy30.png Makefile.in yy60.png yy255.png yy75.png yy225.png yyx10.png yy345.png yy240.png yyx20.png Makefile.am yy165.png 
  
  #>+ 2
  docs-am:
@@ -4902,7 +4873,7 @@
  
  #>+ 2
 -KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-dr1.png w-d3.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-be3.png w-b2.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png Makefile.am w-a1.png 
-+KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-d3.png w-dr1.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-b2.png w-be3.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-u1.png w-ml3.png w-s1.png w-ml0.png w-ml1.png w-l1.png w-be2.png w-ml2.png w-a1.png Makefile.am 
++KDE_DIST=w-s2.png w-u2.png w-mr0.png w-wr2.png w-mr1.png w-mr3.png w-u3.png w-d3.png w-dr1.png w-l3.png w-mr2.png w-d4.png w-s3.png w-be4.png w-d5.png w-wl2.png w-a2.png w-wr1.png w-d1.png w-be1.png w-wl1.png w-b2.png w-be3.png w-b1.png w-l2.png w-e1.png Makefile.in w-d2.png w-ml3.png w-u1.png w-ml0.png w-s1.png w-ml1.png w-l1.png w-be2.png w-ml2.png w-a1.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -5319,7 +5290,7 @@
  
  #>+ 3
  amordialog.moc: $(srcdir)/amordialog.h
-@@ -901,10 +910,10 @@
+@@ -901,7 +910,7 @@
  
  #>+ 3
  clean-metasources:
@@ -5327,35 +5298,28 @@
 +	-rm -f  amor.moc amorwidget.moc amordialog.moc amorbubble.moc
  
  #>+ 2
--KDE_DIST=hi22-app-amor.png Makefile.in hi16-app-amor.png preparetips hi48-app-amor.png amor.desktop hi32-app-amor.png version.h configure.in.in Makefile.am 
-+KDE_DIST=hi22-app-amor.png Makefile.in hi16-app-amor.png preparetips hi48-app-amor.png hi32-app-amor.png amor.desktop version.h configure.in.in Makefile.am 
- 
- #>+ 4
- clean-idl:
+ KDE_DIST=hi22-app-amor.png Makefile.in hi16-app-amor.png preparetips hi48-app-amor.png amor.desktop hi32-app-amor.png version.h configure.in.in Makefile.am 
 @@ -916,20 +925,20 @@
  
  #>+ 16
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+-	$(INSTALL_DATA) $(srcdir)/hi22-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amor.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
++	$(INSTALL_DATA) $(srcdir)/hi22-app-amor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/amor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/amor.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/amor.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/amor.png
  
  #>+ 15
  force-reedit:
@@ -5410,11 +5374,11 @@
  /* Define to 1 if you have the ANSI C header files. */
 --- configure
 +++ configure
-@@ -1,8 +1,9 @@
+@@ -1,25 +1,54 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.59.
-+# Generated by GNU Autoconf 2.60a.
++# Generated by GNU Autoconf 2.61.
  #
 -# Copyright (C) 2003 Free Software Foundation, Inc.
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -5422,7 +5386,15 @@
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
  ## --------------------- ##
-@@ -16,11 +17,35 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -5430,12 +5402,15 @@
 -  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
++fi
++
++
++
++
 +# PATH needs CR
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -5455,12 +5430,12 @@
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
-+fi
-+
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -29,8 +54,43 @@
+@@ -29,8 +58,43 @@
  fi
  
  
@@ -5505,7 +5480,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -44,18 +104,19 @@
+@@ -44,18 +108,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -5528,7 +5503,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +124,386 @@
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -5677,8 +5652,7 @@
 +else
 +  as_candidate_shells=
      as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+ for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
  do
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
@@ -5699,7 +5673,6 @@
 +	 # Try only shells that exist, to save several forks.
 +	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -5708,18 +5681,19 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
 +
++
 +:
 +_ASEOF
 +}; then
 +  CONFIG_SHELL=$as_shell
 +	       as_have_required=yes
 +	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -5728,11 +5702,13 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
 +
++
 +:
 +(as_func_return () {
 +  (exit $1)
@@ -6014,28 +5990,37 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -222,7 +512,19 @@
+@@ -222,7 +518,28 @@
    as_mkdir_p=false
  fi
  
 -as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
 +else
-+  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
 +fi
-+rm -f conf$$.file
++as_executable_p=$as_test_x
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -231,15 +533,6 @@
+@@ -231,15 +548,6 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -6051,7 +6036,7 @@
  
  
  # Check that we are running under the correct shell.
-@@ -278,15 +571,15 @@
+@@ -278,15 +586,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -6070,7 +6055,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -395,29 +688,26 @@
+@@ -395,29 +703,26 @@
  
  tagnames=${tagnames+${tagnames},}F77
  
@@ -6104,7 +6089,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -430,42 +720,324 @@
+@@ -430,42 +735,325 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -6430,6 +6415,7 @@
 +CC
 +CFLAGS
 +LDFLAGS
++LIBS
 +CPPFLAGS
 +CPP
 +CXX
@@ -6443,7 +6429,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -492,34 +1064,48 @@
+@@ -492,34 +1080,48 @@
  # and all the variables that are supposed to be based on exec_prefix
  # by default will actually change.
  # Use braces instead of parens because sh, perl, etc. also accept them.
@@ -6499,7 +6485,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -541,12 +1127,18 @@
+@@ -541,33 +1143,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -6521,11 +6507,13 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -554,7 +1146,17 @@
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    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=`echo $ac_feature | sed 's/-/_/g'`
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 -    eval "enable_$ac_feature=no" ;;
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=no ;;
 +
 +  -docdir | --docdir | --docdi | --doc | --do)
@@ -6540,20 +6528,23 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1165,7 @@
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    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=`echo $ac_feature | sed 's/-/_/g'`
+-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
 -    case $ac_option in
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 -    esac
 -    eval "enable_$ac_feature='$ac_optarg'" ;;
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -594,6 +1192,12 @@
+@@ -594,6 +1208,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -6566,7 +6557,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -618,13 +1222,16 @@
+@@ -618,13 +1238,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -6587,7 +6578,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1296,16 @@
+@@ -689,6 +1312,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -6604,29 +6595,38 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -745,11 +1362,7 @@
+@@ -741,24 +1374,20 @@
+   -with-* | --with-*)
+     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    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=`echo $ac_package| sed 's/-/_/g'`
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
 -    case $ac_option in
 -      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
 -      *) ac_optarg=yes ;;
 -    esac
 -    eval "with_$ac_package='$ac_optarg'" ;;
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=\$ac_optarg ;;
  
    -without-* | --without-*)
      ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-@@ -758,7 +1371,7 @@
+     # Reject names that are not valid shell variable names.
+-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    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=`echo $ac_package | sed 's/-/_/g'`
+-    ac_package=`echo $ac_package | sed 's/-/_/g'`
 -    eval "with_$ac_package=no" ;;
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=no ;;
  
    --x)
      # Obsolete; use --with-x.
-@@ -789,8 +1402,7 @@
+@@ -789,8 +1418,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -6636,7 +6636,7 @@
      export $ac_envvar ;;
  
    *)
-@@ -810,27 +1422,19 @@
+@@ -810,27 +1438,19 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -6674,7 +6674,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1461,76 @@
+@@ -857,94 +1477,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -6826,7 +6826,7 @@
  
  #
  # Report the --help message.
-@@ -973,9 +1559,6 @@
+@@ -973,9 +1575,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -6836,7 +6836,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -993,15 +1576,22 @@
+@@ -993,15 +1592,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -6862,7 +6862,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1025,6 +1615,8 @@
+@@ -1025,6 +1631,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -6871,7 +6871,7 @@
    --disable-fast-perl     disable fast Makefile generation (needs perl)
    --enable-debug=ARG      enables debug symbols (yes|no|full) default=no
    --disable-debug         disables debug output and debug symbols default=no
-@@ -1042,10 +1634,8 @@
+@@ -1042,10 +1650,8 @@
                            of memory)
    --enable-closure        delay template instantiation
    --enable-nmcheck        enable automatic namespace cleanness check
@@ -6884,7 +6884,7 @@
    --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
-@@ -1067,8 +1657,7 @@
+@@ -1067,8 +1673,7 @@
    --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    --with-pic              try to use only PIC/non-PIC objects [default=use
                            both]
@@ -6894,12 +6894,13 @@
    --with-extra-includes=DIR
                            adds non standard include paths
    --with-extra-libs=DIR   adds non standard library paths
-@@ -1082,131 +1671,100 @@
+@@ -1082,131 +1687,101 @@
    CFLAGS      C compiler flags
    LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
                nonstandard directory <lib dir>
 -  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
 -              headers in a nonstandard directory <include dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
 +  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
    CPP         C preprocessor
@@ -6965,8 +6966,15 @@
 -  *) # Relative path.
 -    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
 -    ac_top_srcdir=$ac_top_builddir$srcdir ;;
--esac
--
++    ac_top_srcdir=$srcdir
++    ac_abs_top_srcdir=$srcdir ;;
++  *) # Relative name.
++    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
++    ac_top_srcdir=$ac_top_build_prefix$srcdir
++    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+ esac
++ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+ 
 -# Do not use `cd foo && pwd` to compute absolute paths, because
 -# the directories may not exist.
 -case `pwd` in
@@ -7004,15 +7012,8 @@
 -  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
 -  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
 -  esac;;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
- esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
- 
+-esac
+-
 -    cd $ac_dir
 -    # Check for guested configure; otherwise get Cygnus style configure.
 -    if test -f $ac_srcdir/configure.gnu; then
@@ -7047,7 +7048,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.60a
++generated by GNU Autoconf 2.61
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -7066,7 +7067,7 @@
  
  It was created by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
  
    $ $0 $@
  
@@ -7075,7 +7076,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1225,7 +1783,7 @@
+@@ -1225,7 +1800,7 @@
  /bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
  /usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
  /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
@@ -7084,7 +7085,7 @@
  /bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
  /usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
  /bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-@@ -1239,6 +1797,7 @@
+@@ -1239,6 +1814,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -7092,7 +7093,7 @@
  
  } >&5
  
-@@ -1260,7 +1819,6 @@
+@@ -1260,7 +1836,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -7100,7 +7101,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1271,7 +1829,7 @@
+@@ -1271,7 +1846,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -7109,7 +7110,7 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1293,9 +1851,7 @@
+@@ -1293,9 +1868,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -7120,7 +7121,7 @@
        ;;
      esac
    done
-@@ -1306,8 +1862,8 @@
+@@ -1306,8 +1879,8 @@
  # When interrupted or exit'd, cleanup temporary files, and complete
  # config.log.  We remove comments because anyway the quotes in there
  # would cause problems or look ugly.
@@ -7131,7 +7132,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1320,20 +1876,34 @@
+@@ -1320,20 +1893,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -7176,7 +7177,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1344,22 +1914,28 @@
+@@ -1344,22 +1931,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -7212,7 +7213,7 @@
        done | sort
        echo
      fi
-@@ -1371,26 +1947,24 @@
+@@ -1371,26 +1964,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -7244,7 +7245,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1421,14 +1995,17 @@
+@@ -1421,14 +2012,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -7269,7 +7270,7 @@
    if test -r "$ac_site_file"; then
      { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  echo "$as_me: loading site script $ac_site_file" >&6;}
-@@ -1444,8 +2021,8 @@
+@@ -1444,8 +2038,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -7280,7 +7281,7 @@
      esac
    fi
  else
-@@ -1457,12 +2034,11 @@
+@@ -1457,12 +2051,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -7296,7 +7297,7 @@
    case $ac_old_set,$ac_new_set in
      set,)
        { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-@@ -1487,8 +2063,7 @@
+@@ -1487,8 +2080,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -7306,7 +7307,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1505,12 +2080,6 @@
+@@ -1505,12 +2097,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -7319,7 +7320,7 @@
  
  
  
-@@ -1527,110 +2096,165 @@
+@@ -1527,110 +2113,165 @@
  
  
  
@@ -7537,7 +7538,7 @@
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1640,17 +2264,17 @@
+@@ -1640,17 +2281,17 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  test "$program_prefix" != NONE &&
@@ -7558,7 +7559,7 @@
  
  
  am__api_version="1.9"
-@@ -1672,8 +2296,8 @@
+@@ -1672,8 +2313,8 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -7569,16 +7570,16 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1695,7 +2319,7 @@
+@@ -1695,7 +2336,7 @@
      # by default.
      for ac_prog in ginstall scoinst install; do
        for ac_exec_ext in '' $ac_executable_extensions; do
 -	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  	  if test $ac_prog = install &&
  	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
-@@ -1714,21 +2338,22 @@
+@@ -1714,21 +2355,22 @@
      ;;
  esac
  done
@@ -7606,7 +7607,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1742,8 +2367,8 @@
+@@ -1742,8 +2384,8 @@
    if test -z "$kde_save_INSTALL_given" ; then
      # OK, user hasn't given any INSTALL, autoconf found one for us
      # now we test, if it supports the -p flag
@@ -7617,7 +7618,7 @@
      rm -f confinst.$$.* > /dev/null 2>&1
      echo "Testtest" > confinst.$$.orig
      ac_res=no
-@@ -1755,8 +2380,8 @@
+@@ -1755,8 +2397,8 @@
        fi
      fi
      rm -f confinst.$$.*
@@ -7628,7 +7629,7 @@
    fi
  
    if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1766,8 +2391,8 @@
+@@ -1766,8 +2408,8 @@
      INSTALL_SCRIPT='${INSTALL}'
    fi
  
@@ -7639,7 +7640,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1809,8 +2434,8 @@
+@@ -1809,8 +2451,8 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -7650,7 +7651,7 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
-@@ -1861,8 +2486,8 @@
+@@ -1861,8 +2503,8 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -7661,12 +7662,12 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1875,54 +2500,57 @@
+@@ -1875,54 +2517,57 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AWK="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -7740,7 +7741,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1993,8 +2621,8 @@
+@@ -1993,8 +2638,8 @@
    if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -7751,12 +7752,12 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2007,32 +2635,34 @@
+@@ -2007,32 +2652,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -7793,12 +7794,12 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2045,27 +2675,41 @@
+@@ -2045,27 +2692,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -7842,7 +7843,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2085,6 +2729,31 @@
+@@ -2085,6 +2746,31 @@
  
  
  
@@ -7874,7 +7875,7 @@
  
    unset CDPATH
  
-@@ -2103,14 +2772,14 @@
+@@ -2103,14 +2789,14 @@
  
    if test "x$prefix" = "xNONE"; then
  
@@ -7892,7 +7893,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2153,8 +2822,8 @@
+@@ -2153,8 +2839,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -7903,7 +7904,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2165,8 +2834,8 @@
+@@ -2165,8 +2851,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -7914,7 +7915,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2175,14 +2844,14 @@
+@@ -2175,14 +2861,14 @@
          kde_save_PATH="$PATH"
      PATH="$exec_prefix/bin:$prefix/bin:$PATH"
  
@@ -7932,7 +7933,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2225,8 +2894,8 @@
+@@ -2225,8 +2911,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -7943,7 +7944,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2237,8 +2906,8 @@
+@@ -2237,8 +2923,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -7954,7 +7955,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2260,16 +2929,16 @@
+@@ -2260,16 +2946,16 @@
    fi
    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
  
@@ -7977,7 +7978,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2282,13 +2951,13 @@
+@@ -2282,13 +2968,13 @@
  
  
  
@@ -7995,7 +7996,7 @@
  
  
    val=
-@@ -2305,11 +2974,11 @@
+@@ -2305,11 +2991,11 @@
  
  
  
@@ -8009,7 +8010,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2319,8 +2988,8 @@
+@@ -2319,8 +3005,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -8020,7 +8021,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2347,15 +3016,15 @@
+@@ -2347,15 +3033,15 @@
  fi
  
  
@@ -8041,7 +8042,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2375,10 +3044,9 @@
+@@ -2375,10 +3061,9 @@
  
  
  
@@ -8054,7 +8055,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2398,18 +3066,18 @@
+@@ -2398,18 +3083,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -8080,7 +8081,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2418,12 +3086,12 @@
+@@ -2418,12 +3103,12 @@
  
  else
    kde_use_strict_options="no"
@@ -8097,7 +8098,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2432,20 +3100,21 @@
+@@ -2432,20 +3117,21 @@
  
  else
    kde_use_warnings="yes"
@@ -8124,7 +8125,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2457,8 +3126,8 @@
+@@ -2457,8 +3143,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -8135,12 +8136,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2471,32 +3140,34 @@
+@@ -2471,32 +3157,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -8177,12 +8178,12 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2509,36 +3180,51 @@
+@@ -2509,36 +3197,51 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -8239,12 +8240,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2551,74 +3237,34 @@
+@@ -2551,74 +3254,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -8323,16 +8324,16 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2632,7 +3278,7 @@
+@@ -2632,7 +3295,7 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
         ac_prog_rejected=yes
         continue
-@@ -2643,6 +3289,7 @@
+@@ -2643,6 +3306,7 @@
    fi
  done
  done
@@ -8340,7 +8341,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2660,22 +3307,23 @@
+@@ -2660,22 +3324,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -8371,12 +8372,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2688,36 +3336,38 @@
+@@ -2688,36 +3353,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -8418,12 +8419,12 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2730,29 +3380,45 @@
+@@ -2730,29 +3397,45 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -8470,7 +8471,7 @@
  fi
  
  fi
-@@ -2765,21 +3431,35 @@
+@@ -2765,21 +3448,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -8514,7 +8515,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2804,47 +3484,77 @@
+@@ -2804,47 +3501,77 @@
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -8614,7 +8615,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2856,19 +3566,21 @@
+@@ -2856,19 +3583,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -8643,7 +8644,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2887,22 +3599,27 @@
+@@ -2887,22 +3616,27 @@
      fi
    fi
  fi
@@ -8683,7 +8684,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2913,9 +3630,8 @@
+@@ -2913,9 +3647,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -8694,7 +8695,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2929,14 +3645,14 @@
+@@ -2929,14 +3662,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -8713,7 +8714,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2956,14 +3672,20 @@
+@@ -2956,14 +3689,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -8738,7 +8739,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2981,12 +3703,12 @@
+@@ -2981,12 +3720,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -8755,7 +8756,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3009,24 +3731,36 @@
+@@ -3009,50 +3748,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8773,34 +8774,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3035,24 +3769,28 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -8837,7 +8830,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3068,24 +3806,147 @@
+@@ -3068,38 +3806,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8850,32 +8843,20 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_c_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&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=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -8905,32 +8886,19 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
+   ac_status=$?
 +  grep -v '^ *+' conftest.er1 >conftest.err
 +  rm -f conftest.er1
 +  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&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
@@ -8962,38 +8930,17 @@
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
    ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3094,12 +3955,20 @@
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9002,13 +8949,13 @@
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
  fi
 -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
@@ -9018,7 +8965,7 @@
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3115,12 +3984,12 @@
+@@ -3115,12 +3933,12 @@
      CFLAGS=
    fi
  fi
@@ -9035,7 +8982,7 @@
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3154,12 +4023,17 @@
+@@ -3154,12 +3972,17 @@
  /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
     function prototypes and stuff, but not '\xHH' hex character constants.
     These don't provoke an error unfortunately, instead are silently treated
@@ -9055,7 +9002,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -3174,205 +4048,74 @@
+@@ -3174,205 +3997,57 @@
    return 0;
  }
  _ACEOF
@@ -9086,35 +9033,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  ac_cv_prog_cc_stdc=$ac_arg
 -break
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cc_c89=$ac_arg
  else
    echo "$as_me: failed program was:" >&5
@@ -9300,7 +9238,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3381,8 +4124,8 @@
+@@ -3381,8 +4056,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -9311,7 +9249,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3471,8 +4214,8 @@
+@@ -3471,8 +4146,8 @@
  fi
  
  fi
@@ -9322,7 +9260,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3494,8 +4237,8 @@
+@@ -3494,8 +4169,8 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -9333,7 +9271,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3529,8 +4272,13 @@
+@@ -3529,24 +4204,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -9349,7 +9287,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3555,9 +4303,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -3555,9 +4228,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -9361,7 +9319,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3567,8 +4316,13 @@
+@@ -3567,24 +4241,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -9377,7 +9335,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3595,6 +4349,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -3595,6 +4267,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -9385,7 +9363,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3612,8 +4367,8 @@
+@@ -3612,8 +4285,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -9396,7 +9374,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3636,8 +4391,13 @@
+@@ -3636,24 +4309,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -9412,7 +9390,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3662,9 +4422,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -3662,9 +4333,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -9424,7 +9422,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3674,8 +4435,13 @@
+@@ -3674,24 +4346,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -9440,7 +9438,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3702,6 +4468,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # Broken: success on invalid input.
+ continue
+ else
+@@ -3702,6 +4372,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -9448,7 +9466,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3752,18 +4519,22 @@
+@@ -3752,18 +4423,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -9476,12 +9494,12 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3776,36 +4547,38 @@
+@@ -3776,36 +4451,38 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -9523,12 +9541,12 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3818,55 +4591,85 @@
+@@ -3818,55 +4495,85 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CXX="$ac_prog"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -9627,7 +9645,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3889,24 +4692,36 @@
+@@ -3889,50 +4596,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9645,34 +9663,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3915,24 +4730,28 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9709,7 +9719,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3948,24 +4767,36 @@
+@@ -3948,159 +4654,133 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9727,34 +9737,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -3974,70 +4805,53 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9822,34 +9824,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4046,61 +4860,91 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -9891,34 +9885,25 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  break
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cxx_g=yes
  else
    echo "$as_me: failed program was:" >&5
@@ -9963,7 +9948,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4109,8 +4953,8 @@
+@@ -4109,8 +4789,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -9974,7 +9959,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4199,8 +5043,8 @@
+@@ -4199,8 +4879,8 @@
  fi
  
  fi
@@ -9985,7 +9970,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4218,8 +5062,8 @@
+@@ -4218,8 +4898,8 @@
  
  
  
@@ -9996,7 +9981,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4244,24 +5088,36 @@
+@@ -4244,39 +4924,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -10014,34 +9999,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4270,13 +5126,14 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_bad_compiler=no
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10060,7 +10037,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4318,17 +5175,16 @@
+@@ -4318,17 +4994,16 @@
          fi
        fi
  
@@ -10082,7 +10059,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4356,24 +5212,36 @@
+@@ -4356,34 +5031,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10100,34 +10077,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4382,8 +5250,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10139,7 +10109,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4396,29 +5266,28 @@
+@@ -4396,29 +5069,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10177,7 +10147,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4445,24 +5314,36 @@
+@@ -4445,34 +5117,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10195,34 +10165,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4471,8 +5352,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10234,7 +10197,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4485,13 +5368,13 @@
+@@ -4485,13 +5155,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10252,7 +10215,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4512,16 +5395,15 @@
+@@ -4512,16 +5182,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -10273,7 +10236,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4548,24 +5430,36 @@
+@@ -4548,34 +5217,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10291,34 +10254,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4574,8 +5468,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10330,7 +10286,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4588,16 +5484,16 @@
+@@ -4588,16 +5255,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10351,7 +10307,7 @@
   :
  
  fi
-@@ -4612,16 +5508,15 @@
+@@ -4612,16 +5279,15 @@
              CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
              CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
  
@@ -10372,7 +10328,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4648,24 +5543,36 @@
+@@ -4648,34 +5314,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10390,34 +10346,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4674,8 +5581,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10429,7 +10378,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4688,27 +5597,26 @@
+@@ -4688,27 +5352,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10464,7 +10413,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4733,24 +5641,36 @@
+@@ -4733,34 +5396,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10482,34 +10431,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4759,8 +5679,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cc_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10521,7 +10463,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4773,13 +5695,13 @@
+@@ -4773,13 +5434,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -10539,7 +10481,7 @@
   :
  
  fi
-@@ -4787,16 +5709,15 @@
+@@ -4787,16 +5448,15 @@
            ;;
          esac
  
@@ -10560,7 +10502,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4823,24 +5744,36 @@
+@@ -4823,34 +5483,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10578,34 +10520,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4849,8 +5782,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10617,7 +10552,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4863,28 +5798,27 @@
+@@ -4863,28 +5521,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10654,7 +10589,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4911,24 +5845,36 @@
+@@ -4911,34 +5568,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10672,34 +10607,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -4937,8 +5883,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10711,7 +10639,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4951,28 +5899,27 @@
+@@ -4951,28 +5606,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10748,7 +10676,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -4999,24 +5946,36 @@
+@@ -4999,34 +5653,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10766,34 +10694,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5025,8 +5984,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10805,7 +10726,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5039,13 +6000,13 @@
+@@ -5039,13 +5691,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10823,7 +10744,7 @@
   :
  
  fi
-@@ -5057,13 +6018,13 @@
+@@ -5057,13 +5709,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -10841,7 +10762,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5071,16 +6032,15 @@
+@@ -5071,16 +5723,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -10862,7 +10783,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5107,24 +6067,36 @@
+@@ -5107,34 +5758,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10880,34 +10801,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5133,8 +6105,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -10919,7 +10833,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5147,13 +6121,13 @@
+@@ -5147,13 +5796,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10937,7 +10851,7 @@
   :
  
  fi
-@@ -5165,16 +6139,15 @@
+@@ -5165,16 +5814,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -10958,7 +10872,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5201,24 +6174,36 @@
+@@ -5201,34 +5849,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10976,34 +10890,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5227,8 +6212,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11015,7 +10922,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5241,28 +6228,27 @@
+@@ -5241,28 +5887,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11052,7 +10959,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5289,24 +6275,36 @@
+@@ -5289,34 +5934,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11070,34 +10977,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5315,8 +6313,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11109,7 +11009,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5329,28 +6329,27 @@
+@@ -5329,28 +5972,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11146,7 +11046,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5377,24 +6376,36 @@
+@@ -5377,34 +6019,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11164,34 +11064,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5403,8 +6414,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11203,7 +11096,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5417,28 +6430,27 @@
+@@ -5417,28 +6057,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11240,7 +11133,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5465,24 +6477,36 @@
+@@ -5465,34 +6104,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11258,34 +11151,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5491,8 +6515,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11297,7 +11183,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5505,13 +6531,13 @@
+@@ -5505,13 +6142,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11315,7 +11201,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5519,37 +6545,37 @@
+@@ -5519,37 +6156,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -11367,7 +11253,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5581,24 +6607,36 @@
+@@ -5581,44 +6218,41 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11385,34 +11271,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5607,18 +6645,19 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_opt_noinline_match=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11436,7 +11315,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5638,16 +6677,15 @@
+@@ -5638,16 +6272,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -11457,7 +11336,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5674,24 +6712,36 @@
+@@ -5674,34 +6307,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11475,34 +11354,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5700,8 +6750,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11514,7 +11386,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5714,29 +6766,28 @@
+@@ -5714,29 +6345,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11552,7 +11424,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5763,24 +6814,36 @@
+@@ -5763,34 +6393,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11570,34 +11442,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5789,8 +6852,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11609,7 +11474,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5803,28 +6868,27 @@
+@@ -5803,28 +6431,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11646,7 +11511,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5851,24 +6915,36 @@
+@@ -5851,34 +6478,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11664,34 +11529,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5877,8 +6953,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11703,7 +11561,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5891,28 +6969,27 @@
+@@ -5891,28 +6516,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11740,7 +11598,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -5939,24 +7016,36 @@
+@@ -5939,34 +6563,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11758,34 +11616,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -5965,8 +7054,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11797,7 +11648,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5979,28 +7070,27 @@
+@@ -5979,28 +6601,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11834,7 +11685,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6027,24 +7117,36 @@
+@@ -6027,34 +6648,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11852,34 +11703,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6053,8 +7155,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11891,7 +11735,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6067,28 +7171,27 @@
+@@ -6067,28 +6686,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11928,7 +11772,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6115,24 +7218,36 @@
+@@ -6115,34 +6733,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11946,34 +11790,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6141,8 +7256,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -11985,7 +11822,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6155,13 +7272,13 @@
+@@ -6155,13 +6771,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12003,7 +11840,7 @@
   :
  
  fi
-@@ -6268,13 +7385,13 @@
+@@ -6268,13 +6884,13 @@
  fi
  
  
@@ -12020,7 +11857,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6304,8 +7421,13 @@
+@@ -6304,24 +6920,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -12036,7 +11873,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6330,9 +7452,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6330,9 +6944,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -12048,7 +11905,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6342,8 +7465,13 @@
+@@ -6342,24 +6957,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -12064,7 +11921,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6370,6 +7498,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -6370,6 +6983,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -12072,7 +11949,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6387,8 +7516,8 @@
+@@ -6387,8 +7001,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -12083,7 +11960,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6411,8 +7540,13 @@
+@@ -6411,24 +7025,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -12099,7 +11976,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6437,9 +7571,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -6437,9 +7049,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -12111,7 +12008,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6449,8 +7584,13 @@
+@@ -6449,24 +7062,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -12127,7 +12024,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6477,6 +7617,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_cxx_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (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
+@@ -6477,6 +7088,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -12135,7 +12052,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6503,16 +7644,15 @@
+@@ -6503,16 +7115,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -12156,7 +12073,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6539,24 +7679,36 @@
+@@ -6539,34 +7150,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12174,34 +12091,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6565,8 +7717,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12213,7 +12123,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6579,22 +7733,21 @@
+@@ -6579,22 +7188,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12242,7 +12152,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6610,36 +7763,36 @@
+@@ -6610,36 +7218,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -12289,7 +12199,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6666,24 +7819,36 @@
+@@ -6666,34 +7274,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12307,34 +12217,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6692,8 +7857,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12346,7 +12249,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6706,29 +7873,28 @@
+@@ -6706,29 +7312,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12384,7 +12287,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -6755,24 +7921,36 @@
+@@ -6755,34 +7360,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12402,34 +12305,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -6781,8 +7959,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -12441,7 +12337,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6795,13 +7975,13 @@
+@@ -6795,13 +7398,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -12459,7 +12355,7 @@
   :
  
  fi
-@@ -6811,13 +7991,13 @@
+@@ -6811,13 +7414,13 @@
  
  
  
@@ -12477,7 +12373,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6830,13 +8010,13 @@
+@@ -6830,13 +7433,13 @@
  
  
  
@@ -12495,7 +12391,7 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6847,276 +8027,97 @@
+@@ -6847,216 +7450,36 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -12508,25 +12404,28 @@
 -kde_cache=`echo Wl,--no-undefined | sed 'y% .=/+-,%____p__%'`
 -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++
++
++
++
++  # Check whether --enable-nmcheck was given.
++if test "${enable_nmcheck+set}" = set; then
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
++  kde_use_nmcheck=no
++fi
  
  
- 
+-
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+  # Check whether --enable-nmcheck was given.
-+if test "${enable_nmcheck+set}" = set; then
-+  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
-+else
-+  kde_use_nmcheck=no
-+fi
- 
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--no-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -12535,14 +12434,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+  if test "$kde_use_nmcheck" = "yes"; then
-+      KDE_USE_NMCHECK_TRUE=""
-+      KDE_USE_NMCHECK_FALSE="#"
-+   else
-+      KDE_USE_NMCHECK_TRUE="#"
-+      KDE_USE_NMCHECK_FALSE=""
-+  fi
- 
+-
 -int
 -main ()
 -{
@@ -12577,7 +12469,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
- 
+-
 -fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
@@ -12587,84 +12479,33 @@
 -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
-+
-+
-+# Check whether --enable-shared was given.
-+if test "${enable_shared+set}" = set; then
-+  enableval=$enable_shared; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
-+else
-+  enable_shared=yes
- fi
- 
+-
+-
+-fi
+-
 -if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
 - echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
 - :
- 
+-
 -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--allow-shlib-undefined" >&5
 -echo $ECHO_N "checking whether $CXX supports -Wl,--allow-shlib-undefined... $ECHO_C" >&6
 -kde_cache=`echo Wl,--allow-shlib-undefined | sed 'y% .=/+-,%____p__%'`
 -if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+# Check whether --enable-static was given.
-+if test "${enable_static+set}" = set; then
-+  enableval=$enable_static; p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac
- else
-+  enable_static=no
-+fi
- 
- 
- 
+-else
+-
+-
+-
 -   ac_ext=cc
 -ac_cpp='$CXXCPP $CPPFLAGS'
 -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
+-
 -ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+
-+    # Check whether --enable-libsuffix was given.
-+if test "${enable_libsuffix+set}" = set; then
-+  enableval=$enable_libsuffix; kdelibsuff=$enableval
-+else
-+  kdelibsuff="auto"
-+fi
- 
- 
+-
+-
 -  save_CXXFLAGS="$CXXFLAGS"
 -  CXXFLAGS="$CXXFLAGS -Wl,--allow-shlib-undefined"
 -  cat >conftest.$ac_ext <<_ACEOF
@@ -12673,8 +12514,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    if test "$kdelibsuff" = "auto"; then
- 
+-
 -int
 -main ()
 -{
@@ -12765,83 +12605,71 @@
 -      KDE_USE_NMCHECK_TRUE="#"
 -      KDE_USE_NMCHECK_FALSE=""
 -  fi
--
--
--
--
--
--
++  if test "$kde_use_nmcheck" = "yes"; then
++      KDE_USE_NMCHECK_TRUE=""
++      KDE_USE_NMCHECK_FALSE="#"
++   else
++      KDE_USE_NMCHECK_TRUE="#"
++      KDE_USE_NMCHECK_FALSE=""
++  fi
+ 
+ 
+ 
+ 
+ 
+ 
 -# Check whether --enable-shared or --disable-shared was given.
--if test "${enable_shared+set}" = set; then
++# Check whether --enable-shared was given.
+ if test "${enable_shared+set}" = set; then
 -  enableval="$enable_shared"
 -  p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_shared=yes ;;
--    no) enable_shared=no ;;
--    *)
--      enable_shared=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_shared=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac
--else
--  enable_shared=yes
++  enableval=$enable_shared; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_shared=yes ;;
+     no) enable_shared=no ;;
+@@ -7075,12 +7498,12 @@
+     esac
+ else
+   enable_shared=yes
 -fi;
--
++fi
++
+ 
 -# Check whether --enable-static or --disable-static was given.
--if test "${enable_static+set}" = set; then
++# Check whether --enable-static was given.
+ if test "${enable_static+set}" = set; then
 -  enableval="$enable_static"
 -  p=${PACKAGE-default}
--    case $enableval in
--    yes) enable_static=yes ;;
--    no) enable_static=no ;;
--    *)
--     enable_static=no
--      # Look at the argument we got.  We use all the common list separators.
--      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--      for pkg in $enableval; do
--	IFS="$lt_save_ifs"
--	if test "X$pkg" = "X$p"; then
--	  enable_static=yes
--	fi
--      done
--      IFS="$lt_save_ifs"
--      ;;
--    esac
--else
--  enable_static=no
++  enableval=$enable_static; p=${PACKAGE-default}
+     case $enableval in
+     yes) enable_static=yes ;;
+     no) enable_static=no ;;
+@@ -7099,18 +7522,19 @@
+     esac
+ else
+   enable_static=no
 -fi;
--
--
--
--
++fi
++
+ 
+ 
+ 
+ 
 -    # Check whether --enable-libsuffix or --disable-libsuffix was given.
--if test "${enable_libsuffix+set}" = set; then
++    # Check whether --enable-libsuffix was given.
+ if test "${enable_libsuffix+set}" = set; then
 -  enableval="$enable_libsuffix"
 -  kdelibsuff=$enableval
--else
--  kdelibsuff="auto"
++  enableval=$enable_libsuffix; kdelibsuff=$enableval
+ else
+   kdelibsuff="auto"
 -fi;
--
--    if test "$kdelibsuff" = "auto"; then
--
--cat > conftest.c << EOF
--#include <stdio.h>
--int main() {
-+cat > conftest.c << EOF
-+#include <stdio.h>
-+int main() {
-  return 0;
- }
- EOF
-@@ -7131,8 +8132,8 @@
++fi
++
+ 
+     if test "$kdelibsuff" = "auto"; then
+ 
+@@ -7131,8 +7555,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -12852,7 +12680,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7148,14 +8149,13 @@
+@@ -7148,14 +7572,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -12871,22 +12699,22 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7174,10 +8174,11 @@
+@@ -7174,10 +7597,11 @@
      esac
  else
    enable_fast_install=yes
 -fi;
 +fi
++
  
 -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-+
 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
  if test "${lt_cv_path_SED+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7201,7 +8202,7 @@
+@@ -7201,7 +7625,7 @@
  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
  # along with /bin/sed that truncates output.
  for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
@@ -12895,7 +12723,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7230,37 +8231,184 @@
+@@ -7230,37 +7654,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -12925,7 +12753,7 @@
 +  for ac_prog in grep ggrep; do
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { 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.
 +  # Check for GNU $ac_path_GREP
 +case `"$ac_path_GREP" --version 2>&1` in
@@ -12958,16 +12786,16 @@
 +    $ac_path_GREP_found && break 3
 +  done
 +done
- 
--echo "$as_me:$LINENO: checking for egrep" >&5
--echo $ECHO_N "checking for egrep... $ECHO_C" >&6
--if test "${ac_cv_prog_egrep+set}" = set; then
++
 +done
 +IFS=$as_save_IFS
 +
 +
 +fi
-+
+ 
+-echo "$as_me:$LINENO: checking for egrep" >&5
+-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+-if test "${ac_cv_prog_egrep+set}" = set; then
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
@@ -13013,7 +12841,7 @@
 +  for ac_prog in egrep; do
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 +    # 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
@@ -13097,7 +12925,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7289,11 +8437,11 @@
+@@ -7289,11 +7860,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -13113,7 +12941,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7306,7 +8454,7 @@
+@@ -7306,7 +7877,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -13122,7 +12950,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -7326,21 +8474,21 @@
+@@ -7326,21 +7897,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -13151,7 +12979,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7350,29 +8498,38 @@
+@@ -7350,29 +7921,38 @@
    ;;
  esac
  fi
@@ -13198,7 +13026,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7380,56 +8537,63 @@
+@@ -7380,56 +7960,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -13296,7 +13124,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7456,44 +8620,36 @@
+@@ -7456,44 +8043,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -13351,7 +13179,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7509,7 +8665,7 @@
+@@ -7509,7 +8088,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -13360,7 +13188,7 @@
    ia64*)
      lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
      lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-@@ -7525,43 +8681,27 @@
+@@ -7525,43 +8104,27 @@
    esac
    ;;
  
@@ -13417,7 +13245,7 @@
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
    else
-@@ -7580,32 +8720,22 @@
+@@ -7580,32 +8143,22 @@
    ;;
  
  openbsd*)
@@ -13453,7 +13281,7 @@
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -7626,17 +8756,20 @@
+@@ -7626,17 +8179,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -13477,7 +13305,7 @@
  file_magic_cmd=$lt_cv_file_magic_cmd
  deplibs_check_method=$lt_cv_deplibs_check_method
  test -z "$deplibs_check_method" && deplibs_check_method=unknown
-@@ -7645,14 +8778,17 @@
+@@ -7645,14 +8201,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -13498,16 +13326,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7679,7 +8815,7 @@
+@@ -7679,7 +8238,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7682 "configure"' > conftest.$ac_ext
-+  echo '#line 8818 "configure"' > conftest.$ac_ext
++  echo '#line 8241 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7722,14 +8858,13 @@
+@@ -7722,14 +8281,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -13524,7 +13352,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7741,7 +8876,6 @@
+@@ -7741,7 +8299,6 @@
        esac
        ;;
      *64-bit*)
@@ -13532,7 +13360,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7766,8 +8900,8 @@
+@@ -7766,8 +8323,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -13543,7 +13371,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7793,24 +8927,36 @@
+@@ -7793,35 +8350,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -13561,34 +13389,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7819,9 +8965,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   lt_cv_cc_needs_belf=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13601,7 +13422,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7830,22 +8977,42 @@
+@@ -7830,13 +8384,33 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -13614,10 +13435,6 @@
      CFLAGS="$SAVE_CFLAGS"
    fi
    ;;
--
--esac
--
--need_locks="$enable_libtool_lock"
 +sparc*-*solaris*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
@@ -13638,13 +13455,13 @@
 +  rm -rf conftest*
 +  ;;
 +
-+
-+esac
-+
-+need_locks="$enable_libtool_lock"
  
+ esac
  
+@@ -7844,8 +8418,8 @@
  
+ 
+ 
 -echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
@@ -13652,7 +13469,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7869,24 +9036,36 @@
+@@ -7869,35 +8443,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13670,34 +13487,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -7895,9 +9074,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_header_stdc=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13710,7 +13519,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7953,6 +9133,7 @@
+@@ -7953,6 +8523,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -13718,7 +13527,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7972,18 +9153,27 @@
+@@ -7972,18 +8543,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -13752,7 +13561,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -7996,12 +9186,14 @@
+@@ -7996,12 +8576,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -13770,7 +13579,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8024,9 +9216,9 @@
+@@ -8024,9 +8606,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13783,7 +13592,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8040,24 +9232,36 @@
+@@ -8040,38 +8622,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13801,34 +13610,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8066,12 +9270,14 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   eval "$as_ac_Header=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13847,7 +13648,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8086,18 +9292,19 @@
+@@ -8086,18 +8665,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -13875,7 +13676,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8108,24 +9315,36 @@
+@@ -8108,41 +8688,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -13893,34 +13694,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -8134,15 +9353,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -13943,7 +13736,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8151,8 +9371,13 @@
+@@ -8151,24 +8727,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -13959,7 +13752,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8176,9 +9401,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -8176,9 +8750,10 @@
  
    ac_header_preproc=no
  fi
@@ -13972,7 +13785,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8202,25 +9428,19 @@
+@@ -8202,25 +8777,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -14005,64 +13818,12 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8232,364 +9452,746 @@
+@@ -8232,17 +8801,250 @@
  
  done
  
--ac_ext=f
--ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
--ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_f77_compiler_gnu
--if test -n "$ac_tool_prefix"; then
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
--  do
--    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_F77+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test -n "$F77"; then
--  ac_cv_prog_F77="$F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
- 
--fi
--fi
--F77=$ac_cv_prog_F77
--if test -n "$F77"; then
--  echo "$as_me:$LINENO: result: $F77" >&5
--echo "${ECHO_T}$F77" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
- 
--    test -n "$F77" && break
--  done
--fi
--if test -z "$F77"; then
--  ac_ct_F77=$F77
--  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
--do
--  # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--echo "$as_me:$LINENO: checking for $ac_word" >&5
--echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
--if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
++
++
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
@@ -14075,88 +13836,21 @@
 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6; }
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test -n "$ac_ct_F77"; then
--  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
 +      ac_preproc_ok=false
 +for ac_cxx_preproc_warn_flag in '' yes
- do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--    ac_cv_prog_ac_ct_F77="$ac_prog"
--    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--
--fi
--fi
--ac_ct_F77=$ac_cv_prog_ac_ct_F77
--if test -n "$ac_ct_F77"; then
--  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
--echo "${ECHO_T}$ac_ct_F77" >&6
--else
--  echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
--fi
--
--  test -n "$ac_ct_F77" && break
--done
--
--  F77=$ac_ct_F77
--fi
--
--
--# Provide some information about the compiler.
--echo "$as_me:8327:" \
--     "checking for Fortran 77 compiler version" >&5
--ac_compiler=`set X $ac_compile; echo $2`
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
--  (eval $ac_compiler --version </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
--  (eval $ac_compiler -v </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
--  (eval $ac_compiler -V </dev/null >&5) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--rm -f a.out
--
--# If we don't use `.F' as extension, the preprocessor is not run on the
--# input file.  (Note that this only needs to work for GNU compilers.)
--ac_save_ext=$ac_ext
--ac_ext=F
--echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
--echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
--if test "${ac_cv_f77_compiler_gnu+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++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
--      program main
--#ifndef __GNUC__
--       choke me
++  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
@@ -14166,14 +13860,9 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
- #endif
--
--      end
++#endif
 +		     Syntax error
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14181,75 +13870,31 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_compiler_gnu=yes
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $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
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_compiler_gnu=no
++else
++  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_objext conftest.$ac_ext
--ac_cv_f77_compiler_gnu=$ac_compiler_gnu
- 
--fi
--echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
--echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
--ac_ext=$ac_save_ext
--ac_test_FFLAGS=${FFLAGS+set}
--ac_save_FFLAGS=$FFLAGS
--FFLAGS=
--echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
--echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
--if test "${ac_cv_prog_f77_g+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  FFLAGS=-g
--cat >conftest.$ac_ext <<_ACEOF
--      program main
++fi
++
 +rm -f conftest.err conftest.$ac_ext
- 
--      end
++
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
- _ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
++_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
@@ -14262,50 +13907,26 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_f77_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_prog_f77_g=yes
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $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
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--ac_cv_prog_f77_g=no
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
- fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -14313,26 +13934,14 @@
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  break
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
--echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
--if test "$ac_test_FFLAGS" = set; then
--  FFLAGS=$ac_save_FFLAGS
--elif test $ac_cv_prog_f77_g = yes; then
--  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-g -O2"
--  else
--    FFLAGS="-g"
--  fi
++fi
 +
 +    done
 +    ac_cv_prog_CXXCPP=$CXXCPP
 +
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
- else
--  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
--    FFLAGS="-O2"
++else
 +  ac_cv_prog_CXXCPP=$CXXCPP
 +fi
 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
@@ -14371,43 +13980,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-   else
--    FFLAGS=
-+    ac_cpp_err=
-   fi
-+else
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--G77=`test $ac_compiler_gnu = yes && echo yes`
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--
++
 +  # Broken: fails on valid input.
 +continue
 +fi
- 
--# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
++
 +rm -f conftest.err conftest.$ac_ext
- 
--# find the maximum length of command line arguments
--echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
--echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
++
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -14430,56 +14017,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--    i=0
--  testring="ABCD"
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (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
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--  case $build_os in
--  msdosdjgpp*)
--    # On DJGPP, this test can blow up pretty badly due to problems in libc
--    # (any single argument exceeding 2000 bytes causes a buffer overrun
--    # during glob expansion).  Even if it were fixed, the result of this
--    # check would be larger than it should be.
--    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
--    ;;
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
- 
--  gnu*)
--    # Under GNU Hurd, this test is not required because there is
--    # no limit to the length of command line arguments.
--    # Libtool will interpret -1 as no limit whatsoever
--    lt_cv_sys_max_cmd_len=-1;
--    ;;
++
 +rm -f conftest.err conftest.$ac_ext
- 
--  cygwin* | mingw*)
--    # On Win9x/ME, this test blows up -- it succeeds, but takes
--    # about 5 minutes as the teststring grows exponentially.
--    # Worse, since 9x/ME are not pre-emptively multitasking,
--    # you end up with a "frozen" computer, even though with patience
--    # the test eventually succeeds (with a max line length of 256k).
--    # Instead, let's just punt: use the minimum linelength reported by
--    # all of the supported platforms: 8192 (on NT/2K/XP).
--    lt_cv_sys_max_cmd_len=8192;
--    ;;
++
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
@@ -14492,148 +14046,113 @@
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
- 
-- *)
--    # If test is not a shell built-in, we'll probably end up computing a
--    # maximum length that is only half of the actual maximum length, but
--    # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
--	    lt_cv_sys_max_cmd_len=$new_result &&
--	    test $i != 17 # 1/2 MB should be enough
--    do
--      i=`expr $i + 1`
--      testring=$testring$testring
--    done
--    testring=
--    # Add a significant safety factor because C++ compilers can tack on massive
--    # amounts of additional arguments before passing them to the linker.
--    # It appears as though 1/2 is a usable value.
--    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
--    ;;
--  esac
++
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
- fi
- 
--if test -n $lt_cv_sys_max_cmd_len ; then
--  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
--echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-+ac_ext=f
-+ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-+ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-+if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+  do
-+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
++
++fi
++
+ ac_ext=f
+ ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
+ ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_f77_compiler_gnu
+ if test -n "$ac_tool_prefix"; then
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+   do
+     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+ set dummy $ac_tool_prefix$ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_F77+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test "${ac_cv_prog_F77+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$as_me:$LINENO: result: none" >&5
--echo "${ECHO_T}none" >&6
--fi
--
-+  if test -n "$F77"; then
-+  ac_cv_prog_F77="$F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+@@ -8255,36 +9057,38 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
  
-+fi
-+fi
-+F77=$ac_cv_prog_F77
-+if test -n "$F77"; then
+ fi
+ fi
+ F77=$ac_cv_prog_F77
+ if test -n "$F77"; then
+-  echo "$as_me:$LINENO: result: $F77" >&5
+-echo "${ECHO_T}$F77" >&6
 +  { echo "$as_me:$LINENO: result: $F77" >&5
 +echo "${ECHO_T}$F77" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
  
- 
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
--echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+    test -n "$F77" && break
-+  done
-+fi
-+if test -z "$F77"; then
-+  ac_ct_F77=$F77
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
-+do
-+  # Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
++
+     test -n "$F77" && break
+   done
+ fi
+ if test -z "$F77"; then
+   ac_ct_F77=$F77
+-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+-echo "$as_me:$LINENO: checking for $ac_word" >&5
+-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
+ if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-+  if test -n "$ac_ct_F77"; then
-+  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_prog_ac_ct_F77="$ac_prog"
-+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+done
+@@ -8297,48 +9101,78 @@
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+   for ac_exec_ext in '' $ac_executable_extensions; do
+-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_F77="$ac_prog"
+     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+     break 2
+   fi
+ done
+ done
 +IFS=$as_save_IFS
  
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
--
--# Character class describing NM global symbol codes.
--symcode='[BCDEGRST]'
-+fi
-+fi
-+ac_ct_F77=$ac_cv_prog_ac_ct_F77
-+if test -n "$ac_ct_F77"; then
+ fi
+ fi
+ ac_ct_F77=$ac_cv_prog_ac_ct_F77
+ if test -n "$ac_ct_F77"; then
+-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
+-echo "${ECHO_T}$ac_ct_F77" >&6
 +  { echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
 +echo "${ECHO_T}$ac_ct_F77" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: no" >&5
+-echo "${ECHO_T}no" >&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
  
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
++
+   test -n "$ac_ct_F77" && break
+ done
  
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
-+  test -n "$ac_ct_F77" && break
-+done
- 
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+-  F77=$ac_ct_F77
 +  if test "x$ac_ct_F77" = x; then
 +    F77=""
 +  else
@@ -14649,26 +14168,16 @@
 +esac
 +    F77=$ac_ct_F77
 +  fi
-+fi
+ fi
  
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
  
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[BCDT]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[ABCDGISTW]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  if test "$host_cpu" = ia64; then
--    symcode='[ABCDEGRST]'
--  fi
-+# Provide some information about the compiler.
+ # Provide some information about the compiler.
+-echo "$as_me:8327:" \
+-     "checking for Fortran 77 compiler version" >&5
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
-+ac_compiler=`set X $ac_compile; echo $2`
+ ac_compiler=`set X $ac_compile; echo $2`
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
+-  (eval $ac_compiler --version </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler --version >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14676,9 +14185,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler --version >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
+-  (eval $ac_compiler -v </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -v >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14686,9 +14197,11 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -v >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
+-  (eval $ac_compiler -V </dev/null >&5) 2>&5
 +{ (ac_try="$ac_compiler -V >&5"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14696,29 +14209,26 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compiler -V >&5") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }
-+rm -f a.out
-+
-+# If we don't use `.F' as extension, the preprocessor is not run on the
-+# input file.  (Note that this only needs to work for GNU compilers.)
-+ac_save_ext=$ac_ext
-+ac_ext=F
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }
+@@ -8348,8 +9182,8 @@
+ # input file.  (Note that this only needs to work for GNU compilers.)
+ ac_save_ext=$ac_ext
+ ac_ext=F
+-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
+-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6; }
-+if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_f77_compiler_gnu+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8362,46 +9196,42 @@
+       end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14726,62 +14236,64 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_compiler_gnu=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_compiler_gnu=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_compiler_gnu=no
 +	ac_compiler_gnu=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ ac_cv_f77_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
+-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
-+ac_ext=$ac_save_ext
-+ac_test_FFLAGS=${FFLAGS+set}
-+ac_save_FFLAGS=$FFLAGS
-+FFLAGS=
+ ac_ext=$ac_save_ext
+ ac_test_FFLAGS=${FFLAGS+set}
+ ac_save_FFLAGS=$FFLAGS
+ FFLAGS=
+-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
+-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
 +echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_f77_g+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  FFLAGS=-g
-+cat >conftest.$ac_ext <<_ACEOF
-+      program main
-+
-+      end
-+_ACEOF
-+rm -f conftest.$ac_objext
+ if test "${ac_cv_prog_f77_g+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8412,39 +9242,35 @@
+       end
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+-  (eval $ac_compile) 2>conftest.er1
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -14789,108 +14301,71 @@
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_f77_g=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 { ac_try='test -z "$ac_f77_werror_flag"
+-			 || test ! -s conftest.err'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
+-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+-  (eval $ac_try) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_f77_g=yes
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-ac_cv_prog_f77_g=no
 +	ac_cv_prog_f77_g=no
-+fi
+ fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
+ 
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
+-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
-+if test "$ac_test_FFLAGS" = set; then
-+  FFLAGS=$ac_save_FFLAGS
-+elif test $ac_cv_prog_f77_g = yes; then
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+    FFLAGS="-g -O2"
-+  else
-+    FFLAGS="-g"
-+  fi
-+else
-+  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-+    FFLAGS="-O2"
-+  else
-+    FFLAGS=
-+  fi
-+fi
-+
-+G77=`test $ac_compiler_gnu = yes && echo yes`
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-+
-+# find the maximum length of command line arguments
+ if test "$ac_test_FFLAGS" = set; then
+   FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8473,13 +9299,13 @@
+ # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ 
+ # find the maximum length of command line arguments
+-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
+-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
 +echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+    i=0
+ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+     i=0
+-  testring="ABCD"
 +  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
+ 
+   case $build_os in
+   msdosdjgpp*)
+@@ -8508,20 +9334,70 @@
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+- *)
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
@@ -14941,74 +14416,65 @@
 +    fi
 +    ;;
 +  *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
+     # If test is not a shell built-in, we'll probably end up computing a
+     # maximum length that is only half of the actual maximum length, but
+     # we can't tell.
+-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+-	       = "XX$testring") >/dev/null 2>&1 &&
+-	    new_result=`expr "X$testring" : ".*" 2>&1` &&
 +    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
 +    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
 +	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
+ 	    lt_cv_sys_max_cmd_len=$new_result &&
+ 	    test $i != 17 # 1/2 MB should be enough
+     do
+       i=`expr $i + 1`
+-      testring=$testring$testring
 +      teststring=$teststring$teststring
-+    done
+     done
+-    testring=
 +    teststring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    ;;
-+  esac
-+
-+fi
-+
-+if test -n $lt_cv_sys_max_cmd_len ; then
+     # Add a significant safety factor because C++ compilers can tack on massive
+     # amounts of additional arguments before passing them to the linker.
+     # It appears as though 1/2 is a usable value.
+@@ -8532,19 +9408,19 @@
+ fi
+ 
+ if test -n $lt_cv_sys_max_cmd_len ; then
+-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
+-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
 +  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
-+else
+ else
+-  echo "$as_me:$LINENO: result: none" >&5
+-echo "${ECHO_T}none" >&6
 +  { echo "$as_me:$LINENO: result: none" >&5
 +echo "${ECHO_T}none" >&6; }
-+fi
-+
-+
-+
-+
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
+ fi
+ 
+ 
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
+-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
-+
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-+
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDEGRST]'
-+  fi
+ if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+@@ -8558,9 +9434,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+ 
+@@ -8582,14 +9455,30 @@
    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
    ;;
@@ -15041,7 +14507,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8607,14 +10209,17 @@
+@@ -8607,14 +9496,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -15061,7 +14527,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8732,15 +10337,15 @@
+@@ -8732,15 +9624,15 @@
    lt_cv_sys_global_symbol_to_cdecl=
  fi
  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
@@ -15083,7 +14549,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8754,8 +10359,8 @@
+@@ -8754,8 +9646,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -15094,7 +14560,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8776,7 +10381,7 @@
+@@ -8776,7 +9668,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -15103,7 +14569,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8796,7 +10401,7 @@
+@@ -8796,7 +9688,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -15112,7 +14578,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8806,8 +10411,8 @@
+@@ -8806,8 +9698,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ar; ac_word=$2
@@ -15123,12 +14589,12 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8820,32 +10425,34 @@
+@@ -8820,32 +9712,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="${ac_tool_prefix}ar"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15165,12 +14631,12 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8858,27 +10465,41 @@
+@@ -8858,27 +9752,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_AR="ar"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15214,7 +14680,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8886,8 +10507,8 @@
+@@ -8886,8 +9794,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
@@ -15225,12 +14691,12 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8900,32 +10521,34 @@
+@@ -8900,32 +9808,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15267,12 +14733,12 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8938,27 +10561,41 @@
+@@ -8938,27 +9848,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15316,7 +14782,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8966,8 +10603,8 @@
+@@ -8966,8 +9890,8 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  set dummy ${ac_tool_prefix}strip; ac_word=$2
@@ -15327,12 +14793,12 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8980,32 +10617,34 @@
+@@ -8980,32 +9904,34 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15369,12 +14835,12 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9018,27 +10657,41 @@
+@@ -9018,27 +9944,41 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_STRIP="strip"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -15418,7 +14884,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9053,6 +10706,7 @@
+@@ -9053,6 +9993,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -15426,7 +14892,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9072,21 +10726,32 @@
+@@ -9072,21 +10013,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -15463,7 +14929,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9106,7 +10771,7 @@
+@@ -9106,7 +10058,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -15472,7 +14938,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9138,17 +10803,17 @@
+@@ -9138,17 +10090,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -15496,7 +14962,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9168,7 +10833,7 @@
+@@ -9168,7 +10120,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -15505,7 +14971,7 @@
  	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
  	    $EGREP "$file_magic_regex" > /dev/null; then
-@@ -9200,11 +10865,11 @@
+@@ -9200,11 +10152,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -15521,7 +14987,7 @@
  fi
  
    else
-@@ -9219,22 +10884,22 @@
+@@ -9219,21 +10171,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -15545,14 +15011,12 @@
  else
    pic_mode=default
 -fi;
--test -z "$pic_mode" && pic_mode=default
 +fi
 +
-+test -z "$pic_mode" && pic_mode=default
+ test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
- tagname=
-@@ -9263,68 +10928,25 @@
+@@ -9263,68 +10215,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -15636,7 +15100,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9338,8 +10960,8 @@
+@@ -9338,8 +10247,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -15647,7 +15111,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9353,26 +10975,28 @@
+@@ -9353,26 +10262,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -15656,12 +15120,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9359: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:10981: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10268: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9363: \$? = $ac_status" >&5
-+   echo "$as_me:10985: \$? = $ac_status" >&5
++   echo "$as_me:10272: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -15683,7 +15147,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-@@ -9386,8 +11010,8 @@
+@@ -9386,8 +10297,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -15694,7 +15158,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9425,6 +11049,11 @@
+@@ -9425,6 +10336,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -15706,7 +15170,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9441,7 +11070,7 @@
+@@ -9441,7 +10357,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -15715,7 +15179,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9467,6 +11096,16 @@
+@@ -9467,6 +10383,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -15732,7 +15196,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9478,7 +11117,7 @@
+@@ -9478,7 +10404,7 @@
        lt_prog_compiler_wl='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -15741,7 +15205,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9501,13 +11140,20 @@
+@@ -9501,13 +10427,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -15764,7 +15228,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9522,15 +11168,15 @@
+@@ -9522,15 +10455,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -15786,7 +15250,7 @@
        ;;
  
      sunos4*)
-@@ -9539,7 +11185,7 @@
+@@ -9539,7 +10472,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -15795,7 +15259,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9552,6 +11198,17 @@
+@@ -9552,6 +10485,17 @@
        fi
        ;;
  
@@ -15813,7 +15277,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9563,16 +11220,16 @@
+@@ -9563,16 +10507,16 @@
      esac
    fi
  
@@ -15834,7 +15298,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9586,26 +11243,28 @@
+@@ -9586,26 +10530,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -15843,12 +15307,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9592: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11249: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10536: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9596: \$? = $ac_status" >&5
-+   echo "$as_me:11253: \$? = $ac_status" >&5
++   echo "$as_me:10540: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -15870,7 +15334,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9618,7 +11277,7 @@
+@@ -9618,7 +10564,7 @@
  fi
  
  fi
@@ -15879,7 +15343,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9628,8 +11287,50 @@
+@@ -9628,8 +10574,50 @@
      ;;
  esac
  
@@ -15932,7 +15396,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9640,60 +11341,58 @@
+@@ -9640,60 +10628,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -15954,12 +15418,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9659: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11353: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10640: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9663: \$? = $ac_status" >&5
-+   echo "$as_me:11357: \$? = $ac_status" >&5
++   echo "$as_me:10644: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -16011,7 +15475,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -9703,8 +11402,8 @@
+@@ -9703,8 +10689,8 @@
    need_locks=no
  fi
  
@@ -16022,7 +15486,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9742,6 +11441,16 @@
+@@ -9742,6 +10728,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -16039,7 +15503,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9752,6 +11461,10 @@
+@@ -9752,6 +10748,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -16050,7 +15514,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9762,6 +11475,27 @@
+@@ -9762,6 +10762,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -16078,7 +15542,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9799,7 +11533,7 @@
+@@ -9799,7 +10820,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -16087,7 +15551,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9809,13 +11543,13 @@
+@@ -9809,13 +10830,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -16104,7 +15568,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9824,23 +11558,70 @@
+@@ -9824,23 +10845,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -16180,7 +15644,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9854,13 +11635,40 @@
+@@ -9854,13 +10922,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16223,7 +15687,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9870,24 +11678,19 @@
+@@ -9870,24 +10965,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -16255,7 +15719,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9899,7 +11702,7 @@
+@@ -9899,7 +10989,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -16264,7 +15728,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9921,9 +11724,21 @@
+@@ -9921,9 +11011,21 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -16288,7 +15752,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9940,7 +11755,7 @@
+@@ -9940,7 +11042,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -16297,7 +15761,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -9959,8 +11774,12 @@
+@@ -9959,8 +11061,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -16310,7 +15774,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9968,22 +11787,23 @@
+@@ -9968,22 +11074,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -16341,7 +15805,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9999,24 +11819,36 @@
+@@ -9999,27 +11106,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16359,34 +15823,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10030,19 +11862,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -10030,19 +11133,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16412,7 +15871,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10061,24 +11894,36 @@
+@@ -10061,27 +11165,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -16430,34 +15889,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -10092,8 +11937,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -10092,8 +11192,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -16469,7 +15923,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10102,13 +11949,11 @@
+@@ -10102,13 +11204,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -16486,7 +15940,7 @@
  	fi
        fi
        ;;
-@@ -10121,7 +11966,7 @@
+@@ -10121,7 +11221,7 @@
        ld_shlibs=no
        ;;
  
@@ -16495,7 +15949,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10131,13 +11976,13 @@
+@@ -10131,13 +11231,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -16512,7 +15966,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -10147,52 +11992,52 @@
+@@ -10147,52 +11247,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -16605,7 +16059,7 @@
      fi
        ;;
  
-@@ -10226,8 +12071,8 @@
+@@ -10226,8 +11326,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -16616,7 +16070,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10235,7 +12080,7 @@
+@@ -10235,7 +11335,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -16625,7 +16079,7 @@
        else
  	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -10249,47 +12094,62 @@
+@@ -10249,47 +11349,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -16712,7 +16166,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10303,7 +12163,7 @@
+@@ -10303,7 +11418,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -16721,7 +16175,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10313,7 +12173,7 @@
+@@ -10313,7 +11428,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -16730,7 +16184,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10336,7 +12196,8 @@
+@@ -10336,7 +11451,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -16740,7 +16194,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10346,7 +12207,7 @@
+@@ -10346,7 +11462,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -16749,7 +16203,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10357,14 +12218,14 @@
+@@ -10357,14 +11473,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -16766,7 +16220,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -10376,13 +12237,13 @@
+@@ -10376,13 +11492,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -16782,7 +16236,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10390,21 +12251,15 @@
+@@ -10390,21 +11506,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -16808,7 +16262,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -10413,8 +12268,18 @@
+@@ -10413,8 +11523,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -16829,7 +16283,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10423,7 +12288,7 @@
+@@ -10423,7 +11543,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -16838,7 +16292,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10471,36 +12336,45 @@
+@@ -10471,36 +11591,45 @@
        fi
        ;;
  
@@ -16905,7 +16359,7 @@
        ;;
  
      uts4*)
-@@ -10515,15 +12389,10 @@
+@@ -10515,15 +11644,10 @@
      esac
    fi
  
@@ -16923,7 +16377,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10541,8 +12410,8 @@
+@@ -10541,8 +11665,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -16934,7 +16388,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10556,6 +12425,7 @@
+@@ -10556,6 +11680,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -16942,7 +16396,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10578,20 +12448,20 @@
+@@ -10578,20 +11703,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -16968,7 +16422,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10601,7 +12471,20 @@
+@@ -10601,7 +11726,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -16990,7 +16444,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10666,7 +12549,7 @@
+@@ -10666,7 +11804,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -16999,7 +16453,7 @@
    ;;
  
  beos*)
-@@ -10675,7 +12558,7 @@
+@@ -10675,7 +11813,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -17008,7 +16462,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10691,7 +12574,7 @@
+@@ -10691,7 +11829,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -17017,7 +16471,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10703,7 +12586,8 @@
+@@ -10703,7 +11841,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -17027,7 +16481,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10733,7 +12617,7 @@
+@@ -10733,7 +11872,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -17036,7 +16490,7 @@
        ;;
      esac
      ;;
-@@ -10756,7 +12640,7 @@
+@@ -10756,7 +11895,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -17045,7 +16499,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -10779,20 +12663,17 @@
+@@ -10779,20 +11918,17 @@
    dynamic_linker=no
    ;;
  
@@ -17077,7 +16531,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10810,14 +12691,19 @@
+@@ -10810,14 +11946,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -17099,7 +16553,7 @@
    esac
    ;;
  
-@@ -10837,9 +12723,9 @@
+@@ -10837,9 +11978,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -17111,7 +16565,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10854,7 +12740,7 @@
+@@ -10854,7 +11995,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -17120,7 +16574,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10865,7 +12751,7 @@
+@@ -10865,7 +12006,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -17129,7 +16583,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10877,6 +12763,18 @@
+@@ -10877,6 +12018,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -17148,7 +16602,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10920,29 +12818,26 @@
+@@ -10920,29 +12073,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -17185,7 +16639,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -10952,6 +12847,18 @@
+@@ -10952,6 +12102,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -17204,7 +16658,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10961,7 +12868,7 @@
+@@ -10961,7 +12123,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -17213,7 +16667,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10989,8 +12896,13 @@
+@@ -10989,8 +12151,13 @@
  
  openbsd*)
    version_type=sunos
@@ -17228,7 +16682,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -11010,7 +12922,7 @@
+@@ -11010,7 +12177,7 @@
  
  os2*)
    libname_spec='$name'
@@ -17237,7 +16691,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11028,13 +12940,6 @@
+@@ -11028,13 +12195,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -17251,7 +16705,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11060,7 +12965,7 @@
+@@ -11060,7 +12220,7 @@
    need_version=yes
    ;;
  
@@ -17260,7 +16714,7 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -11093,6 +12998,29 @@
+@@ -11093,6 +12253,29 @@
    fi
    ;;
  
@@ -17290,7 +16744,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11104,16 +13032,21 @@
+@@ -11104,16 +12287,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -17318,7 +16772,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11133,8 +13066,8 @@
+@@ -11133,8 +12321,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -17329,7 +16783,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11147,29 +13080,29 @@
+@@ -11147,29 +12335,29 @@
  
  striplib=
  old_striplib=
@@ -17369,7 +16823,7 @@
      ;;
    esac
  fi
-@@ -11201,8 +13134,8 @@
+@@ -11201,8 +12389,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -17380,7 +16834,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11215,40 +13148,52 @@
+@@ -11215,56 +12403,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17418,34 +16872,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11257,14 +13202,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17465,7 +16912,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11278,8 +13224,8 @@
+@@ -11278,8 +12463,8 @@
     ;;
  
    *)
@@ -17476,7 +16923,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11306,53 +13252,59 @@
+@@ -11306,73 +12491,64 @@
  
  #undef shl_load
  
@@ -17528,34 +16975,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11361,18 +13313,19 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_shl_load=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17581,7 +17021,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11385,40 +13338,52 @@
+@@ -11385,61 +12561,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17619,34 +17059,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11427,19 +13392,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dld_shl_load=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17673,7 +17106,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11466,53 +13432,59 @@
+@@ -11466,73 +12639,64 @@
  
  #undef dlopen
  
@@ -17725,34 +17158,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11521,18 +13493,19 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17778,7 +17204,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11545,40 +13518,52 @@
+@@ -11545,61 +12709,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17816,34 +17242,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11587,19 +13572,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17870,7 +17289,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11612,40 +13598,52 @@
+@@ -11612,61 +12773,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -17908,34 +17327,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11654,19 +13652,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_svld_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17962,7 +17374,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11679,40 +13678,52 @@
+@@ -11679,56 +12837,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -18000,34 +17412,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -11721,14 +13732,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dld_dld_link=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -18047,7 +17452,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11763,13 +13775,13 @@
+@@ -11763,13 +12918,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -18064,16 +17469,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11779,7 +13791,7 @@
+@@ -11779,7 +12934,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11782 "configure"
-+#line 13794 "configure"
++#line 12937 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11836,6 +13848,8 @@
+@@ -11836,6 +12991,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -18082,7 +17487,7 @@
  
      exit (status);
  }
-@@ -11845,12 +13859,12 @@
+@@ -11845,12 +13002,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18097,7 +17502,7 @@
      esac
    else :
      # compilation failed
-@@ -11861,13 +13875,13 @@
+@@ -11861,13 +13018,13 @@
  
  
  fi
@@ -18116,16 +17521,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11877,7 +13891,7 @@
+@@ -11877,7 +13034,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11880 "configure"
-+#line 13894 "configure"
++#line 13037 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11934,6 +13948,8 @@
+@@ -11934,6 +13091,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -18134,7 +17539,7 @@
  
      exit (status);
  }
-@@ -11943,12 +13959,12 @@
+@@ -11943,12 +13102,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18149,7 +17554,7 @@
      esac
    else :
      # compilation failed
-@@ -11959,8 +13975,8 @@
+@@ -11959,8 +13118,8 @@
  
  
  fi
@@ -18160,7 +17565,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -11981,19 +13997,19 @@
+@@ -11981,19 +13140,19 @@
  fi
  
  
@@ -18188,7 +17593,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12002,58 +14018,21 @@
+@@ -12002,58 +13161,21 @@
    fi
    ;;
  
@@ -18254,7 +17659,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12068,7 +14047,8 @@
+@@ -12068,7 +13190,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -18264,7 +17669,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12182,11 +14162,11 @@
+@@ -12182,11 +13305,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -18278,7 +17683,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12216,6 +14196,12 @@
+@@ -12216,6 +13339,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -18291,7 +17696,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12227,6 +14213,9 @@
+@@ -12227,6 +13356,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -18301,7 +17706,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12246,7 +14235,7 @@
+@@ -12246,7 +13378,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -18310,7 +17715,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12277,7 +14266,7 @@
+@@ -12277,7 +13409,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -18319,7 +17724,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12292,7 +14281,7 @@
+@@ -12292,7 +13424,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -18328,7 +17733,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12519,7 +14508,10 @@
+@@ -12519,7 +13651,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -18340,7 +17745,7 @@
  fi
  
  
-@@ -12532,11 +14524,11 @@
+@@ -12532,11 +13667,11 @@
  CC="$lt_save_CC"
  
  
@@ -18356,7 +17761,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12554,6 +14546,9 @@
+@@ -12554,6 +13689,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -18366,7 +17771,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12584,8 +14579,10 @@
+@@ -12584,8 +13722,10 @@
  
        case $tagname in
        CXX)
@@ -18379,7 +17784,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -12604,6 +14601,7 @@
+@@ -12604,6 +13744,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -18387,7 +17792,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12621,7 +14619,7 @@
+@@ -12621,7 +13762,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -18396,7 +17801,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12631,17 +14629,34 @@
+@@ -12631,17 +13772,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -18432,7 +17837,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12652,18 +14667,27 @@
+@@ -12652,18 +13810,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -18463,7 +17868,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12677,18 +14701,18 @@
+@@ -12677,18 +13844,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -18488,7 +17893,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12717,11 +14741,11 @@
+@@ -12717,11 +13884,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -18504,7 +17909,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12734,7 +14758,7 @@
+@@ -12734,7 +13901,7 @@
      if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
        lt_cv_path_LD="$ac_dir/$ac_prog"
        # Check to see if the program is GNU ld.  I'd rather use --version,
@@ -18513,7 +17918,7 @@
        # Break only if it was the GNU/non-GNU ld that we prefer.
        case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
        *GNU* | *'with BFD'*)
-@@ -12754,21 +14778,21 @@
+@@ -12754,21 +13921,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -18542,7 +17947,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12778,8 +14802,8 @@
+@@ -12778,8 +13945,8 @@
    ;;
  esac
  fi
@@ -18553,7 +17958,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12787,8 +14811,8 @@
+@@ -12787,8 +13954,8 @@
    # Check if GNU C++ uses GNU ld as the underlying linker, since the
    # archiving commands below assume that GNU ld is being used.
    if test "$with_gnu_ld" = yes; then
@@ -18564,7 +17969,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12814,7 +14838,7 @@
+@@ -12814,7 +13981,7 @@
      # linker, instead of GNU ld.  If possible, this setting should
      # overridden to take advantage of the native linker features on
      # the platform it is being used on.
@@ -18573,7 +17978,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12829,8 +14853,8 @@
+@@ -12829,8 +13996,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -18584,7 +17989,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12845,8 +14869,23 @@
+@@ -12845,8 +14012,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -18610,7 +18015,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12863,7 +14902,7 @@
+@@ -12863,7 +14045,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -18619,7 +18024,7 @@
        # We only want to do this on AIX 4.2 and lower, the check
        # below for broken collect2 doesn't work under 4.3+
  	collect2name=`${CC} -print-prog-name=collect2`
-@@ -12882,8 +14921,12 @@
+@@ -12882,8 +14064,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -18632,7 +18037,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12892,15 +14935,16 @@
+@@ -12892,15 +14078,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -18653,7 +18058,7 @@
      if test "$aix_use_runtimelinking" = yes; then
        # Warning - without using the other runtime loading flags (-brtl),
        # -berok will link without error, but may produce a broken library.
-@@ -12922,24 +14966,36 @@
+@@ -12922,27 +14109,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18671,34 +18076,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -12953,20 +15009,21 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -12953,20 +14136,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -18724,7 +18124,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12985,24 +15042,36 @@
+@@ -12985,27 +14169,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -18742,34 +18142,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -13016,8 +15085,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -13016,8 +14196,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -18781,7 +18176,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -13026,16 +15097,26 @@
+@@ -13026,16 +14208,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -18813,7 +18208,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13049,12 +15130,12 @@
+@@ -13049,12 +14241,12 @@
      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
      # as there is no search path for DLLs.
      hardcode_libdir_flag_spec_CXX='-L$libdir'
@@ -18828,7 +18223,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -13063,70 +15144,81 @@
+@@ -13063,70 +14255,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -18962,7 +18357,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13137,14 +15229,14 @@
+@@ -13137,14 +14340,14 @@
  	;;
      esac
      ;;
@@ -18979,7 +18374,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13161,12 +15253,12 @@
+@@ -13161,12 +14364,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -18995,7 +18390,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13175,11 +15267,11 @@
+@@ -13175,11 +14378,11 @@
        # explicitly linking system object files so we need to strip them
        # from the output so that they don't get included in the library
        # dependencies.
@@ -19009,7 +18404,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13189,33 +15281,22 @@
+@@ -13189,33 +14392,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -19050,7 +18445,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13226,17 +15307,20 @@
+@@ -13226,17 +14418,20 @@
      esac
  
      case $cc_basename in
@@ -19077,7 +18472,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13252,12 +15336,15 @@
+@@ -13252,12 +14447,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -19097,7 +18492,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13268,11 +15355,25 @@
+@@ -13268,11 +14466,25 @@
  	;;
      esac
      ;;
@@ -19125,7 +18520,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13283,9 +15384,9 @@
+@@ -13283,9 +14495,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -19137,7 +18532,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13294,16 +15395,16 @@
+@@ -13294,16 +14506,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -19158,7 +18553,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13321,20 +15422,44 @@
+@@ -13321,20 +14533,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -19209,7 +18604,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13362,7 +15487,7 @@
+@@ -13362,7 +14598,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -19218,7 +18613,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13372,7 +15497,7 @@
+@@ -13372,7 +14608,7 @@
  	;;
      esac
      ;;
@@ -19227,19 +18622,10 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13383,15 +15508,31 @@
+@@ -13383,15 +14619,31 @@
      # Workaround some broken pre-1.5 toolchains
      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
      ;;
--  osf3*)
--    case $cc_basename in
--      KCC)
--	# Kuck and Associates, Inc. (KAI) C++ Compiler
--
--	# KCC will only create a shared library if the output file
--	# ends with ".so" (or ".sl" for HP-UX), so rename the library
--	# to its proper name (with version) after linking.
--	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +  openbsd2*)
 +    # C++ shared libraries are fairly broken
 +    ld_shlibs_CXX=no
@@ -19256,19 +18642,21 @@
 +    fi
 +    output_verbose_link_cmd='echo'
 +    ;;
-+  osf3*)
-+    case $cc_basename in
+   osf3*)
+     case $cc_basename in
+-      KCC)
 +      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
+ 	# Kuck and Associates, Inc. (KAI) C++ Compiler
+ 
+ 	# KCC will only create a shared library if the output file
+ 	# ends with ".so" (or ".sl" for HP-UX), so rename the library
+ 	# to its proper name (with version) after linking.
+-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
 +	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13401,14 +15542,14 @@
+@@ -13401,14 +14653,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -19286,7 +18674,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13426,7 +15567,7 @@
+@@ -13426,7 +14678,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19295,7 +18683,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13445,13 +15586,13 @@
+@@ -13445,13 +14697,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -19311,7 +18699,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13460,17 +15601,17 @@
+@@ -13460,17 +14712,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -19333,7 +18721,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13489,7 +15630,7 @@
+@@ -13489,7 +14741,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19342,7 +18730,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13510,27 +15651,14 @@
+@@ -13510,27 +14762,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -19372,7 +18760,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13543,36 +15671,33 @@
+@@ -13543,36 +14782,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -19421,7 +18809,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13580,9 +15705,9 @@
+@@ -13580,9 +14816,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -19433,7 +18821,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13592,9 +15717,9 @@
+@@ -13592,9 +14828,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -19445,7 +18833,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13603,9 +15728,9 @@
+@@ -13603,9 +14839,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -19457,14 +18845,14 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13618,12 +15743,63 @@
+@@ -13618,12 +14854,63 @@
  	;;
      esac
      ;;
 -  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
 +  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +    no_undefined_flag_CXX='${wl}-z,text'
-+    archive_cmds_need_lc_CXX=no
+     archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    runpath_var='LD_RUN_PATH'
 +
@@ -19497,7 +18885,7 @@
 +    # names for shared libraries.
 +    no_undefined_flag_CXX='${wl}-z,text'
 +    allow_undefined_flag_CXX='${wl}-z,nodefs'
-     archive_cmds_need_lc_CXX=no
++    archive_cmds_need_lc_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    hardcode_libdir_flag_spec_CXX='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +    hardcode_libdir_separator_CXX=':'
@@ -19523,7 +18911,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13643,8 +15819,8 @@
+@@ -13643,8 +14930,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -19534,7 +18922,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13680,7 +15856,7 @@
+@@ -13680,7 +14967,7 @@
    # The `*' in the case matches for architectures that use `case' in
    # $output_verbose_cmd can trigger glob expansion during the loop
    # eval without this substitution.
@@ -19543,7 +18931,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13720,7 +15896,7 @@
+@@ -13720,7 +15007,7 @@
         fi
         ;;
  
@@ -19552,7 +18940,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13756,6 +15932,29 @@
+@@ -13756,6 +15043,29 @@
  
  $rm -f confest.$objext
  
@@ -19582,7 +18970,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13764,8 +15963,8 @@
+@@ -13764,8 +15074,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -19593,7 +18981,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13803,6 +16002,10 @@
+@@ -13803,6 +15113,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -19604,7 +18992,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13811,7 +16014,7 @@
+@@ -13811,7 +15125,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19613,7 +19001,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13836,18 +16039,28 @@
+@@ -13836,18 +15150,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -19645,7 +19033,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13855,22 +16068,22 @@
+@@ -13855,22 +15179,22 @@
  	    ;;
  	esac
  	;;
@@ -19674,7 +19062,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13883,9 +16096,13 @@
+@@ -13883,9 +15207,13 @@
  	    ;;
  	esac
  	;;
@@ -19689,7 +19077,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13894,20 +16111,26 @@
+@@ -13894,20 +15222,26 @@
  	    ;;
  	esac
  	;;
@@ -19720,7 +19108,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13924,25 +16147,25 @@
+@@ -13924,25 +15258,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -19751,7 +19139,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13956,24 +16179,15 @@
+@@ -13956,24 +15290,15 @@
  	;;
        psos*)
  	;;
@@ -19778,7 +19166,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13983,12 +16197,12 @@
+@@ -13983,12 +15308,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -19793,7 +19181,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13998,7 +16212,7 @@
+@@ -13998,7 +15323,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -19802,7 +19190,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14006,7 +16220,14 @@
+@@ -14006,7 +15331,14 @@
  	    ;;
  	esac
  	;;
@@ -19818,7 +19206,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14016,16 +16237,16 @@
+@@ -14016,16 +15348,16 @@
      esac
    fi
  
@@ -19839,7 +19227,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14039,26 +16260,28 @@
+@@ -14039,26 +15371,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -19848,12 +19236,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14045: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16266: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15377: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14049: \$? = $ac_status" >&5
-+   echo "$as_me:16270: \$? = $ac_status" >&5
++   echo "$as_me:15381: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -19875,7 +19263,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14071,7 +16294,7 @@
+@@ -14071,7 +15405,7 @@
  fi
  
  fi
@@ -19884,7 +19272,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14081,8 +16304,50 @@
+@@ -14081,8 +15415,50 @@
      ;;
  esac
  
@@ -19937,7 +19325,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14093,60 +16358,58 @@
+@@ -14093,60 +15469,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -19959,12 +19347,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14112: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16370: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15481: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14116: \$? = $ac_status" >&5
-+   echo "$as_me:16374: \$? = $ac_status" >&5
++   echo "$as_me:15485: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -20016,7 +19404,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -14156,8 +16419,8 @@
+@@ -14156,8 +15530,8 @@
    need_locks=no
  fi
  
@@ -20027,7 +19415,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14174,22 +16437,20 @@
+@@ -14174,22 +15548,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -20056,7 +19444,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14207,8 +16468,8 @@
+@@ -14207,8 +15579,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -20067,7 +19455,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14222,6 +16483,7 @@
+@@ -14222,6 +15594,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -20075,7 +19463,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14244,20 +16506,20 @@
+@@ -14244,20 +15617,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -20101,7 +19489,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14267,7 +16529,20 @@
+@@ -14267,7 +15640,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20123,7 +19511,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14332,7 +16607,7 @@
+@@ -14332,7 +15718,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20132,7 +19520,7 @@
    ;;
  
  beos*)
-@@ -14341,7 +16616,7 @@
+@@ -14341,7 +15727,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -20141,7 +19529,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14357,7 +16632,7 @@
+@@ -14357,7 +15743,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -20150,7 +19538,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14369,7 +16644,8 @@
+@@ -14369,7 +15755,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -20160,7 +19548,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14399,7 +16675,7 @@
+@@ -14399,7 +15786,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20169,7 +19557,7 @@
        ;;
      esac
      ;;
-@@ -14422,7 +16698,7 @@
+@@ -14422,7 +15809,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -20178,7 +19566,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -14445,20 +16721,17 @@
+@@ -14445,20 +15832,17 @@
    dynamic_linker=no
    ;;
  
@@ -20210,7 +19598,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14476,14 +16749,19 @@
+@@ -14476,14 +15860,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -20232,7 +19620,7 @@
    esac
    ;;
  
-@@ -14503,9 +16781,9 @@
+@@ -14503,9 +15892,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -20244,7 +19632,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14520,7 +16798,7 @@
+@@ -14520,7 +15909,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -20253,7 +19641,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14531,7 +16809,7 @@
+@@ -14531,7 +15920,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -20262,7 +19650,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14543,6 +16821,18 @@
+@@ -14543,6 +15932,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -20281,7 +19669,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14586,29 +16876,26 @@
+@@ -14586,29 +15987,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -20318,7 +19706,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -14618,6 +16905,18 @@
+@@ -14618,6 +16016,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -20337,7 +19725,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14627,7 +16926,7 @@
+@@ -14627,7 +16037,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -20346,7 +19734,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14655,8 +16954,13 @@
+@@ -14655,8 +16065,13 @@
  
  openbsd*)
    version_type=sunos
@@ -20361,7 +19749,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -14676,7 +16980,7 @@
+@@ -14676,7 +16091,7 @@
  
  os2*)
    libname_spec='$name'
@@ -20370,7 +19758,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14694,13 +16998,6 @@
+@@ -14694,13 +16109,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -20384,7 +19772,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14726,7 +17023,7 @@
+@@ -14726,7 +16134,7 @@
    need_version=yes
    ;;
  
@@ -20393,10 +19781,13 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -14759,6 +17056,29 @@
+@@ -14759,9 +16167,32 @@
    fi
    ;;
  
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -20420,10 +19811,13 @@
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
 +
- uts4*)
-   version_type=linux
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14770,16 +17090,21 @@
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+@@ -14770,16 +16201,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -20451,7 +19845,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14799,8 +17124,8 @@
+@@ -14799,8 +16235,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -20462,7 +19856,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14811,1258 +17136,436 @@
+@@ -14811,1223 +16247,398 @@
    enable_fast_install=needless
  fi
  
@@ -20494,7 +19888,7 @@
 -    ;;
 -  esac
 -fi
--
+ 
 -if test "x$enable_dlopen" != xyes; then
 -  enable_dlopen=unknown
 -  enable_dlopen_self=unknown
@@ -20502,24 +19896,110 @@
 -else
 -  lt_cv_dlopen=no
 -  lt_cv_dlopen_libs=
--
++# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
++  # Now quote all the things that may contain metacharacters while being
++  # careful not to overquote the AC_SUBSTed values.  We take copies of the
++  # variables and quote the copies for generation of the libtool script.
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
++    old_postinstall_cmds old_postuninstall_cmds \
++    compiler_CXX \
++    CC_CXX \
++    LD_CXX \
++    lt_prog_compiler_wl_CXX \
++    lt_prog_compiler_pic_CXX \
++    lt_prog_compiler_static_CXX \
++    lt_prog_compiler_no_builtin_flag_CXX \
++    export_dynamic_flag_spec_CXX \
++    thread_safe_flag_spec_CXX \
++    whole_archive_flag_spec_CXX \
++    enable_shared_with_static_runtimes_CXX \
++    old_archive_cmds_CXX \
++    old_archive_from_new_cmds_CXX \
++    predep_objects_CXX \
++    postdep_objects_CXX \
++    predeps_CXX \
++    postdeps_CXX \
++    compiler_lib_search_path_CXX \
++    archive_cmds_CXX \
++    archive_expsym_cmds_CXX \
++    postinstall_cmds_CXX \
++    postuninstall_cmds_CXX \
++    old_archive_from_expsyms_cmds_CXX \
++    allow_undefined_flag_CXX \
++    no_undefined_flag_CXX \
++    export_symbols_cmds_CXX \
++    hardcode_libdir_flag_spec_CXX \
++    hardcode_libdir_flag_spec_ld_CXX \
++    hardcode_libdir_separator_CXX \
++    hardcode_automatic_CXX \
++    module_cmds_CXX \
++    module_expsym_cmds_CXX \
++    lt_cv_prog_compiler_c_o_CXX \
++    exclude_expsyms_CXX \
++    include_expsyms_CXX; do
+ 
 -  case $host_os in
 -  beos*)
 -    lt_cv_dlopen="load_add_on"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
--    ;;
--
++    case $var in
++    old_archive_cmds_CXX | \
++    old_archive_from_new_cmds_CXX | \
++    archive_cmds_CXX | \
++    archive_expsym_cmds_CXX | \
++    module_cmds_CXX | \
++    module_expsym_cmds_CXX | \
++    old_archive_from_expsyms_cmds_CXX | \
++    export_symbols_cmds_CXX | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
++    postinstall_cmds | postuninstall_cmds | \
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
++  case $lt_echo in
++  *'\$0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
+     ;;
++  esac
+ 
 -  mingw* | pw32*)
 -    lt_cv_dlopen="LoadLibrary"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++cfgfile="$ofile"
+ 
 -  cygwin*)
 -    lt_cv_dlopen="dlopen"
 -    lt_cv_dlopen_libs=
 -   ;;
--
++  cat <<__EOF__ >> "$cfgfile"
++# ### BEGIN LIBTOOL TAG CONFIG: $tagname
+ 
 -  darwin*)
 -  # if libdl is installed we need to link against it
 -    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
@@ -20535,6 +20015,7 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -20577,63 +20058,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-+  # Now quote all the things that may contain metacharacters while being
-+  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-+  # variables and quote the copies for generation of the libtool script.
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    compiler_CXX \
-+    CC_CXX \
-+    LD_CXX \
-+    lt_prog_compiler_wl_CXX \
-+    lt_prog_compiler_pic_CXX \
-+    lt_prog_compiler_static_CXX \
-+    lt_prog_compiler_no_builtin_flag_CXX \
-+    export_dynamic_flag_spec_CXX \
-+    thread_safe_flag_spec_CXX \
-+    whole_archive_flag_spec_CXX \
-+    enable_shared_with_static_runtimes_CXX \
-+    old_archive_cmds_CXX \
-+    old_archive_from_new_cmds_CXX \
-+    predep_objects_CXX \
-+    postdep_objects_CXX \
-+    predeps_CXX \
-+    postdeps_CXX \
-+    compiler_lib_search_path_CXX \
-+    archive_cmds_CXX \
-+    archive_expsym_cmds_CXX \
-+    postinstall_cmds_CXX \
-+    postuninstall_cmds_CXX \
-+    old_archive_from_expsyms_cmds_CXX \
-+    allow_undefined_flag_CXX \
-+    no_undefined_flag_CXX \
-+    export_symbols_cmds_CXX \
-+    hardcode_libdir_flag_spec_CXX \
-+    hardcode_libdir_flag_spec_ld_CXX \
-+    hardcode_libdir_separator_CXX \
-+    hardcode_automatic_CXX \
-+    module_cmds_CXX \
-+    module_expsym_cmds_CXX \
-+    lt_cv_prog_compiler_c_o_CXX \
-+    exclude_expsyms_CXX \
-+    include_expsyms_CXX; do
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -20646,43 +20072,22 @@
 -if test $ac_cv_lib_dl_dlopen = yes; then
 -  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 -else
-+    case $var in
-+    old_archive_cmds_CXX | \
-+    old_archive_from_new_cmds_CXX | \
-+    archive_cmds_CXX | \
-+    archive_expsym_cmds_CXX | \
-+    module_cmds_CXX | \
-+    module_expsym_cmds_CXX | \
-+    old_archive_from_expsyms_cmds_CXX | \
-+    export_symbols_cmds_CXX | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
  
 -    lt_cv_dlopen="dyld"
 -    lt_cv_dlopen_libs=
 -    lt_cv_dlopen_self=yes
-+  case $lt_echo in
-+  *'\$0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-+    ;;
-+  esac
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
  
 -fi
-+cfgfile="$ofile"
++# Whether or not to add -lc for building shared libraries.
++build_libtool_need_lc=$archive_cmds_need_lc_CXX
  
 -   ;;
-+  cat <<__EOF__ >> "$cfgfile"
-+# ### BEGIN LIBTOOL TAG CONFIG: $tagname
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
  
 -  *)
 -    echo "$as_me:$LINENO: checking for shl_load" >&5
@@ -20699,26 +20104,31 @@
 -/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define shl_load innocuous_shl_load
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char shl_load (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
++# The host system.
++host_alias=$host_alias
++host=$host
++host_os=$host_os
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
  
 -#undef shl_load
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -20739,8 +20149,9 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# Whether or not to add -lc for building shared libraries.
-+build_libtool_need_lc=$archive_cmds_need_lc_CXX
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
  
 -int
 -main ()
@@ -20776,8 +20187,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
++# A C compiler.
++LTCC=$lt_LTCC
  
 -ac_cv_func_shl_load=no
 -fi
@@ -20802,8 +20213,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -20846,10 +20257,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# The host system.
-+host_alias=$host_alias
-+host=$host
-+host_os=$host_os
++# A language-specific compiler.
++CC=$lt_compiler_CXX
  
 -ac_cv_lib_dld_shl_load=no
 -fi
@@ -20876,30 +20285,27 @@
 -/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
 -   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 -#define dlopen innocuous_dlopen
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
++# Is the compiler the GNU C compiler?
++with_gcc=$GCC_CXX
  
 -/* System header to define __stub macros and hopefully few prototypes,
 -    which can conflict with char dlopen (); below.
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
++# An ERE matcher.
++EGREP=$lt_EGREP
  
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
++# The linker used to build libraries.
++LD=$lt_LD_CXX
  
 -#undef dlopen
-+# A C compiler.
-+LTCC=$lt_LTCC
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -20920,8 +20326,8 @@
 -#ifdef __cplusplus
 -}
 -#endif
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
++# A BSD-compatible nm program.
++NM=$lt_NM
  
 -int
 -main ()
@@ -20957,8 +20363,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A language-specific compiler.
-+CC=$lt_compiler_CXX
++# A symbol stripping program
++STRIP=$lt_STRIP
  
 -ac_cv_func_dlopen=no
 -fi
@@ -20983,8 +20389,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC_CXX
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -21027,8 +20433,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# An ERE matcher.
-+EGREP=$lt_EGREP
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
  
 -ac_cv_lib_dl_dlopen=no
 -fi
@@ -21054,8 +20460,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# The linker used to build libraries.
-+LD=$lt_LD_CXX
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -21098,8 +20504,8 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
++# Used on cygwin: assembler.
++AS="$AS"
  
 -ac_cv_lib_svld_dlopen=no
 -fi
@@ -21125,8 +20531,8 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+# A BSD-compatible nm program.
-+NM=$lt_NM
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -21169,8 +20575,9 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+# A symbol stripping program
-+STRIP=$lt_STRIP
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
  
 -ac_cv_lib_dld_dld_link=no
 -fi
@@ -21183,28 +20590,6 @@
 -if test $ac_cv_lib_dld_dld_link = yes; then
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
- 
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
- 
--fi
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
- 
-+# Used on cygwin: assembler.
-+AS="$AS"
- 
--fi
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
- 
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
- 
--fi
 +# How to pass a linker flag through the compiler.
 +wl=$lt_lt_prog_compiler_wl_CXX
  
@@ -21222,36 +20607,57 @@
 +# Executable file suffix (normally "").
 +exeext="$exeext"
  
--    ;;
--  esac
 +# Additional compiler flags for building library objects.
 +pic_flag=$lt_lt_prog_compiler_pic_CXX
 +pic_mode=$pic_mode
  
+-fi
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
+ 
+-fi
++# Must we lock files when doing compilation?
++need_locks=$lt_need_locks
+ 
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
+ 
+-fi
++# Do we need a version for libraries?
++need_version=$need_version
+ 
+-    ;;
+-  esac
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
+ 
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
 -  else
 -    enable_dlopen=no
 -  fi
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
  
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
 -    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
  
 -    save_LDFLAGS="$LDFLAGS"
 -    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
++# Compiler flag to prevent dynamic linking.
++link_static_flag=$lt_lt_prog_compiler_static_CXX
  
 -    save_LIBS="$LIBS"
 -    LIBS="$lt_cv_dlopen_libs $LIBS"
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
++# Compiler flag to turn off builtin functions.
++no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
  
 -    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
@@ -21266,18 +20672,18 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 15448 "configure"
 -#include "confdefs.h"
-+# Do we need a version for libraries?
-+need_version=$need_version
++# Compiler flag to allow reflexive dlopens.
++export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
++# Compiler flag to generate shared objects directly from archives.
++whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
  
 -#include <stdio.h>
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
++# Compiler flag to generate thread-safe objects.
++thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -21288,8 +20694,8 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
++# Library versioning type.
++version_type=$version_type
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -21312,22 +20718,23 @@
 -#    endif
 -#  endif
 -#endif
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_lt_prog_compiler_static_CXX
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
  
 -  if (self)
 -    {
@@ -21335,8 +20742,11 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
++old_archive_cmds=$lt_old_archive_cmds_CXX
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
  
 -    exit (status);
 -}
@@ -21359,17 +20769,20 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
++# Create an old-style archive from a shared archive.
++old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
  
-+# Library versioning type.
-+version_type=$version_type
++# Create a temporary old-style archive to link instead of a shared archive.
++old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
++# Commands used to build and install a shared archive.
++archive_cmds=$lt_archive_cmds_CXX
++archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
  
 -    if test "x$lt_cv_dlopen_self" = xyes; then
 -      LDFLAGS="$LDFLAGS $link_static_flag"
@@ -21386,22 +20799,21 @@
 -  cat > conftest.$ac_ext <<EOF
 -#line 15546 "configure"
 -#include "confdefs.h"
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_module_cmds_CXX
++module_expsym_cmds=$lt_module_expsym_cmds_CXX
  
 -#if HAVE_DLFCN_H
 -#include <dlfcn.h>
 -#endif
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
  
 -#include <stdio.h>
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds_CXX
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_predep_objects_CXX
  
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
@@ -21412,8 +20824,9 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_postdep_objects_CXX
  
 -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
 -   find out it does not work in some platform. */
@@ -21436,26 +20849,25 @@
 -#    endif
 -#  endif
 -#endif
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_predeps_CXX
  
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds_CXX
-+archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_postdeps_CXX
  
 -void fnord() { int i=42;}
 -int main ()
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_module_cmds_CXX
-+module_expsym_cmds=$lt_module_expsym_cmds_CXX
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
  
 -  if (self)
 -    {
@@ -21463,9 +20875,8 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
  
 -    exit (status);
 -}
@@ -21488,49 +20899,44 @@
 -  fi
 -fi
 -rm -fr conftest*
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_predep_objects_CXX
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
  
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_postdep_objects_CXX
++# Flag that allows shared libraries with undefined symbols to be built.
++allow_undefined_flag=$lt_allow_undefined_flag_CXX
  
 -fi
 -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
 -    fi
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_predeps_CXX
++# Flag that forces no undefined symbols.
++no_undefined_flag=$lt_no_undefined_flag_CXX
  
 -    CPPFLAGS="$save_CPPFLAGS"
 -    LDFLAGS="$save_LDFLAGS"
 -    LIBS="$save_LIBS"
 -    ;;
 -  esac
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_postdeps_CXX
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
  
 -  case $lt_cv_dlopen_self in
 -  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
 -  *) enable_dlopen_self=unknown ;;
 -  esac
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
  
 -  case $lt_cv_dlopen_self_static in
 -  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
 -  *) enable_dlopen_self_static=unknown ;;
 -  esac
 -fi
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
++# Take the output of nm and produce a listing of raw symbols and C names.
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
  
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
++# Transform the output of nm in a proper C declaration
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
  
 -# The else clause should only fire when bootstrapping the
 -# libtool distribution, otherwise you forgot to ship ltmain.sh
@@ -21588,8 +20994,8 @@
 -    lt_cv_prog_compiler_c_o_CXX \
 -    exclude_expsyms_CXX \
 -    include_expsyms_CXX; do
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag_CXX
++# Transform the output of nm in a C name address pair
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
  
 -    case $var in
 -    old_archive_cmds_CXX | \
@@ -21612,204 +21018,164 @@
 -      ;;
 -    esac
 -  done
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag_CXX
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
  
 -  case $lt_echo in
 -  *'\$0 --fallback-echo"')
 -    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 -    ;;
 -  esac
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
  
 -cfgfile="$ofile"
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
  
 -  cat <<__EOF__ >> "$cfgfile"
 -# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
++# How to hardcode a shared library path into an executable.
++hardcode_action=$hardcode_action_CXX
  
 -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
  
 -# Shell to use when invoking shell scripts.
 -SHELL=$lt_SHELL
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
++hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
  
 -# Whether or not to build shared libraries.
 -build_libtool_libs=$enable_shared
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
  
 -# Whether or not to build static libraries.
 -build_old_libs=$enable_static
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
++# Whether we need a single -rpath flag with a separated argument.
++hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
  
 -# Whether or not to add -lc for building shared libraries.
 -build_libtool_need_lc=$archive_cmds_need_lc_CXX
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
++# resulting binary.
++hardcode_direct=$hardcode_direct_CXX
  
 -# Whether or not to disallow shared libs when runtime libs are static
 -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action_CXX
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
++hardcode_minus_L=$hardcode_minus_L_CXX
  
 -# Whether or not to optimize for fast installation.
 -fast_install=$enable_fast_install
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
++hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
  
 -# The host system.
 -host_alias=$host_alias
 -host=$host
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$hardcode_automatic_CXX
  
 -# An echo program that does not interpret backslashes.
 -echo=$lt_echo
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
  
 -# The archiver.
 -AR=$lt_AR
 -AR_FLAGS=$lt_AR_FLAGS
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
++# Whether libtool must link a program against all its dependency libraries.
++link_all_deplibs=$link_all_deplibs_CXX
  
 -# A C compiler.
 -LTCC=$lt_LTCC
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct_CXX
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
  
 -# A language-specific compiler.
 -CC=$lt_compiler_CXX
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L_CXX
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
  
 -# Is the compiler the GNU C compiler?
 -with_gcc=$GCC_CXX
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path="$fix_srcfile_path_CXX"
  
 -# An ERE matcher.
 -EGREP=$lt_EGREP
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$hardcode_automatic_CXX
++# Set to yes if exported symbols are required.
++always_export_symbols=$always_export_symbols_CXX
  
 -# The linker used to build libraries.
 -LD=$lt_LD_CXX
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
++# The commands to list exported symbols.
++export_symbols_cmds=$lt_export_symbols_cmds_CXX
  
 -# Whether we need hard or soft links.
 -LN_S=$lt_LN_S
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs_CXX
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
  
 -# A BSD-compatible nm program.
 -NM=$lt_NM
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++# Symbols that should not be listed in the preloaded symbols.
++exclude_expsyms=$lt_exclude_expsyms_CXX
  
 -# A symbol stripping program
 -STRIP=$STRIP
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
+-
 -# Used to examine libraries when file_magic_cmd begins "file"
 -MAGIC_CMD=$MAGIC_CMD
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
- 
+-
 -# Used on cygwin: DLL creation program.
 -DLLTOOL="$DLLTOOL"
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols_CXX
- 
+-
 -# Used on cygwin: object dumper.
 -OBJDUMP="$OBJDUMP"
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds_CXX
- 
+-
 -# Used on cygwin: assembler.
 -AS="$AS"
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
+-
 -# The name of the directory that contains temporary libtool files.
 -objdir=$objdir
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms_CXX
- 
+-
 -# How to create reloadable object files.
 -reload_flag=$lt_reload_flag
 -reload_cmds=$lt_reload_cmds
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms_CXX
- 
+-
 -# How to pass a linker flag through the compiler.
 -wl=$lt_lt_prog_compiler_wl_CXX
-+# ### END LIBTOOL TAG CONFIG: $tagname
- 
+-
 -# Object file suffix (normally "o").
 -objext="$ac_objext"
-+__EOF__
- 
+-
 -# Old archive suffix (normally "a").
 -libext="$libext"
- 
+-
 -# Shared library suffix (normally ".so").
 -shrext='$shrext'
-+else
-+  # If there is no Makefile yet, we rely on a make rule to execute
-+  # `config.status --recheck' to rerun these tests and create the
-+  # libtool script then.
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
-+fi
- 
+-
 -# Executable file suffix (normally "").
 -exeext="$exeext"
- 
+-
 -# Additional compiler flags for building library objects.
 -pic_flag=$lt_lt_prog_compiler_pic_CXX
 -pic_mode=$pic_mode
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
+-
 -# What is the maximum length of a command?
 -max_cmd_len=$lt_cv_sys_max_cmd_len
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
- 
+-
 -# Does compiler simultaneously support -c and -o options?
 -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
 -
@@ -22005,49 +21371,24 @@
 -
 -# Symbols that must always be exported.
 -include_expsyms=$lt_include_expsyms_CXX
--
--# ### END LIBTOOL TAG CONFIG: $tagname
--
--__EOF__
--
--
--else
--  # If there is no Makefile yet, we rely on a make rule to execute
--  # `config.status --recheck' to rerun these tests and create the
--  # libtool script then.
++# Symbols that must always be exported.
++include_expsyms=$lt_include_expsyms_CXX
+ 
+ # ### END LIBTOOL TAG CONFIG: $tagname
+ 
+@@ -16038,7 +16649,10 @@
+   # If there is no Makefile yet, we rely on a make rule to execute
+   # `config.status --recheck' to rerun these tests and create the
+   # libtool script then.
 -  test -f Makefile && make "$ltmain"
--fi
--
--
--ac_ext=c
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
--CC=$lt_save_CC
--LDCXX=$LD
--LD=$lt_save_LD
--GCC=$lt_save_GCC
--with_gnu_ldcxx=$with_gnu_ld
--with_gnu_ld=$lt_save_with_gnu_ld
--lt_cv_path_LDCXX=$lt_cv_path_LD
--lt_cv_path_LD=$lt_save_path_LD
--lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
--lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
--
--	else
--	  tagname=""
--	fi
--	;;
-+	else
-+	  tagname=""
-+	fi
-+	;;
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
  
-       F77)
- 	if test -n "$F77" && test "X$F77" != "Xno"; then
-@@ -16110,29 +17613,55 @@
+ 
+@@ -16110,29 +16724,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -22087,19 +21428,19 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++
  
 -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
 -echo "$as_me:$LINENO: result: $can_build_shared" >&5
 -echo "${ECHO_T}$can_build_shared" >&6
- 
--echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
--echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
 +echo "${ECHO_T}$can_build_shared" >&6; }
-+
+ 
+-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
  test "$can_build_shared" = "no" && enable_shared=no
@@ -22111,7 +21452,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16140,21 +17669,21 @@
+@@ -16140,21 +16780,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -22143,7 +21484,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16163,8 +17692,8 @@
+@@ -16163,8 +16803,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -22154,7 +21495,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16202,6 +17731,11 @@
+@@ -16202,6 +16842,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -22166,7 +21507,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16218,7 +17752,7 @@
+@@ -16218,7 +16863,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22175,7 +21516,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16244,6 +17778,16 @@
+@@ -16244,6 +16889,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -22192,7 +21533,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16255,7 +17799,7 @@
+@@ -16255,7 +16910,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22201,7 +21542,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16278,13 +17822,20 @@
+@@ -16278,15 +16933,22 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -22214,6 +21555,8 @@
  	lt_prog_compiler_pic_F77='-KPIC'
  	lt_prog_compiler_static_F77='-static'
          ;;
+-      ccc*)
+-        lt_prog_compiler_wl_F77='-Wl,'
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -22221,10 +21564,12 @@
 +	lt_prog_compiler_pic_F77='-fpic'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +        ;;
-       ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
++      ccc*)
++        lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16299,15 +17850,15 @@
+         lt_prog_compiler_static_F77='-non_shared'
+         ;;
+@@ -16299,15 +16961,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -22246,7 +21591,7 @@
        ;;
  
      sunos4*)
-@@ -16316,7 +17867,7 @@
+@@ -16316,7 +16978,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -22255,32 +21600,25 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16329,27 +17880,38 @@
+@@ -16329,6 +16991,17 @@
        fi
        ;;
  
--    uts4*)
--      lt_prog_compiler_pic_F77='-pic'
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_pic_F77='-KPIC'
-       lt_prog_compiler_static_F77='-Bstatic'
-       ;;
- 
--    *)
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
 +    unicos*)
 +      lt_prog_compiler_wl_F77='-Wl,'
 +      lt_prog_compiler_can_build_shared_F77=no
 +      ;;
 +
-+    uts4*)
-+      lt_prog_compiler_pic_F77='-pic'
-+      lt_prog_compiler_static_F77='-Bstatic'
-+      ;;
-+
-+    *)
-       lt_prog_compiler_can_build_shared_F77=no
-       ;;
+     uts4*)
+       lt_prog_compiler_pic_F77='-pic'
+       lt_prog_compiler_static_F77='-Bstatic'
+@@ -16340,16 +17013,16 @@
      esac
    fi
  
@@ -22301,7 +21639,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16363,26 +17925,28 @@
+@@ -16363,26 +17036,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -22310,12 +21648,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16369: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17931: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17042: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16373: \$? = $ac_status" >&5
-+   echo "$as_me:17935: \$? = $ac_status" >&5
++   echo "$as_me:17046: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -22337,7 +21675,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16395,7 +17959,7 @@
+@@ -16395,7 +17070,7 @@
  fi
  
  fi
@@ -22346,7 +21684,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16405,8 +17969,50 @@
+@@ -16405,8 +17080,50 @@
      ;;
  esac
  
@@ -22399,7 +21737,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16417,60 +18023,58 @@
+@@ -16417,60 +17134,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22421,12 +21759,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16436: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18035: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17146: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16440: \$? = $ac_status" >&5
-+   echo "$as_me:18039: \$? = $ac_status" >&5
++   echo "$as_me:17150: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -22478,7 +21816,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -16480,8 +18084,8 @@
+@@ -16480,8 +17195,8 @@
    need_locks=no
  fi
  
@@ -22489,7 +21827,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16519,6 +18123,16 @@
+@@ -16519,6 +17234,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22506,7 +21844,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16529,6 +18143,10 @@
+@@ -16529,6 +17254,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22517,7 +21855,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16539,6 +18157,27 @@
+@@ -16539,6 +17268,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22545,7 +21883,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16576,7 +18215,7 @@
+@@ -16576,7 +17326,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22554,7 +21892,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16586,13 +18225,13 @@
+@@ -16586,13 +17336,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -22571,7 +21909,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16601,23 +18240,70 @@
+@@ -16601,23 +17351,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -22648,7 +21986,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16631,13 +18317,40 @@
+@@ -16631,13 +17428,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22691,7 +22029,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16647,24 +18360,19 @@
+@@ -16647,24 +17471,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22723,7 +22061,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16676,7 +18384,7 @@
+@@ -16676,7 +17495,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -22732,7 +22070,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16698,9 +18406,21 @@
+@@ -16698,9 +17517,21 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -22756,7 +22094,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16717,7 +18437,7 @@
+@@ -16717,7 +17548,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -22765,7 +22103,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -16736,8 +18456,12 @@
+@@ -16736,8 +17567,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -22778,7 +22116,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16745,45 +18469,58 @@
+@@ -16745,48 +17580,45 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -22825,34 +22163,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_f77_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16797,19 +18534,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -16797,19 +17629,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22878,7 +22211,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16818,24 +18556,36 @@
+@@ -16818,27 +17651,23 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -22896,34 +22229,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_f77_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -16849,8 +18599,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -16849,8 +17678,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -22935,7 +22263,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16859,13 +18611,11 @@
+@@ -16859,13 +17690,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -22952,7 +22280,7 @@
  	fi
        fi
        ;;
-@@ -16878,7 +18628,7 @@
+@@ -16878,7 +17707,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -22961,7 +22289,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16888,68 +18638,68 @@
+@@ -16888,68 +17717,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -23074,7 +22402,7 @@
      fi
        ;;
  
-@@ -16983,8 +18733,8 @@
+@@ -16983,8 +17812,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23085,7 +22413,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16992,7 +18742,7 @@
+@@ -16992,7 +17821,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -23094,7 +22422,7 @@
        else
  	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -17006,47 +18756,62 @@
+@@ -17006,47 +17835,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -23163,25 +22491,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
 -	  hardcode_libdir_separator_F77=:
- 	  hardcode_direct_F77=no
- 	  hardcode_shlibpath_var_F77=no
- 	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_F77='-L$libdir'
 -	  hardcode_direct_F77=no
 -	  hardcode_shlibpath_var_F77=no
+-	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_F77='-L$libdir'
+ 	  hardcode_direct_F77=no
+ 	  hardcode_shlibpath_var_F77=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_F77=yes
--	  ;;
+ 	  ;;
  	*)
 -	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_F77=:
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17060,7 +18825,7 @@
+@@ -17060,7 +17904,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -23190,7 +22518,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -17070,7 +18835,7 @@
+@@ -17070,7 +17914,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -23199,7 +22527,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -17093,7 +18858,8 @@
+@@ -17093,7 +17937,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -23209,7 +22537,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17103,7 +18869,7 @@
+@@ -17103,7 +17948,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -23218,7 +22546,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17114,14 +18880,14 @@
+@@ -17114,14 +17959,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -23235,7 +22563,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -17133,13 +18899,13 @@
+@@ -17133,13 +17978,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -23251,7 +22579,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17147,21 +18913,15 @@
+@@ -17147,21 +17992,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -23277,7 +22605,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -17170,8 +18930,18 @@
+@@ -17170,8 +18009,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23298,7 +22626,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17180,7 +18950,7 @@
+@@ -17180,7 +18029,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -23307,7 +22635,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17228,36 +18998,45 @@
+@@ -17228,36 +18077,45 @@
        fi
        ;;
  
@@ -23374,7 +22702,7 @@
        ;;
  
      uts4*)
-@@ -17272,15 +19051,10 @@
+@@ -17272,15 +18130,10 @@
      esac
    fi
  
@@ -23392,7 +22720,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17298,8 +19072,8 @@
+@@ -17298,8 +18151,8 @@
        # Test whether the compiler implicitly links with -lc since on some
        # systems, -lgcc has to come before -lc. If gcc already passes -lc
        # to ld, don't add -lc before -lgcc.
@@ -23403,7 +22731,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17313,6 +19087,7 @@
+@@ -17313,6 +18166,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -23411,7 +22739,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17335,20 +19110,20 @@
+@@ -17335,20 +18189,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -23437,7 +22765,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17358,7 +19133,20 @@
+@@ -17358,7 +18212,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23459,7 +22787,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17423,7 +19211,7 @@
+@@ -17423,7 +18290,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23468,7 +22796,7 @@
    ;;
  
  beos*)
-@@ -17432,7 +19220,7 @@
+@@ -17432,7 +18299,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -23477,7 +22805,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17448,7 +19236,7 @@
+@@ -17448,7 +18315,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -23486,7 +22814,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17460,7 +19248,8 @@
+@@ -17460,7 +18327,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -23496,7 +22824,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17490,7 +19279,7 @@
+@@ -17490,7 +18358,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23505,7 +22833,7 @@
        ;;
      esac
      ;;
-@@ -17513,7 +19302,7 @@
+@@ -17513,7 +18381,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -23514,7 +22842,7 @@
    # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
    if test "$GCC" = yes; then
      sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-@@ -17536,20 +19325,17 @@
+@@ -17536,20 +18404,17 @@
    dynamic_linker=no
    ;;
  
@@ -23546,7 +22874,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17567,14 +19353,19 @@
+@@ -17567,14 +18432,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -23568,7 +22896,7 @@
    esac
    ;;
  
-@@ -17594,9 +19385,9 @@
+@@ -17594,9 +18464,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -23580,7 +22908,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17611,7 +19402,7 @@
+@@ -17611,7 +18481,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -23589,7 +22917,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17622,7 +19413,7 @@
+@@ -17622,7 +18492,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -23598,7 +22926,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17634,6 +19425,18 @@
+@@ -17634,6 +18504,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -23617,7 +22945,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17677,29 +19480,26 @@
+@@ -17677,29 +18559,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -23654,7 +22982,7 @@
    # We used to test for /lib/ld.so.1 and disable shared libraries on
    # powerpc, because MkLinux only supported shared libraries with the
    # GNU dynamic linker.  Since this was broken with cross compilers,
-@@ -17709,6 +19509,18 @@
+@@ -17709,6 +18588,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -23673,7 +23001,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17718,7 +19530,7 @@
+@@ -17718,7 +18609,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -23682,7 +23010,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17746,8 +19558,13 @@
+@@ -17746,8 +18637,13 @@
  
  openbsd*)
    version_type=sunos
@@ -23697,7 +23025,7 @@
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH
-@@ -17767,7 +19584,7 @@
+@@ -17767,7 +18663,7 @@
  
  os2*)
    libname_spec='$name'
@@ -23706,7 +23034,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17785,13 +19602,6 @@
+@@ -17785,13 +18681,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -23720,7 +23048,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17817,7 +19627,7 @@
+@@ -17817,7 +18706,7 @@
    need_version=yes
    ;;
  
@@ -23729,25 +23057,17 @@
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
    soname_spec='${libname}${release}${shared_ext}$major'
-@@ -17850,27 +19660,55 @@
+@@ -17850,6 +18739,29 @@
    fi
    ;;
  
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-   soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
--  ;;
--
--*)
--  dynamic_linker=no
--  ;;
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
 +  hardcode_into_libs=yes
 +  if test "$with_gnu_ld" = yes; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -23764,16 +23084,12 @@
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
 +
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
+ uts4*)
+   version_type=linux
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -17861,16 +18773,21 @@
+   dynamic_linker=no
+   ;;
  esac
 -echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 -echo "${ECHO_T}$dynamic_linker" >&6
@@ -23799,7 +23115,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17890,8 +19728,8 @@
+@@ -17890,8 +18807,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -23810,7 +23126,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17902,36 +19740,6 @@
+@@ -17902,36 +18819,6 @@
    enable_fast_install=needless
  fi
  
@@ -23847,7 +23163,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17946,7 +19754,8 @@
+@@ -17946,7 +18833,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -23857,7 +23173,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18046,6 +19855,12 @@
+@@ -18046,6 +18934,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -23870,7 +23186,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18057,6 +19872,9 @@
+@@ -18057,6 +18951,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -23880,7 +23196,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18076,7 +19894,7 @@
+@@ -18076,7 +18973,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -23889,7 +23205,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18107,7 +19925,7 @@
+@@ -18107,7 +19004,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -23898,7 +23214,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18122,7 +19940,7 @@
+@@ -18122,7 +19019,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -23907,7 +23223,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18324,7 +20142,10 @@
+@@ -18324,7 +19221,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -23919,7 +23235,7 @@
  fi
  
  
-@@ -18345,7 +20166,6 @@
+@@ -18345,7 +19245,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -23927,7 +23243,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18357,26 +20177,55 @@
+@@ -18357,26 +19256,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -23984,7 +23300,7 @@
  ## CAVEAT EMPTOR:
  ## There is no encapsulation within the following macros, do not change
  ## the running order or otherwise move them around unless you know exactly
-@@ -18388,8 +20237,8 @@
+@@ -18388,8 +19316,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -23995,7 +23311,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18403,26 +20252,28 @@
+@@ -18403,26 +19331,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -24004,12 +23320,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18409: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20258: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19337: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18413: \$? = $ac_status" >&5
-+   echo "$as_me:20262: \$? = $ac_status" >&5
++   echo "$as_me:19341: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -24031,7 +23347,7 @@
  
  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
      lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-@@ -18436,8 +20287,8 @@
+@@ -18436,8 +19366,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -24042,7 +23358,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18475,6 +20326,11 @@
+@@ -18475,6 +19405,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -24054,7 +23370,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18491,7 +20347,7 @@
+@@ -18491,7 +19426,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -24063,7 +23379,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18517,6 +20373,16 @@
+@@ -18517,6 +19452,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -24080,7 +23396,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18528,7 +20394,7 @@
+@@ -18528,7 +19473,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -24089,7 +23405,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18551,13 +20417,20 @@
+@@ -18551,13 +19496,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -24112,7 +23428,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18572,15 +20445,15 @@
+@@ -18572,15 +19524,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -24134,7 +23450,7 @@
        ;;
  
      sunos4*)
-@@ -18589,7 +20462,7 @@
+@@ -18589,7 +19541,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -24143,7 +23459,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18602,6 +20475,17 @@
+@@ -18602,6 +19554,17 @@
        fi
        ;;
  
@@ -24161,7 +23477,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18613,16 +20497,16 @@
+@@ -18613,16 +19576,16 @@
      esac
    fi
  
@@ -24182,7 +23498,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18636,26 +20520,28 @@
+@@ -18636,26 +19599,28 @@
     # with a dollar sign (not a hyphen), so the echo should work correctly.
     # The option is referenced via a variable to avoid confusing sed.
     lt_compile=`echo "$ac_compile" | $SED \
@@ -24191,12 +23507,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18642: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20526: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19605: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18646: \$? = $ac_status" >&5
-+   echo "$as_me:20530: \$? = $ac_status" >&5
++   echo "$as_me:19609: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -24218,7 +23534,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18668,7 +20554,7 @@
+@@ -18668,7 +19633,7 @@
  fi
  
  fi
@@ -24227,7 +23543,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18678,8 +20564,50 @@
+@@ -18678,8 +19643,50 @@
      ;;
  esac
  
@@ -24280,7 +23596,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18690,60 +20618,58 @@
+@@ -18690,60 +19697,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -24302,12 +23618,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18709: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20630: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19709: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18713: \$? = $ac_status" >&5
-+   echo "$as_me:20634: \$? = $ac_status" >&5
++   echo "$as_me:19713: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -24359,7 +23675,7 @@
    if test "$hard_links" = no; then
      { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-@@ -18753,8 +20679,8 @@
+@@ -18753,8 +19758,8 @@
    need_locks=no
  fi
  
@@ -24370,7 +23686,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18792,6 +20718,16 @@
+@@ -18792,6 +19797,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -24387,7 +23703,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18802,6 +20738,10 @@
+@@ -18802,6 +19817,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -24398,7 +23714,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18812,6 +20752,27 @@
+@@ -18812,6 +19831,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -24426,7 +23742,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18849,7 +20810,7 @@
+@@ -18849,7 +19889,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -24435,7 +23751,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18859,13 +20820,13 @@
+@@ -18859,13 +19899,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -24452,7 +23768,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18874,23 +20835,70 @@
+@@ -18874,23 +19914,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -24529,7 +23845,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18904,13 +20912,40 @@
+@@ -18904,13 +19991,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -24572,7 +23888,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18920,24 +20955,19 @@
+@@ -18920,24 +20034,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -24604,7 +23920,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18949,7 +20979,7 @@
+@@ -18949,7 +20058,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -24613,7 +23929,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18971,9 +21001,21 @@
+@@ -18971,9 +20080,21 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -24637,7 +23953,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18990,7 +21032,7 @@
+@@ -18990,7 +20111,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -24646,7 +23962,7 @@
  	# We only want to do this on AIX 4.2 and lower, the check
  	# below for broken collect2 doesn't work under 4.3+
  	  collect2name=`${CC} -print-prog-name=collect2`
-@@ -19009,8 +21051,12 @@
+@@ -19009,8 +20130,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -24659,7 +23975,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19018,22 +21064,23 @@
+@@ -19018,22 +20143,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -24690,7 +24006,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19049,24 +21096,36 @@
+@@ -19049,27 +20175,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24708,34 +24024,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19080,19 +21139,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -19080,19 +20202,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24761,7 +24072,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19111,24 +21171,36 @@
+@@ -19111,27 +20234,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -24779,34 +24090,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -19142,8 +21214,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+ 
+ aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
+ }'`
+@@ -19142,8 +20261,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -24818,7 +24124,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19152,13 +21226,11 @@
+@@ -19152,13 +20273,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -24835,7 +24141,7 @@
  	fi
        fi
        ;;
-@@ -19171,7 +21243,7 @@
+@@ -19171,7 +20290,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -24844,7 +24150,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19181,68 +21253,68 @@
+@@ -19181,68 +20300,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -24957,7 +24263,7 @@
      fi
        ;;
  
-@@ -19276,8 +21348,8 @@
+@@ -19276,8 +20395,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -24968,7 +24274,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19285,7 +21357,7 @@
+@@ -19285,7 +20404,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -24977,7 +24283,7 @@
        else
  	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
        fi
-@@ -19299,47 +21371,62 @@
+@@ -19299,47 +20418,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -25064,7 +24370,7 @@
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19353,7 +21440,7 @@
+@@ -19353,7 +20487,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -25073,7 +24379,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19363,7 +21450,7 @@
+@@ -19363,7 +20497,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -25082,7 +24388,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19386,7 +21473,8 @@
+@@ -19386,7 +20520,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -25092,7 +24398,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19396,7 +21484,7 @@
+@@ -19396,7 +20531,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -25101,7 +24407,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19407,14 +21495,14 @@
+@@ -19407,14 +20542,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -25118,7 +24424,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -19426,13 +21514,13 @@
+@@ -19426,13 +20561,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -25134,7 +24440,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19440,21 +21528,15 @@
+@@ -19440,21 +20575,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -25160,7 +24466,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-@@ -19463,8 +21545,18 @@
+@@ -19463,8 +20592,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -25181,7 +24487,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19473,7 +21565,7 @@
+@@ -19473,7 +20612,7 @@
        if test "x$host_vendor" = xsequent; then
  	# Use $CC to link under sequent, because it throws in some extra .o
  	# files that make .init and .fini sections work.
@@ -25190,7 +24496,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19521,1513 +21613,746 @@
+@@ -19521,39 +20660,48 @@
        fi
        ;;
  
@@ -25198,22 +24504,30 @@
 -      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 -      hardcode_direct_GCJ=yes
 -      hardcode_minus_L_GCJ=no
--      hardcode_shlibpath_var_GCJ=no
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++      no_undefined_flag_GCJ='${wl}-z,text'
++      archive_cmds_need_lc_GCJ=no
+       hardcode_shlibpath_var_GCJ=no
 -      hardcode_runpath_var=yes
 -      runpath_var=LD_RUN_PATH
 -      ;;
--
++      runpath_var='LD_RUN_PATH'
+ 
 -   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
 -      no_undefined_flag_GCJ='${wl}-z ${wl}text'
--      if test "$GCC" = yes; then
+       if test "$GCC" = yes; then
 -	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--      else
++	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       else
 -	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
--      fi
++	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+       fi
 -      runpath_var='LD_RUN_PATH'
 -      hardcode_shlibpath_var_GCJ=no
--      ;;
--
+       ;;
+ 
 -    sysv5*)
 -      no_undefined_flag_GCJ=' -z text'
 -      # $CC -shared without GNU ld will not create a library from C++
@@ -25222,38 +24536,57 @@
 -      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
 -  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
 -      hardcode_libdir_flag_spec_GCJ=
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
 +      no_undefined_flag_GCJ='${wl}-z,text'
++      allow_undefined_flag_GCJ='${wl}-z,nodefs'
 +      archive_cmds_need_lc_GCJ=no
        hardcode_shlibpath_var_GCJ=no
++      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      hardcode_libdir_separator_GCJ=':'
++      link_all_deplibs_GCJ=yes
++      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
        runpath_var='LD_RUN_PATH'
 -      ;;
  
 -    uts4*)
--      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec_GCJ='-L$libdir'
--      hardcode_shlibpath_var_GCJ=no
--      ;;
--
--    *)
--      ld_shlibs_GCJ=no
--      ;;
--    esac
--  fi
--
++      if test "$GCC" = yes; then
++	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
++
++    uts4*)
+       archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_libdir_flag_spec_GCJ='-L$libdir'
+       hardcode_shlibpath_var_GCJ=no
+@@ -19565,1469 +20713,693 @@
+     esac
+   fi
+ 
 -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6
--test "$ld_shlibs_GCJ" = no && can_build_shared=no
--
++{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
++echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
+ test "$ld_shlibs_GCJ" = no && can_build_shared=no
+ 
 -variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 -if test "$GCC" = yes; then
 -  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 -fi
 -
--#
--# Do we need to explicitly link libc?
--#
--case "x$archive_cmds_need_lc_GCJ" in
+ #
+ # Do we need to explicitly link libc?
+ #
+ case "x$archive_cmds_need_lc_GCJ" in
 -x|xyes)
 -  # Assume -lc should be added
 -  archive_cmds_need_lc_GCJ=yes
@@ -26379,15 +25712,7 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
+-
 -ac_cv_lib_svld_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -26412,22 +25737,9 @@
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      no_undefined_flag_GCJ='${wl}-z,text'
-+      allow_undefined_flag_GCJ='${wl}-z,nodefs'
-+      archive_cmds_need_lc_GCJ=no
-+      hardcode_shlibpath_var_GCJ=no
-+      hardcode_libdir_flag_spec_GCJ='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      hardcode_libdir_separator_GCJ=':'
-+      link_all_deplibs_GCJ=yes
-+      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
++x|xyes)
++  # Assume -lc should be added
++  archive_cmds_need_lc_GCJ=yes
  
 -/* Override any gcc2 internal prototype to avoid an error.  */
 -#ifdef __cplusplus
@@ -26457,39 +25769,6 @@
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+      if test "$GCC" = yes; then
-+	archive_cmds_GCJ='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	archive_cmds_GCJ='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
-+
-+    uts4*)
-+      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-+      hardcode_shlibpath_var_GCJ=no
-+      ;;
-+
-+    *)
-+      ld_shlibs_GCJ=no
-+      ;;
-+    esac
-+  fi
-+
-+{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-+echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
-+test "$ld_shlibs_GCJ" = no && can_build_shared=no
-+
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$archive_cmds_need_lc_GCJ" in
-+x|xyes)
-+  # Assume -lc should be added
-+  archive_cmds_need_lc_GCJ=yes
-+
 +  if test "$enable_shared" = yes && test "$GCC" = yes; then
 +    case $archive_cmds_GCJ in
 +    *'~'*)
@@ -26743,9 +26022,7 @@
 +  # FIXME: first we should search . and the directory the executable is in
 +  shlibpath_var=PATH
 +  ;;
- 
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
++
 +darwin* | rhapsody*)
 +  dynamic_linker="$host_os dyld"
 +  version_type=darwin
@@ -26759,23 +26036,12 @@
 +  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
 +  if test "$GCC" = yes; then
 +    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-   else
--    enable_dlopen=no
++  else
 +    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-   fi
++  fi
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
- 
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
--
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
--
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
++
 +dgux*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26784,38 +26050,25 @@
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
- 
--    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
--echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20832 "configure"
--#include "confdefs.h"
++
 +freebsd1*)
 +  dynamic_linker=no
 +  ;;
  
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+-  if test "x$lt_cv_dlopen" != xno; then
+-    enable_dlopen=yes
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
 +  if test -x /usr/bin/objformat; then
 +    objformat=`/usr/bin/objformat`
-+  else
+   else
+-    enable_dlopen=no
 +    case $host_os in
 +    freebsd[123]*) objformat=aout ;;
 +    *) objformat=elf ;;
 +    esac
-+  fi
+   fi
 +  version_type=freebsd-$objformat
 +  case $version_type in
 +    freebsd-elf*)
@@ -26849,7 +26102,16 @@
 +  esac
 +  ;;
  
--#include <stdio.h>
+-  case $lt_cv_dlopen in
+-  dlopen)
+-    save_CPPFLAGS="$CPPFLAGS"
+-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+-
+-    save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+-
+-    save_LIBS="$LIBS"
+-    LIBS="$lt_cv_dlopen_libs $LIBS"
 +gnu*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -26860,15 +26122,19 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
+-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20832 "configure"
+-#include "confdefs.h"
 +hpux9* | hpux10* | hpux11*)
 +  # Give a soname corresponding to the major version so that dld.sl refuses to
 +  # link against other versions.
@@ -26915,26 +26181,8 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
  
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
 -#endif
 +interix3*)
 +  version_type=linux
@@ -26948,9 +26196,7 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
+-#include <stdio.h>
 +irix5* | irix6* | nonstopux*)
 +  case $host_os in
 +    nonstopux*) version_type=nonstopux ;;
@@ -26988,22 +26234,41 @@
 +  hardcode_into_libs=yes
 +  ;;
  
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
+-#endif
 +# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
 +  dynamic_linker=no
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
 +# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
 +  version_type=linux
@@ -27019,32 +26284,20 @@
 +  # before this can be enabled.
 +  hardcode_into_libs=yes
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self=no
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
 +    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-   fi
--fi
--rm -fr conftest*
++  fi
  
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +  # We used to test for /lib/ld.so.1 and disable shared libraries on
 +  # powerpc, because MkLinux only supported shared libraries with the
 +  # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -27054,9 +26307,12 @@
 +  dynamic_linker='GNU/Linux ld.so'
 +  ;;
  
--fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self" >&6
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -27069,21 +26325,24 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
  
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
--echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
--if test "${lt_cv_dlopen_self_static+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 20930 "configure"
--#include "confdefs.h"
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
+-    esac
+-  else :
+-    # compilation failed
+-    lt_cv_dlopen_self=no
 +netbsd*)
 +  version_type=sunos
 +  need_lib_prefix=no
@@ -27096,15 +26355,18 @@
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    dynamic_linker='NetBSD ld.elf_so'
-+  fi
+   fi
+-fi
+-rm -fr conftest*
+-
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
 +  hardcode_into_libs=yes
 +  ;;
  
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
+-fi
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 +newsos6)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -27112,7 +26374,21 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--#include <stdio.h>
+-    if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
+-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
+-if test "${lt_cv_dlopen_self_static+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  	  if test "$cross_compiling" = yes; then :
+-  lt_cv_dlopen_self_static=cross
+-else
+-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+-  lt_status=$lt_dlunknown
+-  cat > conftest.$ac_ext <<EOF
+-#line 20930 "configure"
+-#include "confdefs.h"
 +nto-qnx*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -27123,14 +26399,8 @@
 +  shlibpath_overrides_runpath=yes
 +  ;;
  
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
+-#if HAVE_DLFCN_H
+-#include <dlfcn.h>
 -#endif
 +openbsd*)
 +  version_type=sunos
@@ -27158,27 +26428,7 @@
 +  fi
 +  ;;
  
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
+-#include <stdio.h>
 +os2*)
 +  libname_spec='$name'
 +  shrext_cmds=".dll"
@@ -27188,8 +26438,14 @@
 +  shlibpath_var=LIBPATH
 +  ;;
  
--#ifdef __cplusplus
--extern "C" void exit (int);
+-#ifdef RTLD_GLOBAL
+-#  define LT_DLGLOBAL		RTLD_GLOBAL
+-#else
+-#  ifdef DL_GLOBAL
+-#    define LT_DLGLOBAL		DL_GLOBAL
+-#  else
+-#    define LT_DLGLOBAL		0
+-#  endif
 -#endif
 +osf3* | osf4* | osf5*)
 +  version_type=osf
@@ -27202,11 +26458,27 @@
 +  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 +  ;;
  
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
+-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+-   find out it does not work in some platform. */
+-#ifndef LT_DLLAZY_OR_NOW
+-#  ifdef RTLD_LAZY
+-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+-#  else
+-#    ifdef DL_LAZY
+-#      define LT_DLLAZY_OR_NOW		DL_LAZY
+-#    else
+-#      ifdef RTLD_NOW
+-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+-#      else
+-#        ifdef DL_NOW
+-#          define LT_DLLAZY_OR_NOW	DL_NOW
+-#        else
+-#          define LT_DLLAZY_OR_NOW	0
+-#        endif
+-#      endif
+-#    endif
+-#  endif
+-#endif
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -27220,12 +26492,9 @@
 +  postinstall_cmds='chmod +x $lib'
 +  ;;
  
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
+-#ifdef __cplusplus
+-extern "C" void exit (int);
+-#endif
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -27238,20 +26507,11 @@
 +  need_version=yes
 +  ;;
  
--    exit (status);
--}
--EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
+-void fnord() { int i=42;}
+-int main ()
+-{
+-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+-  int status = $lt_dlunknown;
 +sysv4 | sysv4.3*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -27275,7 +26535,13 @@
 +      ;;
 +  esac
 +  ;;
-+
+ 
+-  if (self)
+-    {
+-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+-      /* dlclose (self); */
+-    }
 +sysv4*MP*)
 +  if test -d /usr/nec ;then
 +    version_type=linux
@@ -27284,7 +26550,21 @@
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
 +  ;;
-+
+ 
+-    exit (status);
+-}
+-EOF
+-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>&5
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
+-    lt_status=$?
+-    case x$lt_status in
+-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
 +  need_lib_prefix=no
@@ -27312,14 +26592,14 @@
 -rm -fr conftest*
 +  sys_lib_dlsearch_path_spec='/usr/lib'
 +  ;;
- 
++
 +uts4*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  ;;
-+
+ 
 +*)
 +  dynamic_linker=no
 +  ;;
@@ -27387,7 +26667,7 @@
  fi
  
  
-@@ -21044,7 +22369,8 @@
+@@ -21044,7 +21416,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -27397,7 +26677,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21144,6 +22470,12 @@
+@@ -21144,6 +21517,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -27410,7 +26690,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21155,6 +22487,9 @@
+@@ -21155,6 +21534,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -27420,7 +26700,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21174,7 +22509,7 @@
+@@ -21174,7 +21556,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -27429,7 +26709,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21205,7 +22540,7 @@
+@@ -21205,7 +21587,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -27438,7 +26718,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21220,7 +22555,7 @@
+@@ -21220,7 +21602,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -27447,7 +26727,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21422,7 +22757,10 @@
+@@ -21422,7 +21804,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -27459,7 +26739,7 @@
  fi
  
  
-@@ -21442,7 +22780,6 @@
+@@ -21442,7 +21827,6 @@
        RC)
  
  
@@ -27467,7 +26747,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21461,15 +22798,42 @@
+@@ -21461,15 +21845,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -27510,7 +26790,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21485,7 +22849,8 @@
+@@ -21485,7 +21896,8 @@
    # Now quote all the things that may contain metacharacters while being
    # careful not to overquote the AC_SUBSTed values.  We take copies of the
    # variables and quote the copies for generation of the libtool script.
@@ -27520,7 +26800,7 @@
      libname_spec library_names_spec soname_spec extract_expsyms_cmds \
      old_striplib striplib file_magic_cmd finish_cmds finish_eval \
      deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21585,6 +22950,12 @@
+@@ -21585,6 +21997,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -27533,7 +26813,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21596,6 +22967,9 @@
+@@ -21596,6 +22014,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -27543,7 +26823,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21615,7 +22989,7 @@
+@@ -21615,7 +22036,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -27552,7 +26832,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21646,7 +23020,7 @@
+@@ -21646,7 +22067,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -27561,7 +26841,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21661,7 +23035,7 @@
+@@ -21661,7 +22082,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -27570,7 +26850,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21863,7 +23237,10 @@
+@@ -21863,7 +22284,10 @@
    # If there is no Makefile yet, we rely on a make rule to execute
    # `config.status --recheck' to rerun these tests and create the
    # libtool script then.
@@ -27582,7 +26862,7 @@
  fi
  
  
-@@ -21910,7 +23287,7 @@
+@@ -21910,7 +22334,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -27591,7 +26871,7 @@
  
  # Prevent multiple expansion
  
-@@ -21965,8 +23342,8 @@
+@@ -21965,8 +22389,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -27602,7 +26882,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21992,17 +23369,17 @@
+@@ -21992,17 +22416,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -27626,12 +26906,12 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22017,32 +23394,33 @@
+@@ -22017,32 +22441,33 @@
    IFS=$as_save_IFS
    test -z "$as_dir" && as_dir=.
    for ac_exec_ext in '' $ac_executable_extensions; do
 -  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
      echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
      break 2
@@ -27668,7 +26948,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22051,8 +23429,8 @@
+@@ -22051,8 +22476,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -27679,7 +26959,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22078,11 +23456,11 @@
+@@ -22078,11 +22503,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -27695,7 +26975,7 @@
  fi
  
  
-@@ -22090,8 +23468,8 @@
+@@ -22090,8 +22515,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -27706,7 +26986,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22101,8 +23479,7 @@
+@@ -22101,8 +22526,7 @@
  
  
  
@@ -27716,7 +26996,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22114,8 +23491,8 @@
+@@ -22114,8 +22538,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -27727,7 +27007,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22143,24 +23520,36 @@
+@@ -22143,41 +22567,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27745,34 +27025,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22169,15 +23558,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_stl_works=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27793,7 +27065,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22206,15 +23596,14 @@
+@@ -22206,15 +22626,14 @@
  
  
  
@@ -27812,7 +27084,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22226,9 +23615,6 @@
+@@ -22226,9 +22645,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -27822,7 +27094,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22254,24 +23640,36 @@
+@@ -22254,35 +22670,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27840,34 +27112,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22280,9 +23678,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcat=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27880,7 +27144,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22295,11 +23694,11 @@
+@@ -22295,11 +22707,11 @@
  fi
  
  
@@ -27896,7 +27160,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22320,8 +23719,7 @@
+@@ -22320,8 +22732,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -27906,7 +27170,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22359,24 +23757,36 @@
+@@ -22359,37 +22770,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -27924,34 +27188,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22386,10 +23796,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_strlcat=yes
+   kde_cv_proto_strlcat=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -27965,7 +27223,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22402,8 +23813,8 @@
+@@ -22402,8 +22810,8 @@
  
  fi
  
@@ -27976,7 +27234,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22427,15 +23838,14 @@
+@@ -22427,15 +22835,14 @@
  
  
  
@@ -27995,7 +27253,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22447,9 +23857,6 @@
+@@ -22447,9 +22854,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28005,7 +27263,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22474,24 +23881,36 @@
+@@ -22474,35 +22878,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28023,34 +27281,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22500,9 +23919,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_strlcpy=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28063,7 +27313,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22515,11 +23935,11 @@
+@@ -22515,11 +22915,11 @@
  fi
  
  
@@ -28079,7 +27329,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22540,8 +23960,7 @@
+@@ -22540,8 +22940,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -28089,7 +27339,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22578,24 +23997,36 @@
+@@ -22578,37 +22977,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28107,34 +27357,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22605,10 +24036,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_strlcpy=yes
+   kde_cv_proto_strlcpy=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28148,7 +27392,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22621,8 +24053,8 @@
+@@ -22621,8 +23017,8 @@
  
  fi
  
@@ -28159,7 +27403,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22645,8 +24077,8 @@
+@@ -22645,8 +23041,8 @@
  
  
  
@@ -28170,7 +27414,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22663,30 +24095,42 @@
+@@ -22663,52 +23059,49 @@
  int
  main ()
  {
@@ -28195,34 +27439,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22695,20 +24139,21 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_util_main=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28250,7 +27487,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22725,30 +24170,42 @@
+@@ -22725,53 +23118,50 @@
  int
  main ()
  {
@@ -28275,34 +27512,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22757,21 +24214,22 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_compat_main=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28331,7 +27561,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22784,40 +24242,52 @@
+@@ -22784,61 +23174,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28369,34 +27599,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22826,19 +24296,20 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_crypt_crypt=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28423,7 +27646,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22851,40 +24322,52 @@
+@@ -22851,56 +23238,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28461,34 +27684,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22893,14 +24376,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_c_crypt=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28508,7 +27724,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22926,13 +24410,13 @@
+@@ -22926,13 +23310,13 @@
  
     fi
  
@@ -28525,7 +27741,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -22961,24 +24445,36 @@
+@@ -22961,27 +23345,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28543,34 +27759,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -22990,8 +24486,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+          kde_cv_socklen_t=yes
+          kde_cv_socklen_t_equiv=socklen_t
+@@ -22990,8 +23369,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28582,7 +27792,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23001,17 +24499,17 @@
+@@ -23001,17 +23382,17 @@
  
  fi
  
@@ -28605,7 +27815,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -23040,24 +24538,36 @@
+@@ -23040,27 +23421,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28623,34 +27833,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23069,8 +24579,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+ 
+                kde_cv_socklen_t_equiv="$t"
+                break
+@@ -23069,8 +23445,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28662,7 +27866,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23081,8 +24593,8 @@
+@@ -23081,8 +23459,8 @@
  
  fi
  
@@ -28673,7 +27877,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23095,8 +24607,8 @@
+@@ -23095,8 +23473,8 @@
  _ACEOF
  
  
@@ -28684,7 +27888,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23109,40 +24621,52 @@
+@@ -23109,63 +23487,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28722,34 +27926,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23151,21 +24675,22 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dnet_dnet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28778,7 +27975,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23178,40 +24703,52 @@
+@@ -23178,63 +23553,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28816,34 +28013,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23220,21 +24757,22 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dnet_stub_dnet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28872,7 +28062,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23261,53 +24799,59 @@
+@@ -23261,72 +23633,63 @@
  
  #undef inet_ntoa
  
@@ -28924,34 +28114,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23316,17 +24860,18 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_inet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28976,7 +28159,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23339,40 +24884,52 @@
+@@ -23339,63 +23702,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29014,34 +28197,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23381,21 +24938,22 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_nsl_inet_ntoa=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29070,7 +28246,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23422,53 +24980,59 @@
+@@ -23422,72 +23782,63 @@
  
  #undef connect
  
@@ -29122,34 +28298,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23477,17 +25041,18 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_connect=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29174,7 +28343,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23500,40 +25065,52 @@
+@@ -23500,64 +23851,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29212,34 +28381,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23542,22 +25119,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_socket_connect=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29269,7 +28431,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23584,53 +25162,59 @@
+@@ -23584,72 +23932,63 @@
  
  #undef remove
  
@@ -29321,34 +28483,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23639,17 +25223,18 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_remove=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29373,7 +28528,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23662,40 +25247,52 @@
+@@ -23662,56 +24001,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29411,34 +28566,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23704,14 +25301,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_posix_remove=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29458,7 +28606,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23719,8 +25317,8 @@
+@@ -23719,8 +24055,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -29469,7 +28617,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23747,53 +25345,59 @@
+@@ -23747,73 +24083,64 @@
  
  #undef shmat
  
@@ -29521,34 +28669,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23802,18 +25406,19 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func_shmat=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29574,7 +28715,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23826,40 +25431,52 @@
+@@ -23826,56 +24153,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -29612,34 +28753,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23868,14 +25485,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_ipc_shmat=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29659,7 +28793,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23889,18 +25507,19 @@
+@@ -23889,18 +24213,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29687,7 +28821,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23911,24 +25530,36 @@
+@@ -23911,41 +24236,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29705,34 +28839,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -23937,15 +25568,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29755,7 +28881,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23954,8 +25586,13 @@
+@@ -23954,24 +24275,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -29770,8 +28896,31 @@
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-@@ -23979,9 +25616,10 @@
+-  rm -f conftest.er1
+-  cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -23979,9 +24298,10 @@
  
    ac_header_preproc=no
  fi
@@ -29784,7 +28933,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24005,25 +25643,19 @@
+@@ -24005,25 +24325,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29817,7 +28966,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24041,18 +25673,19 @@
+@@ -24041,18 +24355,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -29845,7 +28994,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24063,24 +25696,36 @@
+@@ -24063,41 +24378,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29863,34 +29012,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24089,15 +25734,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -29913,7 +29054,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24106,8 +25752,13 @@
+@@ -24106,24 +24417,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -29929,7 +29070,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24131,9 +25782,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24131,9 +24440,10 @@
  
    ac_header_preproc=no
  fi
@@ -29942,7 +29103,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24157,25 +25809,19 @@
+@@ -24157,25 +24467,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -29975,7 +29136,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24189,8 +25835,8 @@
+@@ -24189,8 +24493,8 @@
  
  
     # darwin requires a poll emulation library
@@ -29986,7 +29147,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24203,40 +25849,52 @@
+@@ -24203,56 +24507,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30024,34 +29185,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24245,14 +25903,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_poll_poll=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30071,7 +29225,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24263,18 +25922,19 @@
+@@ -24263,18 +24564,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -30099,7 +29253,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24285,24 +25945,36 @@
+@@ -24285,41 +24587,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30117,34 +29271,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24311,15 +25983,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30167,7 +29313,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24328,8 +26001,13 @@
+@@ -24328,24 +24626,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -30183,7 +29329,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24353,9 +26031,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24353,9 +24649,10 @@
  
    ac_header_preproc=no
  fi
@@ -30196,7 +29362,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24379,25 +26058,19 @@
+@@ -24379,25 +24676,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -30229,7 +29395,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24412,17 +26085,17 @@
+@@ -24412,17 +24703,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -30253,7 +29419,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24433,24 +26106,36 @@
+@@ -24433,41 +24724,37 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30271,34 +29437,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24459,15 +26144,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30321,7 +29479,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24476,8 +26162,13 @@
+@@ -24476,24 +24763,22 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -30337,7 +29495,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24501,9 +26192,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -24501,9 +24786,10 @@
  
    ac_header_preproc=no
  fi
@@ -30350,7 +29528,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24527,25 +26219,18 @@
+@@ -24527,25 +24813,18 @@
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: CoreAudio/CoreAudio.h: in the future, the compiler will take precedence" >&2;}
@@ -30381,7 +29559,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24562,8 +26247,8 @@
+@@ -24562,8 +24841,8 @@
  
  
  
@@ -30392,7 +29570,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24589,31 +26274,43 @@
+@@ -24589,31 +24868,27 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30410,33 +29588,25 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
  
        LIBRESOLV="-lresolv"
 -      echo "$as_me:$LINENO: result: yes" >&5
@@ -30446,7 +29616,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24624,25 +26321,25 @@
+@@ -24624,25 +24899,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30479,7 +29649,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24654,9 +26351,6 @@
+@@ -24654,9 +24929,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -30489,7 +29659,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24682,24 +26376,36 @@
+@@ -24682,35 +24954,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30507,34 +29677,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24708,9 +26414,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_res_init=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30547,7 +29709,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24723,11 +26430,11 @@
+@@ -24723,11 +24991,11 @@
  fi
  
  
@@ -30563,7 +29725,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24748,8 +26455,7 @@
+@@ -24748,8 +25016,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -30573,7 +29735,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -24787,24 +26493,36 @@
+@@ -24787,37 +25054,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -30591,34 +29753,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24814,10 +26532,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_res_init=yes
+   kde_cv_proto_res_init=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30632,7 +29788,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -24830,8 +26549,8 @@
+@@ -24830,8 +25094,8 @@
  
  fi
  
@@ -30643,7 +29799,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24858,8 +26577,8 @@
+@@ -24858,8 +25122,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -30654,7 +29810,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24872,40 +26591,52 @@
+@@ -24872,69 +25136,66 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30692,34 +29848,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24914,27 +26645,28 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_ucb_killpg=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30758,7 +29907,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24947,40 +26679,52 @@
+@@ -24947,64 +25208,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -30796,34 +29945,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24989,22 +26733,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_bsd_gethostbyname=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30853,7 +29995,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25015,36 +26760,49 @@
+@@ -25015,61 +25273,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30886,34 +30028,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25053,23 +26811,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_int=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -30948,12 +30082,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25079,10 +26837,12 @@
+@@ -25079,10 +25333,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -30962,7 +30095,7 @@
  test_array [0] = 0
  
    ;
-@@ -25090,24 +26850,36 @@
+@@ -25090,27 +25345,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30980,39 +30113,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25120,10 +26892,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25120,10 +25370,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -31021,7 +30147,7 @@
  test_array [0] = 0
  
    ;
-@@ -25131,24 +26905,36 @@
+@@ -25131,56 +25382,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31039,34 +30165,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25157,30 +26943,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31099,8 +30217,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -31109,7 +30226,7 @@
  test_array [0] = 0
  
    ;
-@@ -25188,24 +26977,36 @@
+@@ -25188,27 +25436,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31127,39 +30244,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25218,10 +27019,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25218,10 +25461,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -31168,7 +30278,7 @@
  test_array [0] = 0
  
    ;
-@@ -25229,24 +27032,36 @@
+@@ -25229,50 +25473,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31186,34 +30296,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25255,24 +27070,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31251,12 +30353,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25283,10 +27101,12 @@
+@@ -25283,10 +25525,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -31265,7 +30366,7 @@
  test_array [0] = 0
  
    ;
-@@ -25294,24 +27114,36 @@
+@@ -25294,52 +25537,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31283,34 +30384,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25320,26 +27152,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31325,16 +30418,16 @@
  ?*) ac_cv_sizeof_int=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
 +'') if test "$ac_cv_type_int" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +echo "$as_me: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_int=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_int=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -31347,20 +30440,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25347,8 +27177,10 @@
+@@ -25347,8 +25583,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (int)); }
 -unsigned long ulongval () { return (long) (sizeof (int)); }
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int 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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25357,35 +27189,44 @@
+@@ -25357,35 +25594,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31418,13 +30510,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25396,28 +27237,31 @@
+@@ -25396,28 +25642,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77
 +if test "$ac_cv_type_int" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (int), 77
 +echo "$as_me: error: cannot compute sizeof (int)
@@ -31433,9 +30525,9 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_int=0
-+	       fi
++   else
++     ac_cv_sizeof_int=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
@@ -31462,7 +30554,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25428,36 +27272,49 @@
+@@ -25428,61 +25677,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31495,34 +30587,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25466,23 +27323,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_short=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31557,12 +30641,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25492,10 +27349,12 @@
+@@ -25492,10 +25737,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -31571,7 +30654,7 @@
  test_array [0] = 0
  
    ;
-@@ -25503,24 +27362,36 @@
+@@ -25503,27 +25749,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31589,39 +30672,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25533,10 +27404,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25533,10 +25774,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -31630,7 +30706,7 @@
  test_array [0] = 0
  
    ;
-@@ -25544,24 +27417,36 @@
+@@ -25544,56 +25786,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31648,34 +30724,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25570,30 +27455,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31708,8 +30776,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -31718,7 +30785,7 @@
  test_array [0] = 0
  
    ;
-@@ -25601,24 +27489,36 @@
+@@ -25601,27 +25840,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31736,39 +30803,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25631,10 +27531,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25631,10 +25865,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -31777,7 +30837,7 @@
  test_array [0] = 0
  
    ;
-@@ -25642,24 +27544,36 @@
+@@ -25642,50 +25877,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31795,34 +30855,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25668,24 +27582,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31860,12 +30912,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -25696,10 +27613,12 @@
+@@ -25696,10 +25929,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -31874,7 +30925,7 @@
  test_array [0] = 0
  
    ;
-@@ -25707,24 +27626,36 @@
+@@ -25707,52 +25941,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31892,34 +30943,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25733,26 +27664,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31934,16 +30977,16 @@
  ?*) ac_cv_sizeof_short=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
 +'') if test "$ac_cv_type_short" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +echo "$as_me: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_short=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_short=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -31956,20 +30999,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25760,8 +27689,10 @@
+@@ -25760,8 +25987,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (short)); }
 -unsigned long ulongval () { return (long) (sizeof (short)); }
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short 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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -25770,35 +27701,44 @@
+@@ -25770,35 +25998,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32027,13 +31069,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25809,28 +27749,31 @@
+@@ -25809,28 +26046,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77
 +if test "$ac_cv_type_short" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (short)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (short), 77
 +echo "$as_me: error: cannot compute sizeof (short)
@@ -32042,17 +31084,17 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_short=0
-+	       fi
++   else
++     ac_cv_sizeof_short=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_short=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
@@ -32071,7 +31113,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25841,36 +27784,49 @@
+@@ -25841,61 +26081,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32104,34 +31146,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25879,23 +27835,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_long=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32166,12 +31200,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25905,10 +27861,12 @@
+@@ -25905,10 +26141,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -32180,7 +31213,7 @@
  test_array [0] = 0
  
    ;
-@@ -25916,24 +27874,36 @@
+@@ -25916,27 +26153,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32198,39 +31231,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25946,10 +27916,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -25946,10 +26178,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -32239,7 +31265,7 @@
  test_array [0] = 0
  
    ;
-@@ -25957,24 +27929,36 @@
+@@ -25957,56 +26190,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32257,34 +31283,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -25983,30 +27967,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32317,8 +31335,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -32327,7 +31344,7 @@
  test_array [0] = 0
  
    ;
-@@ -26014,24 +28001,36 @@
+@@ -26014,27 +26244,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32345,39 +31362,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26044,10 +28043,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26044,10 +26269,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -32386,7 +31396,7 @@
  test_array [0] = 0
  
    ;
-@@ -26055,24 +28056,36 @@
+@@ -26055,50 +26281,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32404,34 +31414,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26081,24 +28094,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32469,12 +31471,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26109,10 +28125,12 @@
+@@ -26109,10 +26333,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -32483,7 +31484,7 @@
  test_array [0] = 0
  
    ;
-@@ -26120,24 +28138,36 @@
+@@ -26120,52 +26345,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32501,34 +31502,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26146,26 +28176,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32543,16 +31536,16 @@
  ?*) ac_cv_sizeof_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 +'') if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +echo "$as_me: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_long=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -32565,20 +31558,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26173,8 +28201,10 @@
+@@ -26173,8 +26391,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (long)); }
 -unsigned long ulongval () { return (long) (sizeof (long)); }
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long 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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26183,35 +28213,44 @@
+@@ -26183,35 +26402,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32636,13 +31628,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26222,28 +28261,31 @@
+@@ -26222,28 +26450,31 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77
 +if test "$ac_cv_type_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (long), 77
 +echo "$as_me: error: cannot compute sizeof (long)
@@ -32651,9 +31643,9 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_long=0
-+	       fi
++   else
++     ac_cv_sizeof_long=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
@@ -32680,7 +31672,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26254,36 +28296,49 @@
+@@ -26254,61 +26485,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -32713,34 +31705,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26292,23 +28347,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_char_p=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32775,12 +31759,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26318,10 +28373,12 @@
+@@ -26318,10 +26545,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -32789,7 +31772,7 @@
  test_array [0] = 0
  
    ;
-@@ -26329,24 +28386,36 @@
+@@ -26329,27 +26557,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32807,39 +31790,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26359,10 +28428,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26359,10 +26582,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -32848,7 +31824,7 @@
  test_array [0] = 0
  
    ;
-@@ -26370,24 +28441,36 @@
+@@ -26370,56 +26594,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32866,34 +31842,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26396,30 +28479,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -32926,8 +31894,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -32936,7 +31903,7 @@
  test_array [0] = 0
  
    ;
-@@ -26427,24 +28513,36 @@
+@@ -26427,27 +26648,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32954,39 +31921,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26457,10 +28555,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26457,10 +26673,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -32995,7 +31955,7 @@
  test_array [0] = 0
  
    ;
-@@ -26468,24 +28568,36 @@
+@@ -26468,50 +26685,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33013,34 +31973,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26494,24 +28606,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33078,12 +32030,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -26522,10 +28637,12 @@
+@@ -26522,10 +26737,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -33092,7 +32043,7 @@
  test_array [0] = 0
  
    ;
-@@ -26533,24 +28650,36 @@
+@@ -26533,52 +26749,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33110,34 +32061,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26559,26 +28688,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33152,16 +32095,16 @@
  ?*) ac_cv_sizeof_char_p=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
 +'') if test "$ac_cv_type_char_p" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_char_p=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_char_p=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -33174,20 +32117,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26586,8 +28713,10 @@
+@@ -26586,8 +26795,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (char *)); }
 -unsigned long ulongval () { return (long) (sizeof (char *)); }
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * 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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -26596,35 +28725,44 @@
+@@ -26596,35 +26806,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -33245,13 +32187,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26635,30 +28773,33 @@
+@@ -26635,30 +26854,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
 +if test "$ac_cv_type_char_p" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (char *), 77
 +echo "$as_me: error: cannot compute sizeof (char *)
@@ -33260,17 +32202,17 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_char_p=0
-+	       fi
++   else
++     ac_cv_sizeof_char_p=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_char_p=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_char_p" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_char_p" >&5
@@ -33291,7 +32233,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26671,40 +28812,52 @@
+@@ -26671,56 +26893,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33329,34 +32271,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26713,14 +28866,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dl_dlopen=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33376,7 +32311,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26729,8 +28883,8 @@
+@@ -26729,8 +26948,8 @@
  fi
  
  
@@ -33387,7 +32322,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26743,40 +28897,52 @@
+@@ -26743,56 +26962,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33425,34 +32360,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26785,14 +28951,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_dld_shl_unload=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33472,7 +32400,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26806,8 +28973,8 @@
+@@ -26806,8 +27022,8 @@
  
  
  
@@ -33483,7 +32411,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26818,36 +28985,49 @@
+@@ -26818,61 +27034,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -33516,34 +32444,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26856,23 +29036,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_size_t=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33578,12 +32498,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26882,10 +29062,12 @@
+@@ -26882,10 +27094,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
@@ -33592,7 +32511,7 @@
  test_array [0] = 0
  
    ;
-@@ -26893,24 +29075,36 @@
+@@ -26893,27 +27106,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33610,39 +32529,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26923,10 +29117,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -26923,10 +27131,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
@@ -33651,7 +32563,7 @@
  test_array [0] = 0
  
    ;
-@@ -26934,24 +29130,36 @@
+@@ -26934,56 +27143,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33669,34 +32581,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -26960,30 +29168,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33729,8 +32633,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
@@ -33739,7 +32642,7 @@
  test_array [0] = 0
  
    ;
-@@ -26991,24 +29202,36 @@
+@@ -26991,27 +27197,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33757,39 +32660,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27021,10 +29244,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27021,10 +27222,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
@@ -33798,7 +32694,7 @@
  test_array [0] = 0
  
    ;
-@@ -27032,24 +29257,36 @@
+@@ -27032,50 +27234,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33816,34 +32712,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27058,24 +29295,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33881,12 +32769,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27086,10 +29326,12 @@
+@@ -27086,10 +27286,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_t ac__type_sizeof_;
  int
  main ()
  {
@@ -33895,7 +32782,7 @@
  test_array [0] = 0
  
    ;
-@@ -27097,24 +29339,36 @@
+@@ -27097,52 +27298,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -33913,34 +32800,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27123,26 +29377,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33955,16 +32834,16 @@
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
 +'') if test "$ac_cv_type_size_t" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (size_t), 77
 +echo "$as_me: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_size_t=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_size_t=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -33977,20 +32856,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27150,8 +29402,10 @@
+@@ -27150,8 +27344,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (size_t)); }
 -unsigned long ulongval () { return (long) (sizeof (size_t)); }
-+	        typedef size_t ac__type_sizeof_;
-+
++   typedef size_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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27160,35 +29414,44 @@
+@@ -27160,35 +27355,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -34048,13 +32926,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27199,29 +29462,32 @@
+@@ -27199,29 +27403,32 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t), 77
 +if test "$ac_cv_type_size_t" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (size_t), 77
 +echo "$as_me: error: cannot compute sizeof (size_t)
@@ -34063,9 +32941,9 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_size_t=0
-+	       fi
++   else
++     ac_cv_sizeof_size_t=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
@@ -34093,7 +32971,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27232,36 +29498,49 @@
+@@ -27232,61 +27439,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -34126,34 +33004,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27270,23 +29549,23 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_type_unsigned_long=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34188,12 +33058,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -27296,10 +29575,12 @@
+@@ -27296,10 +27499,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
@@ -34202,7 +33071,7 @@
  test_array [0] = 0
  
    ;
-@@ -27307,24 +29588,36 @@
+@@ -27307,27 +27511,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34220,39 +33089,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27337,10 +29630,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=0 ac_mid=0
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27337,10 +27536,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
@@ -34261,7 +33123,7 @@
  test_array [0] = 0
  
    ;
-@@ -27348,24 +29643,36 @@
+@@ -27348,56 +27548,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34279,34 +33141,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27374,30 +29681,33 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34339,8 +33193,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
@@ -34349,7 +33202,7 @@
  test_array [0] = 0
  
    ;
-@@ -27405,24 +29715,36 @@
+@@ -27405,27 +27602,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34367,39 +33220,32 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27435,10 +29757,12 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=-1 ac_mid=-1
+   while :; do
+     cat >conftest.$ac_ext <<_ACEOF
+@@ -27435,10 +27627,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
@@ -34408,7 +33254,7 @@
  test_array [0] = 0
  
    ;
-@@ -27446,24 +29770,36 @@
+@@ -27446,50 +27639,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34426,34 +33272,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27472,24 +29808,27 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_lo=$ac_mid; break
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34491,12 +33329,11 @@
  # Binary search between lo and hi bounds.
  while test "x$ac_lo" != "x$ac_hi"; do
    ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-@@ -27500,10 +29839,12 @@
+@@ -27500,10 +27691,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long ac__type_sizeof_;
  int
  main ()
  {
@@ -34505,7 +33342,7 @@
  test_array [0] = 0
  
    ;
-@@ -27511,24 +29852,36 @@
+@@ -27511,52 +27703,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34523,34 +33360,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27537,26 +29890,24 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34565,16 +33394,16 @@
  ?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
 +'') if test "$ac_cv_type_unsigned_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77
 +echo "$as_me: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&2;}
 -   { (exit 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_unsigned_long=0
-+	       fi ;;
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi ;;
  esac
  else
 -  if test "$cross_compiling" = yes; then
@@ -34587,20 +33416,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27564,8 +29915,10 @@
+@@ -27564,8 +27749,9 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
 -long longval () { return (long) (sizeof (unsigned long)); }
 -unsigned long ulongval () { return (long) (sizeof (unsigned long)); }
-+	        typedef unsigned long ac__type_sizeof_;
-+
++   typedef unsigned long 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_)); }
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -27574,35 +29927,44 @@
+@@ -27574,35 +27760,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -34658,13 +33486,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27613,30 +29975,33 @@
+@@ -27613,30 +27808,33 @@
  sed 's/^/| /' conftest.$ac_ext >&5
  
  ( exit $ac_status )
 -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long), 77
 +if test "$ac_cv_type_unsigned_long" = yes; then
-+	         { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
++     { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
  See \`config.log' for more details." >&5
 -echo "$as_me: error: cannot compute sizeof (unsigned long), 77
 +echo "$as_me: error: cannot compute sizeof (unsigned long)
@@ -34673,17 +33501,17 @@
 -fi
 -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_unsigned_long=0
-+	       fi
++   else
++     ac_cv_sizeof_unsigned_long=0
++   fi
  fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_unsigned_long=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
@@ -34704,7 +33532,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27657,36 +30022,48 @@
+@@ -27657,36 +27855,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34722,35 +33550,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
  else
@@ -34765,7 +33584,7 @@
        { { echo "$as_me:$LINENO: error:
         Apparently on your system our assumption sizeof size_t == sizeof unsigned long
         does not apply. Please mail kde-devel at kde.org with a description of your system!
-@@ -27698,18 +30075,18 @@
+@@ -27698,18 +27891,18 @@
     { (exit 1); exit 1; }; }
  
  fi
@@ -34789,7 +33608,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -27739,24 +30116,36 @@
+@@ -27739,35 +27932,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34807,34 +33626,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27765,9 +30154,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_val_pie_support=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34847,7 +33659,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
      CXXFLAGS=$safe_CXXFLAGS
-@@ -27780,26 +30170,26 @@
+@@ -27780,26 +27970,26 @@
  
  
  fi
@@ -34884,7 +33696,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27818,18 +30208,19 @@
+@@ -27818,18 +28008,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -34912,7 +33724,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27840,24 +30231,36 @@
+@@ -27840,41 +28031,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -34930,34 +33742,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -27866,15 +30269,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -34980,7 +33784,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27883,8 +30287,13 @@
+@@ -27883,24 +28070,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -34996,7 +33800,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -27908,9 +30317,10 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -27908,9 +28093,10 @@
  
    ac_header_preproc=no
  fi
@@ -35009,7 +33833,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27934,25 +30344,19 @@
+@@ -27934,25 +28120,19 @@
  echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
@@ -35042,7 +33866,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27964,8 +30368,8 @@
+@@ -27964,8 +28144,8 @@
  
  done
  
@@ -35053,7 +33877,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27992,53 +30396,59 @@
+@@ -27992,68 +28172,59 @@
  
  #undef _NSGetEnviron
  
@@ -35105,34 +33929,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28047,13 +30457,14 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_func__NSGetEnviron=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35151,7 +33968,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28074,9 +30485,9 @@
+@@ -28074,9 +28245,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -35164,7 +33981,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28102,53 +30513,59 @@
+@@ -28102,68 +28273,60 @@
  
  #undef $ac_func
  
@@ -35216,34 +34033,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28157,13 +30574,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "$as_ac_var=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35263,7 +34073,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28180,32 +30599,32 @@
+@@ -28180,32 +28343,32 @@
  
  
  
@@ -35308,7 +34118,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28221,8 +30640,8 @@
+@@ -28221,8 +28384,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -35319,7 +34129,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28259,8 +30678,13 @@
+@@ -28259,24 +28422,22 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -35335,7 +34145,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28327,6 +30751,7 @@
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } >/dev/null; then
+-  if test -s conftest.err; then
+-    ac_cpp_err=$ac_c_preproc_warn_flag
+-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+-  else
+-    ac_cpp_err=
+-  fi
+-else
+-  ac_cpp_err=yes
+-fi
+-if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   # We can compile using X headers with no special include directory.
+ ac_x_includes=
+ else
+@@ -28327,6 +28488,7 @@
      fi
    done
  fi
@@ -35343,7 +34173,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28356,24 +30781,36 @@
+@@ -28356,27 +28518,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35361,34 +34191,29 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28384,7 +30821,7 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+ ac_x_libraries=
+@@ -28384,7 +28542,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35397,7 +34222,7 @@
  # First see if replacing the include by lib works.
  # Check X11 before X11Rn because it is often a symlink to the current release.
  for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \
-@@ -28432,7 +30869,8 @@
+@@ -28432,7 +28590,8 @@
    done
  done
  fi
@@ -35407,7 +34232,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
  
-@@ -28442,21 +30880,26 @@
+@@ -28442,21 +28601,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -35442,7 +34267,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28464,7 +30907,7 @@
+@@ -28464,7 +28628,7 @@
      # bogus both because they are the default anyway, and because
      # using them would break gcc on systems where it needs fixed includes.
      case $ac_im_incroot in
@@ -35451,7 +34276,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28473,7 +30916,7 @@
+@@ -28473,7 +28637,7 @@
      esac
    fi
    cd ..
@@ -35460,7 +34285,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28517,12 +30960,12 @@
+@@ -28517,12 +28681,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -35477,7 +34302,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28550,8 +30993,8 @@
+@@ -28550,8 +28714,8 @@
  # These have to be linked with before -lX11, unlike the other
  # libraries we check for below, so use a different variable.
  #  --interran at uluru.Stanford.EDU, kb at cs.umb.edu.
@@ -35488,7 +34313,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28564,40 +31007,52 @@
+@@ -28564,56 +28728,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35526,34 +34351,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28606,14 +31061,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_ICE_IceConnectionNumber=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35573,7 +34391,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28622,8 +31078,8 @@
+@@ -28622,8 +28783,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -35584,7 +34402,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28657,24 +31113,36 @@
+@@ -28657,36 +28818,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35602,34 +34420,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28683,10 +31151,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_have_libXext=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35643,7 +34454,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28695,8 +31164,8 @@
+@@ -28695,8 +28853,8 @@
  fi
  
  
@@ -35654,7 +34465,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28842,8 +31311,8 @@
+@@ -28842,8 +29000,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -35665,7 +34476,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28854,9 +31323,9 @@
+@@ -28854,9 +29012,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -35678,7 +34489,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28868,40 +31337,52 @@
+@@ -28868,56 +29026,54 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35716,34 +34527,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28910,14 +31391,16 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "$as_ac_Lib=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35764,7 +34568,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28930,8 +31413,8 @@
+@@ -28930,8 +29086,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -35775,7 +34579,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28944,40 +31427,52 @@
+@@ -28944,56 +29100,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -35813,34 +34617,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -28986,14 +31481,15 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   ac_cv_lib_pthread_pthread_create=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -35860,7 +34657,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29001,8 +31497,8 @@
+@@ -29001,8 +29154,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -35871,7 +34668,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29021,40 +31517,53 @@
+@@ -29021,40 +29174,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35889,33 +34686,25 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
@@ -35938,7 +34727,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
    fi
-@@ -29069,16 +31578,15 @@
+@@ -29069,16 +29219,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -35959,7 +34748,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29105,24 +31613,36 @@
+@@ -29105,34 +29254,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35977,34 +34766,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29131,8 +31651,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36016,7 +34798,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29145,13 +31667,13 @@
+@@ -29145,13 +29292,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36034,7 +34816,7 @@
   :
  
  fi
-@@ -29163,16 +31685,15 @@
+@@ -29163,16 +29310,15 @@
      case $host_os in
   	solaris*)
  
@@ -36055,7 +34837,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -29199,24 +31720,36 @@
+@@ -29199,34 +29345,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36073,34 +34855,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29225,8 +31758,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36112,7 +34887,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29239,13 +31774,13 @@
+@@ -29239,13 +29383,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -36130,7 +34905,7 @@
   :
  
  fi
-@@ -29272,17 +31807,17 @@
+@@ -29272,17 +29416,17 @@
  
  
  
@@ -36154,7 +34929,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29300,21 +31835,21 @@
+@@ -29300,21 +29444,21 @@
  fi
  
  
@@ -36184,7 +34959,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29333,14 +31868,14 @@
+@@ -29333,14 +29477,14 @@
  
  
  
@@ -36203,7 +34978,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29374,24 +31909,36 @@
+@@ -29374,35 +29518,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36221,34 +34996,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29400,9 +31947,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_cv_lib_z='-lz'"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36261,7 +35029,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29415,8 +31963,8 @@
+@@ -29415,8 +29556,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -36272,7 +35040,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29436,8 +31984,8 @@
+@@ -29436,8 +29577,8 @@
  
  
  
@@ -36283,7 +35051,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29473,24 +32021,36 @@
+@@ -29473,36 +29614,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36301,34 +35069,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29499,10 +32059,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_cv_lib_png='-lpng $LIBZ -lm'"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36342,7 +35103,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29516,19 +32077,19 @@
+@@ -29516,19 +29654,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -36368,7 +35129,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29561,24 +32122,36 @@
+@@ -29561,35 +29699,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36386,34 +35147,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29587,9 +32160,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_cv_lib_jpeg_6b=-ljpeg6b"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36426,7 +35180,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29599,14 +32173,14 @@
+@@ -29599,14 +29734,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -36447,7 +35201,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29639,24 +32213,36 @@
+@@ -29639,35 +29774,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36465,34 +35219,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_c_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -29665,9 +32251,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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_cv_lib_jpeg_normal=-ljpeg"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36505,7 +35252,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29677,11 +32264,11 @@
+@@ -29677,11 +29809,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -36521,16 +35268,16 @@
  
         LIBJPEG=
  
-@@ -29701,7 +32288,7 @@
+@@ -29701,7 +29833,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29704: $i/$j" >&5
-+    echo "configure: 32291: $i/$j" >&5
++    echo "configure: 29836: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29748,14 +32335,14 @@
+@@ -29748,14 +29880,14 @@
  
  
  
@@ -36548,7 +35295,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29798,8 +32385,8 @@
+@@ -29798,8 +29930,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36559,7 +35306,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29808,8 +32395,8 @@
+@@ -29808,8 +29940,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36570,7 +35317,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29823,10 +32410,9 @@
+@@ -29823,10 +29955,9 @@
  
  
  
@@ -36583,7 +35330,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29836,7 +32422,8 @@
+@@ -29836,7 +29967,8 @@
      fi
  
  
@@ -36593,7 +35340,7 @@
  
  USING_QT_MT=""
  
-@@ -29856,13 +32443,13 @@
+@@ -29856,13 +29988,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -36611,7 +35358,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29934,8 +32521,8 @@
+@@ -29934,8 +30066,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -36622,7 +35369,7 @@
  
  if test "x$kde_use_qt_emb" != "xyes" && test "x$kde_use_qt_mac" != "xyes"; then
  LIBQT="$LIBQT $X_PRE_LIBS -lXext -lX11 $LIBSM $LIBSOCKET"
-@@ -29944,34 +32531,34 @@
+@@ -29944,34 +30076,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -36669,16 +35416,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -29999,7 +32586,7 @@
+@@ -29999,7 +30131,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 30002: $i/$j" >&5
-+    echo "configure: 32589: $i/$j" >&5
++    echo "configure: 30134: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30036,8 +32623,7 @@
+@@ -30036,8 +30168,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -36688,7 +35435,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30174,13 +32760,13 @@
+@@ -30174,13 +30305,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -36706,7 +35453,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30189,15 +32775,14 @@
+@@ -30189,15 +30320,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -36725,7 +35472,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30318,12 +32903,12 @@
+@@ -30318,12 +30448,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -36742,7 +35489,7 @@
  
  fi
  
-@@ -30361,14 +32946,14 @@
+@@ -30361,14 +30491,14 @@
     fi
  
  
@@ -36760,7 +35507,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30411,8 +32996,8 @@
+@@ -30411,8 +30541,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36771,7 +35518,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30433,22 +33018,22 @@
+@@ -30433,22 +30563,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -36799,7 +35546,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30491,12 +33076,12 @@
+@@ -30491,12 +30621,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -36816,7 +35563,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30526,10 +33111,10 @@
+@@ -30526,10 +30656,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -36830,7 +35577,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30552,22 +33137,22 @@
+@@ -30552,22 +30682,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36860,7 +35607,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30590,13 +33175,13 @@
+@@ -30590,13 +30720,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -36878,7 +35625,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30627,15 +33212,14 @@
+@@ -30627,15 +30757,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -36897,7 +35644,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -30668,24 +33252,36 @@
+@@ -30668,35 +30797,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36915,34 +35662,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -30694,9 +33290,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_qt_jpeg=no"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -36955,7 +35695,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30712,12 +33309,12 @@
+@@ -30712,12 +30838,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -36972,7 +35712,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30748,15 +33345,15 @@
+@@ -30748,15 +30874,15 @@
  
  
  
@@ -36994,7 +35734,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30780,11 +33377,11 @@
+@@ -30780,11 +30906,11 @@
  
  
  
@@ -37010,34 +35750,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30836,7 +33433,7 @@
+@@ -30836,7 +30962,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30839: $i/$j" >&5
-+    echo "configure: 33436: $i/$j" >&5
++    echo "configure: 30965: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30866,7 +33463,7 @@
+@@ -30866,7 +30992,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30869: $i/$j" >&5
-+    echo "configure: 33466: $i/$j" >&5
++    echo "configure: 30995: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30884,7 +33481,7 @@
+@@ -30884,7 +31010,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30887: $i/$j" >&5
-+    echo "configure: 33484: $i/$j" >&5
++    echo "configure: 31013: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30943,12 +33540,12 @@
+@@ -30943,12 +31069,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -37054,7 +35794,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30957,8 +33554,8 @@
+@@ -30957,8 +31083,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -37065,7 +35805,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -30996,8 +33593,8 @@
+@@ -30996,8 +31122,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -37076,7 +35816,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31040,8 +33637,8 @@
+@@ -31040,8 +31166,8 @@
  fi
  
  
@@ -37087,7 +35827,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31073,10 +33670,9 @@
+@@ -31073,10 +31199,9 @@
  
  
  
@@ -37100,7 +35840,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31090,13 +33686,14 @@
+@@ -31090,13 +31215,14 @@
    fi
  
  
@@ -37118,28 +35858,28 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31207,15 +33804,14 @@
+@@ -31207,15 +31333,14 @@
  else
  
    if test $kde_qtver = 1; then
 -     echo "$as_me:$LINENO: result: compiling" >&5
 -echo "${ECHO_T}compiling" >&6
--
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
  
+ 
 -    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
- 
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
  
+-
 -     ac_ext=cc
 +     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31267,8 +33863,8 @@
+@@ -31267,8 +31392,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -37150,7 +35890,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31307,8 +33903,8 @@
+@@ -31307,8 +31432,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -37161,7 +35901,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31316,8 +33912,8 @@
+@@ -31316,8 +31441,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -37172,28 +35912,28 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31510,15 +34106,14 @@
+@@ -31510,15 +31635,14 @@
  else
  
    if test $kde_qtver = 1; then
 -     echo "$as_me:$LINENO: result: compiling" >&5
 -echo "${ECHO_T}compiling" >&6
+-
 +     { echo "$as_me:$LINENO: result: compiling" >&5
 +echo "${ECHO_T}compiling" >&6; }
  
- 
 -    echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 -echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6
+ 
 +    { echo "$as_me:$LINENO: checking for KDE headers installed" >&5
 +echo $ECHO_N "checking for KDE headers installed... $ECHO_C" >&6; }
  
--
 -     ac_ext=cc
 +     ac_ext=cpp
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -31570,8 +34165,8 @@
+@@ -31570,8 +31694,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -37204,7 +35944,7 @@
   else
     { { echo "$as_me:$LINENO: error: your system is not able to compile a small KDE application!
  Check, if you installed the KDE header files correctly.
-@@ -31610,8 +34205,8 @@
+@@ -31610,8 +31734,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -37215,7 +35955,7 @@
  ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5'
  
  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-@@ -31619,8 +34214,8 @@
+@@ -31619,8 +31743,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -37226,7 +35966,7 @@
  else
    { { echo "$as_me:$LINENO: error: your system fails at linking a small KDE application!
  Check, if your compiler is installed correctly and if you have used the
-@@ -31712,22 +34307,22 @@
+@@ -31712,22 +31836,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -37255,7 +35995,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31760,14 +34355,14 @@
+@@ -31760,14 +31884,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -37273,7 +36013,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31810,8 +34405,8 @@
+@@ -31810,8 +31934,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37284,7 +36024,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31822,21 +34417,21 @@
+@@ -31822,21 +31946,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37311,7 +36051,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31879,8 +34474,8 @@
+@@ -31879,8 +32003,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37322,7 +36062,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31891,22 +34486,22 @@
+@@ -31891,22 +32015,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37350,7 +36090,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31949,8 +34544,8 @@
+@@ -31949,8 +32073,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37361,7 +36101,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31963,21 +34558,21 @@
+@@ -31963,21 +32087,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37388,7 +36128,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32020,8 +34615,8 @@
+@@ -32020,8 +32144,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37399,7 +36139,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32034,22 +34629,22 @@
+@@ -32034,22 +32158,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37427,7 +36167,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32092,12 +34687,12 @@
+@@ -32092,12 +32216,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37444,7 +36184,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32126,14 +34721,14 @@
+@@ -32126,14 +32250,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -37462,7 +36202,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32176,8 +34771,8 @@
+@@ -32176,8 +32300,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37473,7 +36213,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32188,21 +34783,21 @@
+@@ -32188,21 +32312,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37500,7 +36240,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32245,8 +34840,8 @@
+@@ -32245,8 +32369,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37511,7 +36251,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32257,8 +34852,8 @@
+@@ -32257,8 +32381,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37522,7 +36262,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32266,14 +34861,14 @@
+@@ -32266,14 +32390,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -37540,7 +36280,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32316,8 +34911,8 @@
+@@ -32316,8 +32440,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37551,7 +36291,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32328,8 +34923,8 @@
+@@ -32328,8 +32452,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -37562,7 +36302,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32337,14 +34932,14 @@
+@@ -32337,14 +32461,14 @@
  
          fi
  
@@ -37580,7 +36320,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32387,12 +34982,12 @@
+@@ -32387,12 +32511,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -37597,16 +36337,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32407,7 +35002,7 @@
+@@ -32407,7 +32531,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32410: $i/$j" >&5
-+    echo "configure: 35005: $i/$j" >&5
++    echo "configure: 32534: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32568,13 +35163,12 @@
+@@ -32568,13 +32692,12 @@
  
  
  
@@ -37623,7 +36363,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32595,13 +35189,13 @@
+@@ -32595,13 +32718,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -37641,7 +36381,7 @@
        { echo "$as_me:$LINENO: WARNING: Your libstdc++ doesn't appear to be patched for
                     visibility support. Disabling -fvisibility=hidden" >&5
  echo "$as_me: WARNING: Your libstdc++ doesn't appear to be patched for
-@@ -32621,16 +35215,15 @@
+@@ -32621,16 +32744,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -37662,7 +36402,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32657,24 +35250,36 @@
+@@ -32657,34 +32779,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37680,34 +36420,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32683,8 +35288,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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 "kde_cv_prog_cxx_$kde_cache=yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37719,7 +36452,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -32697,28 +35304,27 @@
+@@ -32697,28 +32817,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -37757,7 +36490,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32753,24 +35359,36 @@
+@@ -32753,35 +32872,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37775,34 +36508,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32779,9 +35397,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_val_qt_gcc_visibility_patched=no
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37815,7 +36540,7 @@
  
            CXXFLAGS=$safe_CXXFLAGS
            ac_ext=c
-@@ -32793,21 +35412,20 @@
+@@ -32793,21 +32908,20 @@
  
  
  fi
@@ -37842,7 +36567,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32847,24 +35465,36 @@
+@@ -32847,35 +32961,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37860,34 +36585,27 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32873,9 +35503,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+   kde_cv_val_gcc_visibility_bug=no
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37900,7 +36618,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
          CXXFLAGS=$safe_CXXFLAGS
-@@ -32889,8 +35520,8 @@
+@@ -32889,8 +33000,8 @@
  
  
  fi
@@ -37911,7 +36629,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32906,8 +35537,8 @@
+@@ -32906,8 +33017,8 @@
        fi
  
  else
@@ -37922,7 +36640,7 @@
   :
  
  fi
-@@ -32917,15 +35548,14 @@
+@@ -32917,15 +33028,14 @@
  CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
  
  
@@ -37941,7 +36659,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -32937,9 +35567,6 @@
+@@ -32937,9 +33047,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37951,7 +36669,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -32962,24 +35589,36 @@
+@@ -32962,35 +33069,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37969,34 +36687,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -32988,9 +35627,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_setenv=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38009,7 +36719,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33003,11 +35643,11 @@
+@@ -33003,11 +33106,11 @@
  fi
  
  
@@ -38025,7 +36735,7 @@
  if test "${kde_cv_proto_setenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33028,8 +35668,7 @@
+@@ -33028,8 +33131,7 @@
  if test "x$kde_cv_proto_setenv" = xunknown; then
  
  
@@ -38035,7 +36745,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33064,24 +35703,36 @@
+@@ -33064,37 +33166,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38053,34 +36763,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33091,10 +35742,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_setenv=yes
+   kde_cv_proto_setenv=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38094,7 +36798,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33107,8 +35759,8 @@
+@@ -33107,8 +33206,8 @@
  
  fi
  
@@ -38105,7 +36809,7 @@
  
  if test "x$kde_cv_func_setenv" = xyes; then
  
-@@ -33132,15 +35784,14 @@
+@@ -33132,15 +33231,14 @@
  
  
  
@@ -38124,7 +36828,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33152,9 +35803,6 @@
+@@ -33152,9 +33250,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38134,7 +36838,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33177,24 +35825,36 @@
+@@ -33177,35 +33272,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38152,34 +36856,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33203,9 +35863,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_unsetenv=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38192,7 +36888,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33218,11 +35879,11 @@
+@@ -33218,11 +33309,11 @@
  fi
  
  
@@ -38208,7 +36904,7 @@
  if test "${kde_cv_proto_unsetenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33243,8 +35904,7 @@
+@@ -33243,8 +33334,7 @@
  if test "x$kde_cv_proto_unsetenv" = xunknown; then
  
  
@@ -38218,7 +36914,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33279,24 +35939,36 @@
+@@ -33279,37 +33369,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38236,34 +36932,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33306,10 +35978,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_unsetenv=yes
+   kde_cv_proto_unsetenv=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38277,7 +36967,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33322,8 +35995,8 @@
+@@ -33322,8 +33409,8 @@
  
  fi
  
@@ -38288,7 +36978,7 @@
  
  if test "x$kde_cv_func_unsetenv" = xyes; then
  
-@@ -33347,15 +36020,14 @@
+@@ -33347,15 +33434,14 @@
  
  
  
@@ -38307,7 +36997,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33367,9 +36039,6 @@
+@@ -33367,9 +33453,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -38317,7 +37007,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33397,24 +36066,36 @@
+@@ -33397,35 +33480,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38335,34 +37025,26 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest.$ac_objext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest.$ac_objext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33423,9 +36104,10 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   kde_cv_func_initgroups=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38375,7 +37057,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33438,11 +36120,11 @@
+@@ -33438,11 +33517,11 @@
  fi
  
  
@@ -38391,7 +37073,7 @@
  if test "${kde_cv_proto_initgroups+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33463,8 +36145,7 @@
+@@ -33463,8 +33542,7 @@
  if test "x$kde_cv_proto_initgroups" = xunknown; then
  
  
@@ -38401,7 +37083,7 @@
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -33504,24 +36185,36 @@
+@@ -33504,37 +33582,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38419,34 +37101,28 @@
    rm -f conftest.er1
    cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } &&
+-  (exit $ac_status); } &&
 -	 { ac_try='test -z "$ac_cxx_werror_flag"
 -			 || test ! -s conftest.err'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; } &&
- 	 { ac_try='test -s conftest$ac_exeext'
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; } &&
+-	 { ac_try='test -s conftest$ac_exeext'
 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
 -  (eval $ac_try) 2>&5
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -33531,10 +36224,11 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
++  (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
+    kde_cv_func_initgroups=yes
+   kde_cv_proto_initgroups=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38460,7 +37136,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33547,8 +36241,8 @@
+@@ -33547,8 +33622,8 @@
  
  fi
  
@@ -38471,7 +37147,7 @@
  
  if test "x$kde_cv_func_initgroups" = xyes; then
  
-@@ -33605,8 +36299,8 @@
+@@ -33605,8 +33680,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -38482,7 +37158,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -33617,8 +36311,8 @@
+@@ -33617,8 +33692,8 @@
    else
      install_it="no"
    fi
@@ -38493,7 +37169,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -33730,79 +36424,79 @@
+@@ -33730,79 +33805,79 @@
    kworldwatch_SUBDIR_included_FALSE=
  fi
  
@@ -38610,7 +37286,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -33822,39 +36516,58 @@
+@@ -33822,39 +33897,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -38685,7 +37361,7 @@
    fi
  fi
  rm -f confcache
-@@ -33863,38 +36576,31 @@
+@@ -33863,38 +33957,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -38737,7 +37413,16 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -34038,11 +36744,35 @@
+@@ -34031,17 +34118,45 @@
+ ## M4sh Initialization.  ##
+ ## --------------------- ##
+ 
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   emulate sh
+   NULLCMD=:
    # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
@@ -38745,12 +37430,15 @@
 -  set -o posix
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
- fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
- DUALCASE=1; export DUALCASE # for MKS sh
- 
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
 +
++fi
++
++
++
++
 +# PATH needs CR
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -38770,12 +37458,12 @@
 +    PATH_SEPARATOR=:
 +  fi
 +  rm -f conf$$.sh
-+fi
-+
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+ 
  # Support unset when possible.
  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-   as_unset=unset
-@@ -34051,8 +36781,43 @@
+@@ -34051,8 +34166,43 @@
  fi
  
  
@@ -38820,7 +37508,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -34066,18 +36831,19 @@
+@@ -34066,18 +34216,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -38843,7 +37531,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -34085,159 +36851,120 @@
+@@ -34085,159 +34236,120 @@
  
  
  # Name of the executable.
@@ -39074,28 +37762,37 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -34246,7 +36973,19 @@
+@@ -34246,7 +34358,28 @@
    as_mkdir_p=false
  fi
  
 -as_executable_p="test -f"
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
 +else
-+  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
 +fi
-+rm -f conf$$.file
++as_executable_p=$as_test_x
  
  # Sed expression to map a string onto a valid CPP name.
  as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -34255,31 +36994,14 @@
+@@ -34255,31 +34388,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -39127,11 +37824,11 @@
 +ac_log="
  This file was extended by $as_me, which was
 -generated by GNU Autoconf 2.59.  Invocation command line was
-+generated by GNU Autoconf 2.60a.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -34287,30 +37009,20 @@
+@@ -34287,30 +34403,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -39170,7 +37867,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -34318,7 +37030,7 @@
+@@ -34318,7 +34424,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -39179,7 +37876,7 @@
    -q, --quiet      do not print progress messages
    -d, --debug      don't remove temporary files
        --recheck    update $as_me by reconfiguring in the same conditions
-@@ -34337,19 +37049,21 @@
+@@ -34337,19 +34443,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -39191,7 +37888,7 @@
  config.status
 -configured by $0, generated by GNU Autoconf 2.59,
 -  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-+configured by $0, generated by GNU Autoconf 2.60a,
++configured by $0, generated by GNU Autoconf 2.61,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
  
 -Copyright (C) 2003 Free Software Foundation, Inc.
@@ -39207,7 +37904,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -34360,39 +37074,24 @@
+@@ -34360,39 +34468,24 @@
  do
    case $1 in
    --*=*)
@@ -39253,7 +37950,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -34402,18 +37101,24 @@
+@@ -34402,18 +34495,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -39283,7 +37980,7 @@
  
    esac
    shift
-@@ -34429,73 +37134,85 @@
+@@ -34429,73 +34528,85 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -39416,7 +38113,7 @@
  # If the user did not use the arguments to specify the items to instantiate,
  # then the envvar interface is used.  Set only those that are not.
  # We use the long form for the default assignment because of an extremely
-@@ -34507,513 +37224,664 @@
+@@ -34507,513 +34618,664 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -40533,7 +39230,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -35021,248 +37889,130 @@
+@@ -35021,248 +35283,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -40882,7 +39579,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -35273,135 +38023,39 @@
+@@ -35273,135 +35417,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -41044,7 +39741,7 @@
    # Strip MF so we end up with the name of the file.
    mf=`echo "$mf" | sed -e 's/:.*$//'`
    # Check whether this is an Automake generated Makefile or not.
-@@ -35411,18 +38065,29 @@
+@@ -35411,18 +35459,29 @@
    # each Makefile.in and add a new line on top of each file to say so.
    # So let's grep whole file.
    if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
@@ -41082,7 +39779,7 @@
    else
      continue
    fi
-@@ -35444,53 +38109,79 @@
+@@ -35444,53 +35503,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -41195,7 +39892,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdetoys, "3.5.5") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdetoys, "3.5.6") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -41299,16 +39996,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -503,10 +512,10 @@
- .NOEXPORT:
+@@ -506,7 +515,7 @@
+ KDE_DIST=billy.png tao.png bonhomme.png spot.png index.docbook pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am 
  
- #>+ 2
--KDE_DIST=billy.png tao.png bonhomme.png spot.png index.docbook pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am 
-+KDE_DIST=billy.png tao.png bonhomme.png index.docbook spot.png pingus.png neko.png tux.png index.cache.bz2 man-amor.6.docbook ghost.png Makefile.in eyes.png bsd.png worm.png Makefile.am 
- 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook pingus.png eyes.png worm.png tao.png man-amor.6.docbook ghost.png billy.png bonhomme.png bsd.png spot.png tux.png neko.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
@@ -41317,14 +40010,14 @@
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor
 -	@for base in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
-+	@for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
++	@for base in index.docbook pingus.png eyes.png worm.png tao.png man-amor.6.docbook ghost.png billy.png bonhomme.png bsd.png spot.png tux.png neko.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
-+	for base in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
++	for base in index.docbook pingus.png eyes.png worm.png tao.png man-amor.6.docbook ghost.png billy.png bonhomme.png bsd.png spot.png tux.png neko.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/amor/$$base ;\
  	done
  
@@ -41332,7 +40025,7 @@
  #>+ 5
  distdir-nls:
 -	for file in bonhomme.png neko.png tux.png tao.png index.docbook ghost.png worm.png eyes.png pingus.png spot.png bsd.png man-amor.6.docbook billy.png ; do \
-+	for file in eyes.png man-amor.6.docbook spot.png tao.png neko.png worm.png tux.png ghost.png pingus.png bonhomme.png billy.png index.docbook bsd.png ; do \
++	for file in index.docbook pingus.png eyes.png worm.png tao.png man-amor.6.docbook ghost.png billy.png bonhomme.png bsd.png spot.png tux.png neko.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -41530,39 +40223,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -505,7 +514,7 @@
- KDE_DIST=index.docbook guide.png index.cache.bz2 Makefile.in Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook guide.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) guide.png index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -532,20 +541,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo
--	@for base in index.docbook guide.png ; do \
-+	@for base in guide.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook guide.png ; do \
-+	for base in guide.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kodo/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook guide.png ; do \
-+	for file in guide.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kteatime/Makefile.in
 +++ doc/kteatime/Makefile.in
 @@ -91,6 +91,7 @@
@@ -41660,39 +40320,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -505,7 +514,7 @@
- KDE_DIST=index.docbook index.cache.bz2 Makefile.in config.png Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook config.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) config.png index.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -532,20 +541,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime
--	@for base in index.docbook config.png ; do \
-+	@for base in config.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook config.png ; do \
-+	for base in config.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kteatime/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook config.png ; do \
-+	for file in config.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kweather/Makefile.in
 +++ doc/kweather/Makefile.in
 @@ -91,6 +91,7 @@
@@ -41887,16 +40514,12 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -503,10 +512,10 @@
- .NOEXPORT:
+@@ -506,7 +515,7 @@
+ KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png index.cache.bz2 screenshot-mlb.png screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am 
  
- #>+ 2
--KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png index.cache.bz2 screenshot-mlb.png screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am 
-+KDE_DIST=man-kworldclock.1.docbook screenshot-rmb-clock.png screenshot-rmb-daylight.png index.docbook screenshot-clock-dialog.png screenshot-quairading-clock.png screenshot-rmb-flags.png screenshot-withflags.png screenshot-mlb.png index.cache.bz2 screenshot.png screenshot-withclocks.png Makefile.in screenshot-quairading-dialog.png screenshot-rmb-cities.png Makefile.am 
- 
  #>+ 24
 -index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png 
++index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) screenshot.png screenshot-quairading-clock.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-mlb.png man-kworldclock.1.docbook screenshot-withclocks.png screenshot-rmb-cities.png index.docbook screenshot-quairading-dialog.png screenshot-withflags.png screenshot-clock-dialog.png screenshot-rmb-flags.png 
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
@@ -41905,14 +40528,14 @@
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock
 -	@for base in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
-+	@for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
++	@for base in screenshot.png screenshot-quairading-clock.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-mlb.png man-kworldclock.1.docbook screenshot-withclocks.png screenshot-rmb-cities.png index.docbook screenshot-quairading-dialog.png screenshot-withflags.png screenshot-clock-dialog.png screenshot-rmb-flags.png ; do \
  	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
  	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
  	done
  
  uninstall-nls:
 -	for base in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
-+	for base in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
++	for base in screenshot.png screenshot-quairading-clock.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-mlb.png man-kworldclock.1.docbook screenshot-withclocks.png screenshot-rmb-cities.png index.docbook screenshot-quairading-dialog.png screenshot-withflags.png screenshot-clock-dialog.png screenshot-rmb-flags.png ; do \
  	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kworldclock/$$base ;\
  	done
  
@@ -41920,7 +40543,7 @@
  #>+ 5
  distdir-nls:
 -	for file in screenshot-quairading-dialog.png screenshot.png screenshot-rmb-daylight.png man-kworldclock.1.docbook index.docbook screenshot-clock-dialog.png screenshot-withflags.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-rmb-flags.png screenshot-withclocks.png screenshot-quairading-clock.png screenshot-rmb-cities.png ; do \
-+	for file in screenshot-quairading-clock.png man-kworldclock.1.docbook screenshot-withflags.png screenshot-quairading-dialog.png screenshot-withclocks.png screenshot-rmb-cities.png screenshot-rmb-flags.png screenshot.png screenshot-rmb-clock.png screenshot-mlb.png screenshot-clock-dialog.png index.docbook screenshot-rmb-daylight.png ; do \
++	for file in screenshot.png screenshot-quairading-clock.png screenshot-rmb-clock.png screenshot-rmb-daylight.png screenshot-mlb.png man-kworldclock.1.docbook screenshot-withclocks.png screenshot-rmb-cities.png index.docbook screenshot-quairading-dialog.png screenshot-withflags.png screenshot-clock-dialog.png screenshot-rmb-flags.png ; do \
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -42005,7 +40628,7 @@
  #>- SUBDIRS = $(AUTODIRS)
  #>+ 1
 -SUBDIRS =. kmoon kteatime kweather kodo amor kworldclock
-+SUBDIRS =. amor kodo kmoon kweather kworldclock kteatime
++SUBDIRS =. kworldclock kmoon kteatime kweather amor kodo
  #>- all: all-recursive
  #>+ 1
  all: docs-am  all-recursive
@@ -42319,36 +40942,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -851,7 +860,7 @@
- 	-rm -f  kmoonapplet.moc kmoonwidget.moc kmoondlg.moc
- 
- #>+ 2
--KDE_DIST=kmoonapplet.desktop hi48-app-kmoon.png kmoonwidget.h kmoondlg.h hi16-app-kmoon.png kmoonapplet.h Makefile.in version.h Makefile.am hi32-app-kmoon.png 
-+KDE_DIST=kmoonapplet.desktop hi48-app-kmoon.png kmoonwidget.h kmoondlg.h hi16-app-kmoon.png kmoonapplet.h Makefile.in version.h hi32-app-kmoon.png Makefile.am 
- 
- #>+ 3
- clean-closures:
-@@ -862,17 +871,17 @@
- 
- #>+ 13
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kmoon.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmoon.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kmoon.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmoon.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kmoon.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmoon.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kmoon.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmoon.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmoon.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kmoon.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kmoon.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kmoon.png
- 
- #>+ 15
- force-reedit:
 --- kmoon/pics/Makefile.in
 +++ kmoon/pics/Makefile.in
 @@ -101,6 +101,7 @@
@@ -42451,7 +41044,7 @@
  
  #>+ 2
 -KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon25.png moon7.png moon28.png moon29.png moon19.png moon2.png moon9.png moon1.png moon26.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am 
-+KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon25.png moon7.png moon28.png moon29.png moon19.png moon2.png moon9.png moon26.png moon1.png moon17.png moon16.png moon14.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am 
++KDE_DIST=moon3.png moon4.png moon24.png moon13.png moon5.png moon7.png moon25.png moon28.png moon29.png moon19.png moon2.png moon9.png moon1.png moon26.png moon17.png moon14.png moon16.png moon23.png moon11.png moon12.png moon18.png moon6.png Makefile.in moon22.png moon15.png moon8.png moon10.png moon21.png moon27.png moon20.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -42552,7 +41145,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -733,24 +742,24 @@
+@@ -733,7 +742,7 @@
  	-rm -f  kimagenumber.moc kodometer.moc
  
  #>+ 2
@@ -42561,29 +41154,6 @@
  
  #>+ 2
  docs-am:
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kodo.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kodo.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kodo.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kodo.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kodo.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kodo.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kodo.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kodo.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kodo.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kodo.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kodo.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kodo.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kodo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kodo.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kodo.png
- 
- #>+ 15
- force-reedit:
 --- kteatime/Makefile.in
 +++ kteatime/Makefile.in
 @@ -139,6 +139,7 @@
@@ -42681,7 +41251,7 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -733,42 +742,42 @@
+@@ -733,7 +742,7 @@
  	-rm -f  timeedit.moc toplevel.moc
  
  #>+ 2
@@ -42690,52 +41260,40 @@
  
  #>+ 2
  docs-am:
- 
- #>+ 31
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kteatime.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kteatime.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kteatime.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kteatime.png
+@@ -747,14 +756,14 @@
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kteatime.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kteatime.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kteatime.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kteatime.png
  	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-mug.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
+-	$(INSTALL_DATA) $(srcdir)/cr22-action-mug.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
 -	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim1.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim2.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
--	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps/kteatime.png
+ 	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim2.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps/kteatime.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-mug.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim1.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
  	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/hicolor/16x16/apps
  	$(INSTALL_DATA) $(srcdir)/hi16-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/hicolor/16x16/apps/kteatime.png
++	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
  	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/hicolor/48x48/apps/kteatime.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim1.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_anim2.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
-+	$(mkinstalldirs) $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kteatime.png $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps/kteatime.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-tea_not_ready.png $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
  
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kteatime.png
+@@ -762,12 +771,12 @@
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kteatime.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kteatime.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kteatime.png
 -	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kteatime.png
- 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
-+	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/16x16/apps/kteatime.png
-+	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/48x48/apps/kteatime.png
- 	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
+-	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
+-	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
  	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim2.png
  	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/32x32/apps/kteatime.png
--	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/16x16/apps/kteatime.png
--	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/48x48/apps/kteatime.png
++	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/mug.png
++	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_anim1.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/16x16/apps/kteatime.png
 +	-rm -f $(DESTDIR)$(kteatimeicondir)/crystalsvg/22x22/actions/tea_not_ready.png
+ 	-rm -f $(DESTDIR)$(kteatimeicondir)/hicolor/48x48/apps/kteatime.png
  
  #>+ 15
- force-reedit:
 --- ktux/Makefile.in
 +++ ktux/Makefile.in
 @@ -156,6 +156,7 @@
@@ -42833,24 +41391,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -850,14 +859,14 @@
- 
- #>+ 10
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-ktux.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktux.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-ktux.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktux.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-ktux.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktux.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktux.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktux.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktux.png
- 
- #>+ 15
- force-reedit:
 --- ktux/sprites/Makefile.in
 +++ ktux/sprites/Makefile.in
 @@ -101,6 +101,7 @@
@@ -42953,7 +41493,7 @@
  
  #>+ 2
 -KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in star0001.png anim0009.png anim0005.png Makefile.am 
-+KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png flare0002.png anim0010.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in anim0009.png star0001.png anim0005.png Makefile.am 
++KDE_DIST=anim0003.png anim0002.png anim0007.png anim0004.png anim0010.png flare0002.png star0002.png bg.png spriterc anim0001.png anim0008.png flare0001.png anim0006.png Makefile.in star0001.png anim0009.png anim0005.png Makefile.am 
  
  #>+ 2
  docs-am:
@@ -43059,7 +41599,7 @@
  
  #>+ 2
 -KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png tstorm1.png mist_night.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png tstorm3.png fog.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png 
-+KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png mist_night.png tstorm1.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png fog.png tstorm3.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png Makefile.in tstorm2.png cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png 
++KDE_DIST=light_rain.png snow4.png sleet.png snow3_night.png sunny.png tstorm1_night.png shower1_night.png shower2_night.png snow3.png snow2_night.png shower1.png cloudy4_night.png cloudy3.png mist_night.png tstorm1.png cloudy5.png shower2.png overcast.png snow1_night.png snow5.png mist.png tstorm2_night.png hail.png fog.png tstorm3.png cloudy2_night.png cloudy1_night.png cloudy1.png snow1.png tstorm2.png Makefile.in cloudy4.png fog_night.png snow2.png shower3.png cloudy2.png cloudy3_night.png sunny_night.png Makefile.am dunno.png 
  
  #>+ 2
  docs-am:
@@ -43160,105 +41700,36 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1278,13 +1287,6 @@
- mocs: kcmweather.moc
+@@ -1375,7 +1384,7 @@
+ 	-rm -f  weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherservice.moc weatherlib.moc kweather.moc kcmweatherservice.moc dockwidget.moc weatherbutton.moc reportview.moc sidebarwidget.moc
  
- #>+ 3
--weatherservice.moc: $(srcdir)/weatherservice.h
--	$(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
--
--#>+ 2
--mocs: weatherservice.moc
--
--#>+ 3
- weatherlib.moc: $(srcdir)/weatherlib.h
- 	$(MOC) $(srcdir)/weatherlib.h -o weatherlib.moc
- 
-@@ -1292,11 +1294,11 @@
- mocs: weatherlib.moc
- 
- #>+ 3
--kweather.moc: $(srcdir)/kweather.h
--	$(MOC) $(srcdir)/kweather.h -o kweather.moc
-+weatherservice.moc: $(srcdir)/weatherservice.h
-+	$(MOC) $(srcdir)/weatherservice.h -o weatherservice.moc
- 
  #>+ 2
--mocs: kweather.moc
-+mocs: weatherservice.moc
- 
- #>+ 3
- kcmweatherservice.moc: $(srcdir)/kcmweatherservice.h
-@@ -1306,18 +1308,18 @@
- mocs: kcmweatherservice.moc
- 
- #>+ 3
--dockwidget.moc: $(srcdir)/dockwidget.h
--	$(MOC) $(srcdir)/dockwidget.h -o dockwidget.moc
-+kweather.moc: $(srcdir)/kweather.h
-+	$(MOC) $(srcdir)/kweather.h -o kweather.moc
- 
- #>+ 2
--mocs: dockwidget.moc
-+mocs: kweather.moc
- 
- #>+ 3
--weatherbutton.moc: $(srcdir)/weatherbutton.h
--	$(MOC) $(srcdir)/weatherbutton.h -o weatherbutton.moc
-+dockwidget.moc: $(srcdir)/dockwidget.h
-+	$(MOC) $(srcdir)/dockwidget.h -o dockwidget.moc
- 
- #>+ 2
--mocs: weatherbutton.moc
-+mocs: dockwidget.moc
- 
- #>+ 3
- reportview.moc: $(srcdir)/reportview.h
-@@ -1327,6 +1329,13 @@
- mocs: reportview.moc
- 
- #>+ 3
-+weatherbutton.moc: $(srcdir)/weatherbutton.h
-+	$(MOC) $(srcdir)/weatherbutton.h -o weatherbutton.moc
-+
-+#>+ 2
-+mocs: weatherbutton.moc
-+
-+#>+ 3
- sidebarwidget.moc: $(srcdir)/sidebarwidget.h
- 	$(MOC) $(srcdir)/sidebarwidget.h -o sidebarwidget.moc
- 
-@@ -1372,10 +1381,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherservice.moc weatherlib.moc kweather.moc kcmweatherservice.moc dockwidget.moc weatherbutton.moc reportview.moc sidebarwidget.moc
-+	-rm -f  weatherbar.moc serviceconfigwidget.moc kcmweather.moc weatherlib.moc weatherservice.moc kcmweatherservice.moc kweather.moc dockwidget.moc reportview.moc weatherbutton.moc sidebarwidget.moc
- 
- #>+ 2
 -KDE_DIST=kcmweatherservice.h weatherlog.sh hi48-app-kweather.png reportview.h weatherbar_add.desktop kweatherservice.desktop hi16-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h weather_stations.desktop serviceconfigdata.ui weatherbar.h sidebarwidget.h dockwidget.h kweather.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop hi32-app-kweather.png weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h 
-+KDE_DIST=kcmweatherservice.h weatherlog.sh hi48-app-kweather.png reportview.h weatherbar_add.desktop kweatherservice.desktop hi16-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h serviceconfigdata.ui weather_stations.desktop weatherbar.h sidebarwidget.h kweather.h dockwidget.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop hi32-app-kweather.png weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h 
++KDE_DIST=kcmweatherservice.h weatherlog.sh hi48-app-kweather.png reportview.h weatherbar_add.desktop kweatherservice.desktop hi16-app-kweather.png kcmweatherservice.desktop weatherIface.h kcmweather.desktop serviceconfigwidget.h weather_stations.desktop serviceconfigdata.ui weatherbar.h sidebarwidget.h kweather.h dockwidget.h sun.h test.sh kweatherreport.desktop prefdialogdata.ui kweather.desktop hi32-app-kweather.png weatherbar.desktop configure.in.in weatherbutton.h stationdatabase.h Makefile.in kweather.kdevprj metar_parser.h kcmweather.h weatherservice.h stations.dat Makefile.am weathersig.sh weatherlib.h 
  
  #>+ 10
  clean-idl:
-@@ -1490,7 +1499,7 @@
- 	rm -f kcm_weatherservice_la.all_cpp.final kcm_weatherservice_la.all_cpp.files
+@@ -1403,17 +1412,17 @@
  
- #>+ 11
--weather_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/reportview.cpp $(srcdir)/kweather.cpp $(srcdir)/dockwidget.cpp $(srcdir)/weatherbutton.cpp weatherIface_skel.cpp weatherservice_stub.cpp  kweather.moc dockwidget.moc weatherbutton.moc reportview.moc
-+weather_panelapplet_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/reportview.cpp $(srcdir)/kweather.cpp $(srcdir)/dockwidget.cpp $(srcdir)/weatherbutton.cpp weatherIface_skel.cpp weatherservice_stub.cpp  kweather.moc dockwidget.moc reportview.moc weatherbutton.moc
- 	@echo 'creating weather_panelapplet_la.all_cpp.cpp ...'; \
- 	rm -f weather_panelapplet_la.all_cpp.files weather_panelapplet_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> weather_panelapplet_la.all_cpp.final; \
-@@ -1502,7 +1511,7 @@
- 	rm -f weather_panelapplet_la.all_cpp.final weather_panelapplet_la.all_cpp.files
+ #>+ 13
+ install-kde-icons:
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
++	$(INSTALL_DATA) $(srcdir)/hi32-app-kweather.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kweather.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi16-app-kweather.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kweather.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi48-app-kweather.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kweather.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
+-	$(INSTALL_DATA) $(srcdir)/hi32-app-kweather.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kweather.png
  
- #>+ 11
--kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp  weatherlib.moc weatherservice.moc
-+kweatherservice.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/metar_parser.cpp $(srcdir)/weatherlib.cpp $(srcdir)/weatherservice.cpp $(srcdir)/stationdatabase.cpp $(srcdir)/sun.cpp weatherservice_skel.cpp weatherservice_stub.cpp  weatherservice.moc weatherlib.moc
- 	@echo 'creating kweatherservice.all_cpp.cpp ...'; \
- 	rm -f kweatherservice.all_cpp.files kweatherservice.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kweatherservice.all_cpp.final; \
+ uninstall-kde-icons:
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kweather.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kweather.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kweather.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kweather.png
+ 
+ #>+ 15
+ force-reedit:
 --- kworldwatch/Makefile.in
 +++ kworldwatch/Makefile.in
 @@ -184,6 +184,7 @@
@@ -43356,29 +41827,28 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1049,19 +1058,19 @@
- 
- #>+ 16
+@@ -1051,18 +1060,18 @@
  install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kworldclock.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
+-	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
+-	$(INSTALL_DATA) $(srcdir)/hi16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
+ 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
+ 	$(INSTALL_DATA) $(srcdir)/hi22-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
  	$(INSTALL_DATA) $(srcdir)/hi48-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kworldclock.png
++	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
++	$(INSTALL_DATA) $(srcdir)/hi16-app-kworldclock.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
  
  uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kworldclock.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
+-	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
+ 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kworldclock.png
  	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kworldclock.png
++	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kworldclock.png
  
  #>+ 15
+ force-reedit:
 --- kworldwatch/maps/depths/Makefile.in
 +++ kworldwatch/maps/depths/Makefile.in
 @@ -101,6 +101,7 @@




More information about the pkg-kde-commits mailing list