rev 5339 - in trunk/packages/kdeutils/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Wed Jan 17 00:24:08 CET 2007


Author: ana
Date: 2007-01-17 00:23:05 +0100 (Wed, 17 Jan 2007)
New Revision: 5339

Modified:
   trunk/packages/kdeutils/debian/changelog
   trunk/packages/kdeutils/debian/control
   trunk/packages/kdeutils/debian/patches/98_buildprep.diff
Log:
kdeutils 3.5.6


Modified: trunk/packages/kdeutils/debian/changelog
===================================================================
--- trunk/packages/kdeutils/debian/changelog	2007-01-16 23:14:16 UTC (rev 5338)
+++ trunk/packages/kdeutils/debian/changelog	2007-01-16 23:23:05 UTC (rev 5339)
@@ -1,9 +1,11 @@
-kdeutils (4:3.5.5-3) UNRELEASED; urgency=low
+kdeutils (4:3.5.6-1) experimental; urgency=low
 
+  * New upstream release.
+  * Update Uploaders.
   * Make kdeutils-dbg depend on kdelibs-dbg to get useful backtraces when
     debugging.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 22 Nov 2006 09:40:59 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 17 Jan 2007 00:16:21 +0100
 
 kdeutils (4:3.5.5-2) unstable; urgency=medium
 

Modified: trunk/packages/kdeutils/debian/control
===================================================================
--- trunk/packages/kdeutils/debian/control	2007-01-16 23:14:16 UTC (rev 5338)
+++ trunk/packages/kdeutils/debian/control	2007-01-16 23:23:05 UTC (rev 5339)
@@ -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>
+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>, Ana Beatriz Guerrero Lopez <ana at debian.org>
 Build-Depends: cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), autotools-dev, gawk, gettext, kdelibs4-dev (>= 4:3.5.5), kdebase-dev (>= 4:3.5.5), libkonq4-dev (>= 4:3.5.5), libgmp3-dev, libsnmp9-dev, libxpm-dev, python-dev, xmms-dev, libxtst-dev, xutils, pbbuttonsd-dev [powerpc], sharutils
 Build-Depends-Indep: doxygen, qt3-doc, graphviz, gsfonts-x11, kdelibs4-doc
 Standards-Version: 3.7.2

Modified: trunk/packages/kdeutils/debian/patches/98_buildprep.diff
===================================================================
--- trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2007-01-16 23:14:16 UTC (rev 5338)
+++ trunk/packages/kdeutils/debian/patches/98_buildprep.diff	2007-01-16 23:23:05 UTC (rev 5339)
@@ -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.
 --- ark/Makefile.in
 +++ ark/Makefile.in
 @@ -204,6 +204,7 @@
@@ -3970,92 +3932,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1181,18 +1190,18 @@
- ark_DEPENDENCIES = libkdeinit_ark.la
- 
- #>+ 3
--tar.moc: $(srcdir)/tar.h
--	$(MOC) $(srcdir)/tar.h -o tar.moc
-+arkwidget.moc: $(srcdir)/arkwidget.h
-+	$(MOC) $(srcdir)/arkwidget.h -o arkwidget.moc
- 
- #>+ 2
--mocs: tar.moc
-+mocs: arkwidget.moc
- 
- #>+ 3
--arkwidget.moc: $(srcdir)/arkwidget.h
--	$(MOC) $(srcdir)/arkwidget.h -o arkwidget.moc
-+tar.moc: $(srcdir)/tar.h
-+	$(MOC) $(srcdir)/tar.h -o tar.moc
- 
- #>+ 2
--mocs: arkwidget.moc
-+mocs: tar.moc
- 
- #>+ 3
- arch.moc: $(srcdir)/arch.h
-@@ -1342,10 +1351,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  tar.moc arkwidget.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc zoo.moc ar.moc zip.moc mainwindow.moc arkapp.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
-+	-rm -f  arkwidget.moc tar.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc zoo.moc ar.moc zip.moc mainwindow.moc arkapp.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
- 
- #>+ 2
--KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc tar.h common_texts.cpp ark.kcfg hi32-app-ark.png hi16-app-ark.png arkfactory.h arkapp.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h archiveformatdlg.h arch.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui tarlistingthread.h ark_part.rc Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
-+KDE_DIST=archiveformatinfo.h arkutils.h hi128-app-ark.png extraction.ui arkui.rc common_texts.cpp tar.h ark.kcfg hi32-app-ark.png hi16-app-ark.png arkapp.h arkfactory.h ar.h ark_part_readonly.rc mainwindow.h rar.h arkviewer.h compressedfile.h arch.h archiveformatdlg.h addition.ui zoo.h ark_part.desktop settings.kcfgc arkwidget.h searchbar.h hi64-app-ark.png hi48-app-ark.png lha.h filelistview.h configure.in.in general.ui ark_part.rc tarlistingthread.h Makefile.in sevenzip.h zip.h extractiondialog.h ark.desktop ark_part.h hisc-app-ark.svgz ace.h Makefile.am hi22-app-ark.png 
- 
- #>+ 6
- clean-ui:
-@@ -1368,29 +1377,29 @@
- 
- #>+ 25
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ark.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/hisc-app-ark.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ark.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ark.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ark.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-ark.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/ark.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/ark.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ark.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ark.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ark.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ark.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/ark.png
- 
- #>+ 15
- force-reedit:
-@@ -1467,7 +1476,7 @@
- 	rm -f libark_common_la.all_cpp.final libark_common_la.all_cpp.files
- 
- #>+ 11
--libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp $(srcdir)/tarlistingthread.cpp addition.cpp extraction.cpp general.cpp  general.moc arkwidget.moc tar.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
-+libarkpart_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ark_part.cpp $(srcdir)/arkfactory.cpp $(srcdir)/zip.cpp $(srcdir)/tar.cpp $(srcdir)/filelistview.cpp $(srcdir)/arch.cpp $(srcdir)/lha.cpp $(srcdir)/compressedfile.cpp $(srcdir)/zoo.cpp $(srcdir)/rar.cpp $(srcdir)/ar.cpp $(srcdir)/arkutils.cpp $(srcdir)/archiveformatdlg.cpp $(srcdir)/arkwidget.cpp $(srcdir)/searchbar.cpp $(srcdir)/arkviewer.cpp $(srcdir)/sevenzip.cpp $(srcdir)/extractiondialog.cpp $(srcdir)/ace.cpp $(srcdir)/tarlistingthread.cpp addition.cpp extraction.cpp general.cpp  general.moc tar.moc arkwidget.moc extraction.moc arch.moc filelistview.moc rar.moc searchbar.moc ace.moc compressedfile.moc ark_part.moc arkviewer.moc lha.moc addition.moc zoo.moc ar.moc zip.moc sevenzip.moc extractiondialog.moc archiveformatdlg.moc
- 	@echo 'creating libarkpart_la.all_cpp.cpp ...'; \
- 	rm -f libarkpart_la.all_cpp.files libarkpart_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libarkpart_la.all_cpp.final; \
 --- ark/pics/Makefile.in
 +++ ark/pics/Makefile.in
 @@ -94,6 +94,7 @@
@@ -4153,60 +4029,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -553,7 +562,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr32-action-ark_view.png Makefile.in cr22-action-ark_view.png cr22-action-ark_selectall.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am 
-+KDE_DIST=cr22-action-ark_addfile.png cr22-action-ark_delete.png cr22-action-ark_extract.png cr32-action-ark_delete.png cr22-action-ark_adddir.png cr32-action-ark_view.png Makefile.in cr22-action-ark_selectall.png cr22-action-ark_view.png cr32-action-ark_extract.png cr32-action-ark_adddir.png cr32-action-ark_addfile.png Makefile.am 
- 
- #>+ 2
- docs-am:
-@@ -561,31 +570,31 @@
- #>+ 28
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
--	$(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
--	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-+	$(mkinstalldirs) $(DESTDIR)$(icondir)/crystalsvg/32x32/actions
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_addfile.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_selectall.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_adddir.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_extract.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
- 	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_view.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-ark_delete.png $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_addfile.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_addfile.png
--	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_view.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_selectall.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_extract.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_adddir.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_adddir.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_extract.png
- 	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_view.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/32x32/actions/ark_delete.png
-+	-rm -f $(DESTDIR)$(icondir)/crystalsvg/22x22/actions/ark_delete.png
- 
- #>+ 15
- force-reedit:
 --- charselectapplet/Makefile.in
 +++ charselectapplet/Makefile.in
 @@ -140,6 +140,7 @@
@@ -4337,11 +4159,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,
@@ -4349,7 +4171,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+"$@"}'='"$@"'
@@ -4357,12 +4187,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'
@@ -4382,12 +4215,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
  
  
@@ -4432,7 +4265,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
@@ -4455,7 +4288,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -63,157 +124,386 @@
+@@ -63,157 +128,388 @@
  
  
  # Name of the executable.
@@ -4604,8 +4437,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=.
@@ -4626,7 +4458,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=:
@@ -4635,18 +4466,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=:
@@ -4655,11 +4487,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)
@@ -4941,28 +4775,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'"
  
  
@@ -4978,7 +4821,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.
@@ -4997,7 +4840,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
  
@@ -5031,7 +4874,7 @@
  # Identity of this package.
  PACKAGE_NAME=
  PACKAGE_TARNAME=
-@@ -430,42 +720,377 @@
+@@ -430,42 +735,378 @@
  # Factoring default headers for most tests.
  ac_includes_default="\
  #include <stdio.h>
@@ -5410,6 +5253,7 @@
 +CC
 +CFLAGS
 +LDFLAGS
++LIBS
 +CPPFLAGS
 +CPP
 +CXX
@@ -5423,7 +5267,7 @@
  
  # Initialize some variables set by options.
  ac_init_help=
-@@ -492,34 +1117,48 @@
+@@ -492,34 +1133,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.
@@ -5479,7 +5323,7 @@
  
    -bindir | --bindir | --bindi | --bind | --bin | --bi)
      ac_prev=bindir ;;
-@@ -541,12 +1180,18 @@
+@@ -541,33 +1196,45 @@
    --config-cache | -C)
      cache_file=config.cache ;;
  
@@ -5501,11 +5345,13 @@
    -disable-* | --disable-*)
      ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
      # Reject names that are not valid shell variable names.
-@@ -554,7 +1199,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)
@@ -5520,20 +5366,23 @@
  
    -enable-* | --enable-*)
      ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-@@ -563,11 +1218,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 +1245,12 @@
+@@ -594,6 +1261,12 @@
    -host=* | --host=* | --hos=* | --ho=*)
      host_alias=$ac_optarg ;;
  
@@ -5546,7 +5395,7 @@
    -includedir | --includedir | --includedi | --included | --include \
    | --includ | --inclu | --incl | --inc)
      ac_prev=includedir ;;
-@@ -618,13 +1275,16 @@
+@@ -618,13 +1291,16 @@
    | --libexe=* | --libex=* | --libe=*)
      libexecdir=$ac_optarg ;;
  
@@ -5567,7 +5416,7 @@
      localstatedir=$ac_optarg ;;
  
    -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-@@ -689,6 +1349,16 @@
+@@ -689,6 +1365,16 @@
    | --progr-tra=* | --program-tr=* | --program-t=*)
      program_transform_name=$ac_optarg ;;
  
@@ -5584,29 +5433,38 @@
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
      silent=yes ;;
-@@ -745,11 +1415,7 @@
+@@ -741,24 +1427,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 +1424,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 +1455,7 @@
+@@ -789,8 +1471,7 @@
      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
        { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
     { (exit 1); exit 1; }; }
@@ -5616,21 +5474,15 @@
      export $ac_envvar ;;
  
    *)
-@@ -810,27 +1475,19 @@
+@@ -810,27 +1491,19 @@
     { (exit 1); exit 1; }; }
  fi
  
 -# Be sure to have absolute paths.
 -for ac_var in exec_prefix prefix
-+# Be sure to have absolute directory names.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
- do
+-do
 -  eval ac_val=$`echo $ac_var`
-+  eval ac_val=\$$ac_var
-   case $ac_val in
+-  case $ac_val in
 -    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
@@ -5640,9 +5492,15 @@
 -# Be sure to have absolute paths.
 -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
 -	      localstatedir libdir includedir oldincludedir infodir mandir
--do
++# Be sure to have absolute directory names.
++for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
++		datadir sysconfdir sharedstatedir localstatedir includedir \
++		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
++		libdir localedir mandir
+ do
 -  eval ac_val=$`echo $ac_var`
--  case $ac_val in
++  eval ac_val=\$$ac_var
+   case $ac_val in
 -    [\\/$]* | ?:[\\/]* ) ;;
 -    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
 -   { (exit 1); exit 1; }; };;
@@ -5654,7 +5512,7 @@
  done
  
  # There might be people who depend on the old broken behavior: `$host'
-@@ -857,94 +1514,76 @@
+@@ -857,94 +1530,76 @@
  test "$silent" = yes && exec 6>/dev/null
  
  
@@ -5806,7 +5664,7 @@
  
  #
  # Report the --help message.
-@@ -973,9 +1612,6 @@
+@@ -973,9 +1628,6 @@
    -n, --no-create         do not create output files
        --srcdir=DIR        find the sources in DIR [configure dir or \`..']
  
@@ -5816,7 +5674,7 @@
  Installation directories:
    --prefix=PREFIX         install architecture-independent files in PREFIX
  			  [$ac_default_prefix]
-@@ -993,15 +1629,22 @@
+@@ -993,15 +1645,22 @@
    --bindir=DIR           user executables [EPREFIX/bin]
    --sbindir=DIR          system admin executables [EPREFIX/sbin]
    --libexecdir=DIR       program executables [EPREFIX/libexec]
@@ -5842,7 +5700,7 @@
  _ACEOF
  
    cat <<\_ACEOF
-@@ -1025,6 +1668,8 @@
+@@ -1025,6 +1684,8 @@
  Optional Features:
    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
@@ -5851,7 +5709,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 +1687,8 @@
+@@ -1042,10 +1703,8 @@
                            of memory)
    --enable-closure        delay template instantiation
    --enable-nmcheck        enable automatic namespace cleanness check
@@ -5864,7 +5722,7 @@
    --enable-libsuffix      /lib directory suffix (64,32,none,auto=default)
    --enable-fast-install[=PKGS]
                            optimize for fast installation [default=yes]
-@@ -1067,8 +1710,7 @@
+@@ -1067,8 +1726,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]
@@ -5874,7 +5732,7 @@
    --with-extra-includes=DIR
                            adds non standard include paths
    --with-extra-libs=DIR   adds non standard library paths
-@@ -1076,8 +1718,7 @@
+@@ -1076,8 +1734,7 @@
    --with-qt-includes=DIR  where the Qt includes are.
    --with-qt-libraries=DIR where the Qt library is installed.
    --without-arts          build without aRts default=no
@@ -5884,12 +5742,13 @@
    --with-snmp             enable support for SNMP [default=check]
    --with-pythondir=pythondir
                            use python installed in pythondir
-@@ -1088,131 +1729,100 @@
+@@ -1088,131 +1745,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
@@ -5955,8 +5814,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
@@ -5994,15 +5860,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
@@ -6037,7 +5896,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,
@@ -6056,7 +5915,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 $@
  
@@ -6065,7 +5924,7 @@
  {
  cat <<_ASUNAME
  ## --------- ##
-@@ -1231,7 +1841,7 @@
+@@ -1231,7 +1858,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`
@@ -6074,7 +5933,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`
-@@ -1245,6 +1855,7 @@
+@@ -1245,6 +1872,7 @@
    test -z "$as_dir" && as_dir=.
    echo "PATH: $as_dir"
  done
@@ -6082,7 +5941,7 @@
  
  } >&5
  
-@@ -1266,7 +1877,6 @@
+@@ -1266,7 +1894,6 @@
  ac_configure_args=
  ac_configure_args0=
  ac_configure_args1=
@@ -6090,7 +5949,7 @@
  ac_must_keep_next=false
  for ac_pass in 1 2
  do
-@@ -1277,7 +1887,7 @@
+@@ -1277,7 +1904,7 @@
      -q | -quiet | --quiet | --quie | --qui | --qu | --q \
      | -silent | --silent | --silen | --sile | --sil)
        continue ;;
@@ -6099,7 +5958,7 @@
        ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
      esac
      case $ac_pass in
-@@ -1299,9 +1909,7 @@
+@@ -1299,9 +1926,7 @@
  	  -* ) ac_must_keep_next=true ;;
  	esac
        fi
@@ -6110,7 +5969,7 @@
        ;;
      esac
    done
-@@ -1312,8 +1920,8 @@
+@@ -1312,8 +1937,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.
@@ -6121,7 +5980,7 @@
  trap 'exit_status=$?
    # Save into config.log some information that might help in debugging.
    {
-@@ -1326,20 +1934,34 @@
+@@ -1326,20 +1951,34 @@
  _ASBOX
      echo
      # The following way of writing the cache mishandles newlines in values,
@@ -6166,7 +6025,7 @@
      echo
  
      cat <<\_ASBOX
-@@ -1350,22 +1972,28 @@
+@@ -1350,22 +1989,28 @@
      echo
      for ac_var in $ac_subst_vars
      do
@@ -6202,7 +6061,7 @@
        done | sort
        echo
      fi
-@@ -1377,26 +2005,24 @@
+@@ -1377,26 +2022,24 @@
  ## ----------- ##
  _ASBOX
        echo
@@ -6234,7 +6093,7 @@
  
  # Predefined preprocessor variables.
  
-@@ -1427,14 +2053,17 @@
+@@ -1427,14 +2070,17 @@
  
  # Let the site file select an alternate cache file if it wants to.
  # Prefer explicitly selected file to automatically selected ones.
@@ -6259,7 +6118,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;}
-@@ -1450,8 +2079,8 @@
+@@ -1450,8 +2096,8 @@
      { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  echo "$as_me: loading cache $cache_file" >&6;}
      case $cache_file in
@@ -6270,7 +6129,7 @@
      esac
    fi
  else
-@@ -1463,12 +2092,11 @@
+@@ -1463,12 +2109,11 @@
  # Check that the precious variables saved in the cache have kept the same
  # value.
  ac_cache_corrupted=false
@@ -6286,7 +6145,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
-@@ -1493,8 +2121,7 @@
+@@ -1493,8 +2138,7 @@
    # Pass precious variables to config.status.
    if test "$ac_new_set" = set; then
      case $ac_new_val in
@@ -6296,7 +6155,7 @@
      *) ac_arg=$ac_var=$ac_new_val ;;
      esac
      case " $ac_configure_args " in
-@@ -1511,12 +2138,6 @@
+@@ -1511,12 +2155,6 @@
     { (exit 1); exit 1; }; }
  fi
  
@@ -6309,7 +6168,7 @@
  
  
  
-@@ -1533,110 +2154,165 @@
+@@ -1533,110 +2171,165 @@
  
  
  
@@ -6527,7 +6386,7 @@
  
  
  # The aliases save the names the user supplied, while $host etc.
-@@ -1646,17 +2322,17 @@
+@@ -1646,17 +2339,17 @@
      NONENONEs,x,x, &&
    program_prefix=${target_alias}-
  test "$program_prefix" != NONE &&
@@ -6548,7 +6407,7 @@
  
  
  am__api_version="1.9"
-@@ -1678,8 +2354,8 @@
+@@ -1678,8 +2371,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.
@@ -6559,16 +6418,16 @@
  if test -z "$INSTALL"; then
  if test "${ac_cv_path_install+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -1701,7 +2377,7 @@
+@@ -1701,7 +2394,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.
-@@ -1720,21 +2396,22 @@
+@@ -1720,21 +2413,22 @@
      ;;
  esac
  done
@@ -6596,7 +6455,7 @@
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -1748,8 +2425,8 @@
+@@ -1748,8 +2442,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
@@ -6607,7 +6466,7 @@
      rm -f confinst.$$.* > /dev/null 2>&1
      echo "Testtest" > confinst.$$.orig
      ac_res=no
-@@ -1761,8 +2438,8 @@
+@@ -1761,8 +2455,8 @@
        fi
      fi
      rm -f confinst.$$.*
@@ -6618,7 +6477,7 @@
    fi
  
    if test -z "$kde_save_INSTALL_PROGRAM_given" ; then
-@@ -1772,8 +2449,8 @@
+@@ -1772,8 +2466,8 @@
      INSTALL_SCRIPT='${INSTALL}'
    fi
  
@@ -6629,7 +6488,7 @@
  # Just in case
  sleep 1
  echo timestamp > conftest.file
-@@ -1815,8 +2492,8 @@
+@@ -1815,8 +2509,8 @@
  Check your system clock" >&2;}
     { (exit 1); exit 1; }; }
  fi
@@ -6640,7 +6499,7 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
-@@ -1867,8 +2544,8 @@
+@@ -1867,8 +2561,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
@@ -6651,12 +6510,12 @@
  if test "${ac_cv_prog_AWK+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -1881,54 +2558,57 @@
+@@ -1881,54 +2575,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
@@ -6730,7 +6589,7 @@
    SET_MAKE="MAKE=${MAKE-make}"
  fi
  
-@@ -1999,8 +2679,8 @@
+@@ -1999,8 +2696,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
@@ -6741,12 +6600,12 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2013,32 +2693,34 @@
+@@ -2013,32 +2710,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
@@ -6783,12 +6642,12 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2051,27 +2733,41 @@
+@@ -2051,27 +2750,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
@@ -6832,7 +6691,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -2091,6 +2787,31 @@
+@@ -2091,6 +2804,31 @@
  
  
  
@@ -6864,7 +6723,7 @@
  
    unset CDPATH
  
-@@ -2109,14 +2830,14 @@
+@@ -2109,14 +2847,14 @@
  
    if test "x$prefix" = "xNONE"; then
  
@@ -6882,7 +6741,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2159,8 +2880,8 @@
+@@ -2159,8 +2897,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6893,7 +6752,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2171,8 +2892,8 @@
+@@ -2171,8 +2909,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -6904,7 +6763,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2181,14 +2902,14 @@
+@@ -2181,14 +2919,14 @@
          kde_save_PATH="$PATH"
      PATH="$exec_prefix/bin:$prefix/bin:$PATH"
  
@@ -6922,7 +6781,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -2231,8 +2952,8 @@
+@@ -2231,8 +2969,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -6933,7 +6792,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kde-config was not found!
  Please check whether you installed KDE correctly.
-@@ -2243,8 +2964,8 @@
+@@ -2243,8 +2981,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -6944,7 +6803,7 @@
        KDECONFIG=$kde_cv_path
  
     fi
-@@ -2266,16 +2987,16 @@
+@@ -2266,16 +3004,16 @@
    fi
    kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
  
@@ -6967,7 +6826,7 @@
    fi
  
    # And delete superfluous '/' to make compares easier
-@@ -2288,13 +3009,13 @@
+@@ -2288,13 +3026,13 @@
  
  
  
@@ -6985,7 +6844,7 @@
  
  
    val=
-@@ -2311,11 +3032,11 @@
+@@ -2311,11 +3049,11 @@
  
  
  
@@ -6999,7 +6858,7 @@
  
  
  am_make=${MAKE-make}
-@@ -2325,8 +3046,8 @@
+@@ -2325,8 +3063,8 @@
  .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
@@ -7010,7 +6869,7 @@
  am__include="#"
  am__quote=
  _am_result=none
-@@ -2353,15 +3074,15 @@
+@@ -2353,15 +3091,15 @@
  fi
  
  
@@ -7031,7 +6890,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -2381,10 +3102,9 @@
+@@ -2381,10 +3119,9 @@
  
  
  
@@ -7044,7 +6903,7 @@
      case $enableval in
        yes)
          kde_use_debug_code="yes"
-@@ -2404,18 +3124,18 @@
+@@ -2404,18 +3141,18 @@
    kde_use_debug_code="no"
        kde_use_debug_define=no
  
@@ -7070,7 +6929,7 @@
      if test $enableval = "no"; then
           kde_use_strict_options="no"
         else
-@@ -2424,12 +3144,12 @@
+@@ -2424,12 +3161,12 @@
  
  else
    kde_use_strict_options="no"
@@ -7087,7 +6946,7 @@
      if test $enableval = "no"; then
           kde_use_warnings="no"
         else
-@@ -2438,20 +3158,21 @@
+@@ -2438,20 +3175,21 @@
  
  else
    kde_use_warnings="yes"
@@ -7114,7 +6973,7 @@
  
      CFLAGS=" $CFLAGS"
  
-@@ -2463,8 +3184,8 @@
+@@ -2463,8 +3201,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
@@ -7125,12 +6984,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2477,32 +3198,34 @@
+@@ -2477,32 +3215,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
@@ -7167,12 +7026,12 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2515,36 +3238,51 @@
+@@ -2515,36 +3255,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
@@ -7229,12 +7088,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2557,74 +3295,34 @@
+@@ -2557,74 +3312,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
@@ -7313,16 +7172,16 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2638,7 +3336,7 @@
+@@ -2638,7 +3353,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
-@@ -2649,6 +3347,7 @@
+@@ -2649,6 +3364,7 @@
    fi
  done
  done
@@ -7330,7 +7189,7 @@
  
  if test $ac_prog_rejected = yes; then
    # We found a bogon in the path, so make sure we never use it.
-@@ -2666,22 +3365,23 @@
+@@ -2666,22 +3382,23 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -7361,12 +7220,12 @@
  if test "${ac_cv_prog_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2694,36 +3394,38 @@
+@@ -2694,36 +3411,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
@@ -7408,12 +7267,12 @@
  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2736,29 +3438,45 @@
+@@ -2736,29 +3455,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
@@ -7460,7 +7319,7 @@
  fi
  
  fi
-@@ -2771,21 +3489,35 @@
+@@ -2771,21 +3506,35 @@
     { (exit 1); exit 1; }; }
  
  # Provide some information about the compiler.
@@ -7504,7 +7363,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }
-@@ -2810,47 +3542,77 @@
+@@ -2810,47 +3559,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.
@@ -7604,7 +7463,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
-@@ -2862,19 +3624,21 @@
+@@ -2862,19 +3641,21 @@
  fi
  
  ac_exeext=$ac_cv_exeext
@@ -7633,7 +7492,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -2893,22 +3657,27 @@
+@@ -2893,22 +3674,27 @@
      fi
    fi
  fi
@@ -7673,7 +7532,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
-@@ -2919,9 +3688,8 @@
+@@ -2919,9 +3705,8 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -7684,7 +7543,7 @@
  	  break;;
      * ) break;;
    esac
-@@ -2935,14 +3703,14 @@
+@@ -2935,14 +3720,14 @@
  fi
  
  rm -f conftest$ac_cv_exeext
@@ -7703,7 +7562,7 @@
  if test "${ac_cv_objext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -2962,14 +3730,20 @@
+@@ -2962,14 +3747,20 @@
  }
  _ACEOF
  rm -f conftest.o conftest.obj
@@ -7728,7 +7587,7 @@
      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
         break;;
    esac
-@@ -2987,12 +3761,12 @@
+@@ -2987,12 +3778,12 @@
  
  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  fi
@@ -7745,7 +7604,7 @@
  if test "${ac_cv_c_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3015,24 +3789,36 @@
+@@ -3015,50 +3806,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7763,34 +7622,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
-@@ -3041,24 +3827,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
  
@@ -7827,7 +7678,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3074,24 +3864,36 @@
+@@ -3074,38 +3864,118 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -7845,117 +7696,161 @@
    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
++  (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
++
++	CFLAGS=""
++      cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&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 -s conftest.$ac_objext'
+-  (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
++  (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
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_c_werror_flag=$ac_save_c_werror_flag
++	 CFLAGS="-g"
++	 cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
 +esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&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); }; }; then
-@@ -3100,285 +3902,278 @@
+-  (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
  
 -ac_cv_prog_cc_g=no
--fi
++
++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
--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
 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS=$ac_save_CFLAGS
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
--  else
--    CFLAGS=
--  fi
--fi
++{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+@@ -3121,12 +3991,12 @@
+     CFLAGS=
+   fi
+ fi
 -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 -if test "${ac_cv_prog_cc_stdc+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
++echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
++if test "${ac_cv_prog_cc_c89+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
 -  ac_cv_prog_cc_stdc=no
--ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
-+	CFLAGS=""
-+      cat >conftest.$ac_ext <<_ACEOF
++  ac_cv_prog_cc_c89=no
+ ac_save_CC=$CC
+ cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <stdarg.h>
--#include <stdio.h>
--#include <sys/types.h>
--#include <sys/stat.h>
--/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
--struct buf { int x; };
--FILE * (*rcsopen) (struct buf *, struct stat *, int);
--static char *e (p, i)
--     char **p;
--     int i;
--{
--  return p[i];
--}
--static char *f (char * (*g) (char **, int), char **p, ...)
--{
--  char *s;
--  va_list v;
--  va_start (v,p);
--  s = g (p, va_arg (v,int));
--  va_end (v);
--  return s;
--}
--
--/* 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
+@@ -3160,12 +4030,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
 -   as 'x'.  The following induces an error, until -std1 is added to get
--   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
--   array size at least.  It's necessary to write '\x00'==0 to get something
++   as 'x'.  The following induces an error, until -std is added to get
+    proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
+    array size at least.  It's necessary to write '\x00'==0 to get something
 -   that's true only with -std1.  */
--int osf4_cc_array ['\x00' == 0 ? 1 : -1];
++   that's true only with -std.  */
+ int osf4_cc_array ['\x00' == 0 ? 1 : -1];
  
--int test (int i, double x);
--struct s1 {int (*f) (int a);};
--struct s2 {int (*f) (double a);};
--int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
--int argc;
--char **argv;
- int
- main ()
- {
--return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
 +
-   ;
+ int test (int i, double x);
+ struct s1 {int (*f) (int a);};
+ struct s2 {int (*f) (double a);};
+@@ -3180,205 +4055,57 @@
    return 0;
  }
  _ACEOF
@@ -7967,12 +7862,13 @@
 -# HP-UX older versions	-Aa -D_HPUX_SOURCE
 -# SVR4			-Xc -D__EXTENSIONS__
 -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
--do
--  CC="$ac_save_CC $ac_arg"
--  rm -f conftest.$ac_objext
++for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
++	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+ do
+   CC="$ac_save_CC $ac_arg"
+   rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -7985,58 +7881,65 @@
    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
  sed 's/^/| /' conftest.$ac_ext >&5
  
--fi
++
+ fi
 -rm -f conftest.err conftest.$ac_objext
--done
++
++rm -f core conftest.err conftest.$ac_objext
++  test "x$ac_cv_prog_cc_c89" != "xno" && break
+ done
 -rm -f conftest.$ac_ext conftest.$ac_objext
--CC=$ac_save_CC
++rm -f conftest.$ac_ext
+ CC=$ac_save_CC
+ 
+ fi
 -
--fi
--
 -case "x$ac_cv_prog_cc_stdc" in
 -  x|xno)
 -    echo "$as_me:$LINENO: result: none needed" >&5
 -echo "${ECHO_T}none needed" >&6 ;;
--  *)
++# AC_CACHE_VAL
++case "x$ac_cv_prog_cc_c89" in
++  x)
++    { echo "$as_me:$LINENO: result: none needed" >&5
++echo "${ECHO_T}none needed" >&6; } ;;
++  xno)
++    { echo "$as_me:$LINENO: result: unsupported" >&5
++echo "${ECHO_T}unsupported" >&6; } ;;
+   *)
 -    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
 -    CC="$CC $ac_cv_prog_cc_stdc" ;;
--esac
--
++    CC="$CC $ac_cv_prog_cc_c89"
++    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
++echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+ esac
+ 
 -# Some people use a C++ compiler to compile C.  Since we use `exit',
 -# in C++ we need to declare it.  In case someone uses the same compiler
 -# for both compiling C and C++ we need to have the C++ compiler decide
@@ -8077,255 +7980,103 @@
 -   'void exit (int);'
 -do
 -  cat >conftest.$ac_ext <<_ACEOF
-+	ac_c_werror_flag=$ac_save_c_werror_flag
-+	 CFLAGS="-g"
-+	 cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -$ac_declaration
 -#include <stdlib.h>
-+
- int
- main ()
- {
+-int
+-main ()
+-{
 -exit (42);
-+
-   ;
-   return 0;
- }
- _ACEOF
- rm -f conftest.$ac_objext
+-  ;
+-  return 0;
+-}
+-_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;;
-+  *) ac_try_echo=$ac_try;;
-+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_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
-+	 { 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_g=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
 -continue
-+
- fi
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 -  cat >conftest.$ac_ext <<_ACEOF
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_c_werror_flag=$ac_save_c_werror_flag
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
-+  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
-+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
-+if test "${ac_cv_prog_cc_c89+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_prog_cc_c89=no
-+ac_save_CC=$CC
-+cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
 -$ac_declaration
-+#include <stdarg.h>
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* 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
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
- int
- main ()
- {
+-int
+-main ()
+-{
 -exit (42);
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-   ;
-   return 0;
- }
- _ACEOF
+-  ;
+-  return 0;
+-}
+-_ACEOF
 -rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 -  (eval $ac_compile) 2>conftest.er1
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
-+  rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "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_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
-+	 { 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
 -  break
-+  ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-+
- fi
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
+-done
 -rm -f conftest*
 -if test -n "$ac_declaration"; then
 -  echo '#ifdef __cplusplus' >>confdefs.h
 -  echo $ac_declaration      >>confdefs.h
 -  echo '#endif'             >>confdefs.h
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
- fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
-+    { echo "$as_me:$LINENO: result: none needed" >&5
-+echo "${ECHO_T}none needed" >&6; } ;;
-+  xno)
-+    { echo "$as_me:$LINENO: result: unsupported" >&5
-+echo "${ECHO_T}unsupported" >&6; } ;;
-+  *)
-+    CC="$CC $ac_cv_prog_cc_c89"
-+    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-+esac
- 
+-fi
+-
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
@@ -8335,7 +8086,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3387,8 +4182,8 @@
+@@ -3387,8 +4114,8 @@
  
  depcc="$CC"   am_compiler_list=
  
@@ -8346,7 +8097,7 @@
  if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3477,8 +4272,8 @@
+@@ -3477,8 +4204,8 @@
  fi
  
  fi
@@ -8357,7 +8108,7 @@
  CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
  
  
-@@ -3500,8 +4295,8 @@
+@@ -3500,8 +4227,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
@@ -8368,7 +8119,7 @@
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
    CPP=
-@@ -3535,8 +4330,13 @@
+@@ -3535,24 +4262,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8384,7 +8135,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3561,9 +4361,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
+@@ -3561,9 +4286,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8396,7 +8167,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3573,8 +4374,13 @@
+@@ -3573,24 +4299,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8412,7 +8183,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3601,6 +4407,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
+@@ -3601,6 +4325,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8420,7 +8211,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3618,8 +4425,8 @@
+@@ -3618,8 +4343,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -8431,7 +8222,7 @@
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3642,8 +4449,13 @@
+@@ -3642,24 +4367,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -8447,7 +8238,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3668,9 +4480,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
+@@ -3668,9 +4391,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -8459,7 +8270,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -3680,8 +4493,13 @@
+@@ -3680,24 +4404,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -8475,7 +8286,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -3708,6 +4526,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
+@@ -3708,6 +4430,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -8483,7 +8314,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -3758,18 +4577,22 @@
+@@ -3758,18 +4481,22 @@
  
    CXXFLAGS=" $CXXFLAGS"
  
@@ -8511,12 +8342,12 @@
  if test "${ac_cv_prog_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3782,36 +4605,38 @@
+@@ -3782,36 +4509,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
@@ -8558,12 +8389,12 @@
  if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3824,55 +4649,85 @@
+@@ -3824,55 +4553,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
@@ -8662,7 +8493,7 @@
  if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -3895,24 +4750,36 @@
+@@ -3895,50 +4654,49 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8680,34 +8511,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
-@@ -3921,24 +4788,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
  
@@ -8744,7 +8567,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -3954,24 +4825,36 @@
+@@ -3954,159 +4712,133 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -8762,34 +8585,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
-@@ -3980,70 +4863,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
  
@@ -8857,34 +8672,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
-@@ -4052,61 +4918,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
  
@@ -8926,34 +8733,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
@@ -8970,12 +8768,12 @@
 -  echo '#endif'             >>confdefs.h
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
@@ -8998,7 +8796,7 @@
  ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4115,8 +5011,8 @@
+@@ -4115,8 +4847,8 @@
  
  depcc="$CXX"  am_compiler_list=
  
@@ -9009,7 +8807,7 @@
  if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -4205,8 +5101,8 @@
+@@ -4205,8 +4937,8 @@
  fi
  
  fi
@@ -9020,7 +8818,7 @@
  CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
  
  
-@@ -4224,8 +5120,8 @@
+@@ -4224,8 +4956,8 @@
  
  
  
@@ -9031,7 +8829,7 @@
  
  
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4250,24 +5146,36 @@
+@@ -4250,39 +4982,35 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -9049,34 +8847,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
-@@ -4276,13 +5184,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
  
@@ -9095,7 +8885,7 @@
  
  if test "$kde_bad_compiler" = "yes"; then
    { { echo "$as_me:$LINENO: error:
-@@ -4324,17 +5233,16 @@
+@@ -4324,17 +5052,16 @@
          fi
        fi
  
@@ -9117,7 +8907,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'
-@@ -4362,24 +5270,36 @@
+@@ -4362,34 +5089,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9135,34 +8925,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
-@@ -4388,8 +5308,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
  
@@ -9174,7 +8957,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4402,29 +5324,28 @@
+@@ -4402,29 +5127,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9212,7 +8995,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'
-@@ -4451,24 +5372,36 @@
+@@ -4451,34 +5175,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9230,34 +9013,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
-@@ -4477,8 +5410,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
  
@@ -9269,7 +9045,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4491,13 +5426,13 @@
+@@ -4491,13 +5213,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9287,7 +9063,7 @@
   :
   WOVERLOADED_VRITUAL=""
  fi
-@@ -4518,16 +5453,15 @@
+@@ -4518,16 +5240,15 @@
  
    if test "$kde_use_profiling" = "yes"; then
  
@@ -9308,7 +9084,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'
-@@ -4554,24 +5488,36 @@
+@@ -4554,34 +5275,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9326,34 +9102,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
-@@ -4580,8 +5526,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
  
@@ -9365,7 +9134,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4594,16 +5542,16 @@
+@@ -4594,16 +5313,16 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9386,7 +9155,7 @@
   :
  
  fi
-@@ -4618,16 +5566,15 @@
+@@ -4618,16 +5337,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"
  
@@ -9407,7 +9176,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'
-@@ -4654,24 +5601,36 @@
+@@ -4654,34 +5372,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9425,34 +9194,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
-@@ -4680,8 +5639,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
  
@@ -9464,7 +9226,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4694,27 +5655,26 @@
+@@ -4694,27 +5410,26 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9499,7 +9261,7 @@
    ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -4739,24 +5699,36 @@
+@@ -4739,34 +5454,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9517,34 +9279,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
-@@ -4765,8 +5737,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
  
@@ -9556,7 +9311,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CFLAGS="$save_CFLAGS"
    ac_ext=c
-@@ -4779,13 +5753,13 @@
+@@ -4779,13 +5492,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cc_'$kde_cache`\" = yes"; then
@@ -9574,7 +9329,7 @@
   :
  
  fi
-@@ -4793,16 +5767,15 @@
+@@ -4793,16 +5506,15 @@
            ;;
          esac
  
@@ -9595,7 +9350,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'
-@@ -4829,24 +5802,36 @@
+@@ -4829,34 +5541,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9613,34 +9368,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
-@@ -4855,8 +5840,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
  
@@ -9652,7 +9400,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4869,28 +5856,27 @@
+@@ -4869,28 +5579,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9689,7 +9437,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'
-@@ -4917,24 +5903,36 @@
+@@ -4917,34 +5626,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9707,34 +9455,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
-@@ -4943,8 +5941,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
  
@@ -9746,7 +9487,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -4957,28 +5957,27 @@
+@@ -4957,28 +5664,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9783,7 +9524,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'
-@@ -5005,24 +6004,36 @@
+@@ -5005,34 +5711,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9801,34 +9542,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
-@@ -5031,8 +6042,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
  
@@ -9840,7 +9574,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5045,13 +6058,13 @@
+@@ -5045,13 +5749,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9858,7 +9592,7 @@
   :
  
  fi
-@@ -5063,13 +6076,13 @@
+@@ -5063,13 +5767,13 @@
      CXXFLAGS="-Wcast-qual -Wshadow -Wcast-align $CXXFLAGS"
    fi
  
@@ -9876,7 +9610,7 @@
  
    HAVE_GCC_VISIBILITY=0
  
-@@ -5077,16 +6090,15 @@
+@@ -5077,16 +5781,15 @@
    if test "$GXX" = "yes"; then
      gcc_no_reorder_blocks=NO
  
@@ -9897,7 +9631,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'
-@@ -5113,24 +6125,36 @@
+@@ -5113,34 +5816,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -9915,34 +9649,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
-@@ -5139,8 +6163,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
  
@@ -9954,7 +9681,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5153,13 +6179,13 @@
+@@ -5153,13 +5854,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -9972,7 +9699,7 @@
   :
  
  fi
-@@ -5171,16 +6197,15 @@
+@@ -5171,16 +5872,15 @@
            CFLAGS="$CFLAGS -fno-reorder-blocks"
      fi
  
@@ -9993,7 +9720,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'
-@@ -5207,24 +6232,36 @@
+@@ -5207,34 +5907,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10011,34 +9738,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
-@@ -5233,8 +6270,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
  
@@ -10050,7 +9770,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5247,28 +6286,27 @@
+@@ -5247,28 +5945,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10087,7 +9807,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'
-@@ -5295,24 +6333,36 @@
+@@ -5295,34 +5992,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10105,34 +9825,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
-@@ -5321,8 +6371,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
  
@@ -10144,7 +9857,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5335,28 +6387,27 @@
+@@ -5335,28 +6030,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10181,7 +9894,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'
-@@ -5383,24 +6434,36 @@
+@@ -5383,34 +6077,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10199,34 +9912,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
-@@ -5409,8 +6472,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
  
@@ -10238,7 +9944,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5423,28 +6488,27 @@
+@@ -5423,28 +6115,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10275,7 +9981,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'
-@@ -5471,24 +6535,36 @@
+@@ -5471,34 +6162,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10293,34 +9999,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
-@@ -5497,8 +6573,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
  
@@ -10332,7 +10031,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5511,13 +6589,13 @@
+@@ -5511,13 +6200,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10350,7 +10049,7 @@
   :
   USE_EXCEPTIONS=
  fi
-@@ -5525,37 +6603,37 @@
+@@ -5525,37 +6214,37 @@
      ENABLE_PERMISSIVE_FLAG="-fpermissive"
  
      if test "$kde_use_pch" = "yes"; then
@@ -10402,7 +10101,7 @@
  if test "${kde_cv_opt_noinline_match+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -5587,24 +6665,36 @@
+@@ -5587,44 +6276,41 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10420,34 +10119,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
-@@ -5613,18 +6703,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
  
@@ -10471,7 +10163,7 @@
  
      if test "x$kde_cv_opt_noinline_match" = "xno" ; then
         CFLAGS="`echo "$CFLAGS" | sed "s/ -fno-inline//"`"
-@@ -5644,16 +6735,15 @@
+@@ -5644,16 +6330,15 @@
  
      if test "$kde_use_pch" = "yes"; then
  
@@ -10492,7 +10184,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'
-@@ -5680,24 +6770,36 @@
+@@ -5680,34 +6365,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10510,34 +10202,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
-@@ -5706,8 +6808,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
  
@@ -10549,7 +10234,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5720,29 +6824,28 @@
+@@ -5720,29 +6403,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10587,7 +10272,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'
-@@ -5769,24 +6872,36 @@
+@@ -5769,34 +6451,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10605,34 +10290,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
-@@ -5795,8 +6910,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
  
@@ -10644,7 +10322,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5809,28 +6926,27 @@
+@@ -5809,28 +6489,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10681,7 +10359,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'
-@@ -5857,24 +6973,36 @@
+@@ -5857,34 +6536,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10699,34 +10377,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
-@@ -5883,8 +7011,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
  
@@ -10738,7 +10409,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5897,28 +7027,27 @@
+@@ -5897,28 +6574,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10775,7 +10446,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'
-@@ -5945,24 +7074,36 @@
+@@ -5945,34 +6621,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10793,34 +10464,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
-@@ -5971,8 +7112,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
  
@@ -10832,7 +10496,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -5985,28 +7128,27 @@
+@@ -5985,28 +6659,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10869,7 +10533,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'
-@@ -6033,24 +7175,36 @@
+@@ -6033,34 +6706,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10887,34 +10551,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
-@@ -6059,8 +7213,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
  
@@ -10926,7 +10583,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6073,28 +7229,27 @@
+@@ -6073,28 +6744,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -10963,7 +10620,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'
-@@ -6121,24 +7276,36 @@
+@@ -6121,34 +6791,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -10981,34 +10638,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
-@@ -6147,8 +7314,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
  
@@ -11020,7 +10670,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6161,13 +7330,13 @@
+@@ -6161,13 +6829,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11038,7 +10688,7 @@
   :
  
  fi
-@@ -6274,13 +7443,13 @@
+@@ -6274,13 +6942,13 @@
  fi
  
  
@@ -11055,7 +10705,7 @@
  if test -z "$CXXCPP"; then
    if test "${ac_cv_prog_CXXCPP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -6310,8 +7479,13 @@
+@@ -6310,24 +6978,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11071,7 +10721,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6336,9 +7510,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
+@@ -6336,9 +7002,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11083,7 +10753,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6348,8 +7523,13 @@
+@@ -6348,24 +7015,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11099,7 +10769,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6376,6 +7556,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
+@@ -6376,6 +7041,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11107,7 +10797,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6393,8 +7574,8 @@
+@@ -6393,8 +7059,8 @@
  else
    ac_cv_prog_CXXCPP=$CXXCPP
  fi
@@ -11118,7 +10808,7 @@
  ac_preproc_ok=false
  for ac_cxx_preproc_warn_flag in '' yes
  do
-@@ -6417,8 +7598,13 @@
+@@ -6417,24 +7083,22 @@
  #endif
  		     Syntax error
  _ACEOF
@@ -11134,7 +10824,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6443,9 +7629,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
+@@ -6443,9 +7107,10 @@
    # Broken: fails on valid input.
  continue
  fi
@@ -11146,7 +10856,7 @@
    # can be detected and how.
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6455,8 +7642,13 @@
+@@ -6455,24 +7120,22 @@
  /* end confdefs.h.  */
  #include <ac_nonexistent.h>
  _ACEOF
@@ -11162,7 +10872,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -6483,6 +7675,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
+@@ -6483,6 +7146,7 @@
  ac_preproc_ok=:
  break
  fi
@@ -11170,7 +10900,7 @@
  rm -f conftest.err conftest.$ac_ext
  
  done
-@@ -6509,16 +7702,15 @@
+@@ -6509,16 +7173,15 @@
       NOOPT_CFLAGS=-O0
    fi
  
@@ -11191,7 +10921,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'
-@@ -6545,24 +7737,36 @@
+@@ -6545,34 +7208,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11209,34 +10939,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
-@@ -6571,8 +7775,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
  
@@ -11248,7 +10971,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6585,22 +7791,21 @@
+@@ -6585,22 +7246,21 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11277,7 +11000,7 @@
        if test "$am_cv_CC_dependencies_compiler_type" = "gcc3"; then
          ac_coverage_compiler="-fprofile-arcs -ftest-coverage"
          ac_coverage_linker="-lgcc"
-@@ -6616,36 +7821,36 @@
+@@ -6616,36 +7276,36 @@
        CXXFLAGS="$CXXFLAGS $ac_coverage_compiler"
        LDFLAGS="$LDFLAGS $ac_coverage_linker"
  
@@ -11324,7 +11047,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'
-@@ -6672,24 +7877,36 @@
+@@ -6672,34 +7332,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11342,34 +11065,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
-@@ -6698,8 +7915,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
  
@@ -11381,7 +11097,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6712,29 +7931,28 @@
+@@ -6712,29 +7370,28 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11419,7 +11135,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'
-@@ -6761,24 +7979,36 @@
+@@ -6761,34 +7418,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -11437,34 +11153,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
-@@ -6787,8 +8017,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
  
@@ -11476,7 +11185,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -6801,13 +8033,13 @@
+@@ -6801,13 +7456,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -11494,7 +11203,7 @@
   :
  
  fi
-@@ -6817,13 +8049,13 @@
+@@ -6817,13 +7472,13 @@
  
  
  
@@ -11512,7 +11221,7 @@
  
    if test "x$kde_use_final" = "xyes"; then
        KDE_USE_FINAL_TRUE=""
-@@ -6836,13 +8068,13 @@
+@@ -6836,13 +7491,13 @@
  
  
  
@@ -11530,45 +11239,28 @@
  
    KDE_NO_UNDEFINED=""
    if test "x$kde_use_closure" = "xyes"; then
-@@ -6853,216 +8085,36 @@
+@@ -6853,198 +7508,19 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
 -       case $host in
 -         *-*-linux-gnu)
-+  fi
- 
+-
 -echo "$as_me:$LINENO: checking whether $CXX supports -Wl,--no-undefined" >&5
 -echo $ECHO_N "checking whether $CXX supports -Wl,--no-undefined... $ECHO_C" >&6
 -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
-+
-+
-+
-+
-+  # 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
- 
- 
-+  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
- 
+-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'
 -
 -
@@ -11730,33 +11422,30 @@
 -
 -           ;;
 -       esac
--  fi
--
--
--
--
--
+   fi
+ 
+ 
+ 
+ 
+ 
 -  # Check whether --enable-nmcheck or --disable-nmcheck was given.
--if test "${enable_nmcheck+set}" = set; then
++  # 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
++  enableval=$enable_nmcheck; kde_use_nmcheck=$enableval
+ else
+   kde_use_nmcheck=no
 -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
++fi
++
  
+   if test "$kde_use_nmcheck" = "yes"; then
+       KDE_USE_NMCHECK_TRUE=""
+@@ -7059,10 +7535,9 @@
  
  
  
--
--
 -# Check whether --enable-shared or --disable-shared was given.
 +# Check whether --enable-shared was given.
  if test "${enable_shared+set}" = set; then
@@ -11766,15 +11455,15 @@
      case $enableval in
      yes) enable_shared=yes ;;
      no) enable_shared=no ;;
-@@ -7081,12 +8133,12 @@
+@@ -7081,12 +7556,12 @@
      esac
  else
    enable_shared=yes
 -fi;
 +fi
-+
  
 -# Check whether --enable-static or --disable-static was given.
++
 +# Check whether --enable-static was given.
  if test "${enable_static+set}" = set; then
 -  enableval="$enable_static"
@@ -11783,18 +11472,18 @@
      case $enableval in
      yes) enable_static=yes ;;
      no) enable_static=no ;;
-@@ -7105,18 +8157,19 @@
+@@ -7105,18 +7580,19 @@
      esac
  else
    enable_static=no
 -fi;
 +fi
-+
  
  
  
  
 -    # Check whether --enable-libsuffix or --disable-libsuffix was given.
++
 +    # Check whether --enable-libsuffix was given.
  if test "${enable_libsuffix+set}" = set; then
 -  enableval="$enable_libsuffix"
@@ -11808,7 +11497,7 @@
  
      if test "$kdelibsuff" = "auto"; then
  
-@@ -7137,8 +8190,8 @@
+@@ -7137,8 +7613,8 @@
         kdelibsuff=
      fi
      if test -z "$kdelibsuff"; then
@@ -11819,7 +11508,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define KDELIBSUFF ""
-@@ -7154,14 +8207,13 @@
+@@ -7154,14 +7630,13 @@
  #define KDELIBSUFF "${kdelibsuff}"
  _ACEOF
  
@@ -11838,22 +11527,22 @@
      case $enableval in
      yes) enable_fast_install=yes ;;
      no) enable_fast_install=no ;;
-@@ -7180,10 +8232,11 @@
+@@ -7180,10 +7655,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
-@@ -7207,7 +8260,7 @@
+@@ -7207,7 +7683,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
@@ -11862,7 +11551,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7236,37 +8289,184 @@
+@@ -7236,37 +7712,184 @@
  fi
  
  SED=$lt_cv_path_SED
@@ -11892,7 +11581,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
@@ -11948,19 +11637,16 @@
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
 + GREP="$ac_cv_path_GREP"
-+
  
 -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
++
 +{ echo "$as_me:$LINENO: checking for egrep" >&5
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
--    then ac_cv_prog_egrep='grep -E'
--    else ac_cv_prog_egrep='egrep'
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -11968,8 +11654,11 @@
 +if test -z "$EGREP"; then
 +set dummy egrep; ac_prog_name=$2
 +if test "${ac_cv_path_EGREP+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+-    then ac_cv_prog_egrep='grep -E'
+-    else ac_cv_prog_egrep='egrep'
 +  ac_path_EGREP_found=false
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -11980,7 +11669,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
@@ -12025,25 +11714,25 @@
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+- EGREP=$ac_cv_prog_egrep
+ 
 +else
 +  ac_cv_path_EGREP=$EGREP
 +fi
 +
 +
 +   fi
- fi
--echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
--echo "${ECHO_T}$ac_cv_prog_egrep" >&6
-- EGREP=$ac_cv_prog_egrep
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
 + EGREP="$ac_cv_path_EGREP"
  
  
- 
 -# Check whether --with-gnu-ld or --without-gnu-ld was given.
++
 +# Check whether --with-gnu-ld was given.
  if test "${with_gnu_ld+set}" = set; then
 -  withval="$with_gnu_ld"
@@ -12064,7 +11753,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -7295,11 +8495,11 @@
+@@ -7295,11 +7918,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -12080,7 +11769,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7312,7 +8512,7 @@
+@@ -7312,7 +7935,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,
@@ -12089,7 +11778,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'*)
-@@ -7332,21 +8532,21 @@
+@@ -7332,21 +7955,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -12118,7 +11807,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7356,29 +8556,38 @@
+@@ -7356,29 +7979,38 @@
    ;;
  esac
  fi
@@ -12165,7 +11854,7 @@
  if test "${lt_cv_path_NM+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7386,56 +8595,63 @@
+@@ -7386,56 +8018,63 @@
    # Let the user override the test.
    lt_cv_path_NM="$NM"
  else
@@ -12263,7 +11952,7 @@
  if test "${lt_cv_deplibs_check_method+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7462,44 +8678,36 @@
+@@ -7462,44 +8101,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -12318,7 +12007,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7515,7 +8723,7 @@
+@@ -7515,7 +8146,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -12327,7 +12016,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
-@@ -7531,43 +8739,27 @@
+@@ -7531,43 +8162,27 @@
    esac
    ;;
  
@@ -12384,7 +12073,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
-@@ -7586,32 +8778,22 @@
+@@ -7586,32 +8201,22 @@
    ;;
  
  openbsd*)
@@ -12420,7 +12109,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]'
-@@ -7632,17 +8814,20 @@
+@@ -7632,17 +8237,20 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -12444,7 +12133,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
-@@ -7651,14 +8836,17 @@
+@@ -7651,14 +8259,17 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -12465,16 +12154,16 @@
  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
  
  # Some flags need to be propagated to the compiler or linker for good
-@@ -7685,7 +8873,7 @@
+@@ -7685,7 +8296,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
 -  echo '#line 7688 "configure"' > conftest.$ac_ext
-+  echo '#line 8876 "configure"' > conftest.$ac_ext
++  echo '#line 8299 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7728,14 +8916,13 @@
+@@ -7728,14 +8339,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -12491,7 +12180,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7747,7 +8934,6 @@
+@@ -7747,7 +8357,6 @@
        esac
        ;;
      *64-bit*)
@@ -12499,7 +12188,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7772,8 +8958,8 @@
+@@ -7772,8 +8381,8 @@
    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
    SAVE_CFLAGS="$CFLAGS"
    CFLAGS="$CFLAGS -belf"
@@ -12510,7 +12199,7 @@
  if test "${lt_cv_cc_needs_belf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7799,24 +8985,36 @@
+@@ -7799,35 +8408,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -12528,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_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
-@@ -7825,9 +9023,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
  
@@ -12568,7 +12250,7 @@
        conftest$ac_exeext conftest.$ac_ext
       ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -7836,13 +9035,33 @@
+@@ -7836,13 +8442,33 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  fi
@@ -12604,7 +12286,7 @@
  
  esac
  
-@@ -7850,8 +9069,8 @@
+@@ -7850,8 +8476,8 @@
  
  
  
@@ -12615,7 +12297,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -7875,24 +9094,36 @@
+@@ -7875,35 +8501,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12633,34 +12315,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
-@@ -7901,9 +9132,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
  
@@ -12673,7 +12347,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -7959,6 +9191,7 @@
+@@ -7959,6 +8581,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -12681,7 +12355,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -7978,18 +9211,27 @@
+@@ -7978,18 +8601,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -12715,7 +12389,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -8002,12 +9244,14 @@
+@@ -8002,12 +8634,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -12733,7 +12407,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -8030,9 +9274,9 @@
+@@ -8030,9 +8664,9 @@
  		  inttypes.h stdint.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12746,7 +12420,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -8046,24 +9290,36 @@
+@@ -8046,38 +8680,35 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12764,34 +12438,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
-@@ -8072,12 +9328,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
  
@@ -12810,7 +12476,7 @@
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-@@ -8092,18 +9350,19 @@
+@@ -8092,18 +8723,19 @@
  for ac_header in dlfcn.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -12838,7 +12504,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8114,24 +9373,36 @@
+@@ -8114,41 +8746,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -12856,34 +12522,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
-@@ -8140,15 +9411,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
  
@@ -12906,7 +12564,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -8157,8 +9429,13 @@
+@@ -8157,24 +8785,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -12922,7 +12580,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -8182,9 +9459,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
+@@ -8182,9 +8808,10 @@
  
    ac_header_preproc=no
  fi
@@ -12935,7 +12613,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -8208,25 +9486,19 @@
+@@ -8208,25 +8835,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;}
@@ -12968,7 +12646,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -8238,223 +9510,542 @@
+@@ -8238,176 +8859,437 @@
  
  done
  
@@ -13164,17 +12842,10 @@
 -  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
++  (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
@@ -13183,36 +12854,15 @@
 -ac_compiler_gnu=no
 +  # 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.  */
@@ -13225,57 +12875,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
--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
++fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -13329,17 +12948,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_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
@@ -13373,17 +12985,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_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
@@ -13423,7 +13028,7 @@
 +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
++  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
@@ -13441,7 +13046,7 @@
 +  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
++  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
@@ -13467,7 +13072,7 @@
 +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
++  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
@@ -13485,7 +13090,7 @@
 +  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
++  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
@@ -13592,57 +13197,44 @@
 +  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
++  (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
-+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
+@@ -8418,39 +9300,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;;
@@ -13650,53 +13242,50 @@
 +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"
-@@ -8479,13 +10070,13 @@
+ if test "$ac_test_FFLAGS" = set; then
+   FFLAGS=$ac_save_FFLAGS
+ elif test $ac_cv_prog_f77_g = yes; then
+@@ -8479,13 +9357,13 @@
  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
  
  # find the maximum length of command line arguments
@@ -13713,7 +13302,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8514,20 +10105,70 @@
+@@ -8514,20 +9392,70 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -13790,7 +13379,7 @@
      # 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.
-@@ -8538,19 +10179,19 @@
+@@ -8538,19 +9466,19 @@
  fi
  
  if test -n $lt_cv_sys_max_cmd_len ; then
@@ -13816,7 +13405,7 @@
  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8564,9 +10205,6 @@
+@@ -8564,9 +9492,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -13826,7 +13415,7 @@
  # 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'"
  
-@@ -8588,14 +10226,30 @@
+@@ -8588,14 +9513,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'"
    ;;
@@ -13859,7 +13448,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8613,14 +10267,17 @@
+@@ -8613,14 +9554,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -13879,7 +13468,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8738,15 +10395,15 @@
+@@ -8738,15 +9682,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
@@ -13901,7 +13490,7 @@
  if test "${lt_cv_objdir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8760,8 +10417,8 @@
+@@ -8760,8 +9704,8 @@
  fi
  rmdir .libs 2>/dev/null
  fi
@@ -13912,7 +13501,7 @@
  objdir=$lt_cv_objdir
  
  
-@@ -8782,7 +10439,7 @@
+@@ -8782,7 +9726,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -13921,7 +13510,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8802,7 +10459,7 @@
+@@ -8802,7 +9746,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -13930,7 +13519,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8812,8 +10469,8 @@
+@@ -8812,8 +9756,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
@@ -13941,12 +13530,12 @@
  if test "${ac_cv_prog_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8826,32 +10483,34 @@
+@@ -8826,32 +9770,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
@@ -13983,12 +13572,12 @@
  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8864,27 +10523,41 @@
+@@ -8864,27 +9810,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
@@ -14032,7 +13621,7 @@
  else
    AR="$ac_cv_prog_AR"
  fi
-@@ -8892,8 +10565,8 @@
+@@ -8892,8 +9852,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
@@ -14043,12 +13632,12 @@
  if test "${ac_cv_prog_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8906,32 +10579,34 @@
+@@ -8906,32 +9866,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
@@ -14085,12 +13674,12 @@
  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8944,27 +10619,41 @@
+@@ -8944,27 +9906,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
@@ -14134,7 +13723,7 @@
  else
    RANLIB="$ac_cv_prog_RANLIB"
  fi
-@@ -8972,8 +10661,8 @@
+@@ -8972,8 +9948,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
@@ -14145,12 +13734,12 @@
  if test "${ac_cv_prog_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -8986,32 +10675,34 @@
+@@ -8986,32 +9962,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
@@ -14187,12 +13776,12 @@
  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9024,27 +10715,41 @@
+@@ -9024,27 +10002,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
@@ -14236,7 +13825,7 @@
  else
    STRIP="$ac_cv_prog_STRIP"
  fi
-@@ -9059,6 +10764,7 @@
+@@ -9059,6 +10051,7 @@
  test -z "$AS" && AS=as
  test -z "$CC" && CC=cc
  test -z "$LTCC" && LTCC=$CC
@@ -14244,7 +13833,7 @@
  test -z "$DLLTOOL" && DLLTOOL=dlltool
  test -z "$LD" && LD=ld
  test -z "$LN_S" && LN_S="ln -s"
-@@ -9078,21 +10784,32 @@
+@@ -9078,21 +10071,32 @@
  if test -n "$RANLIB"; then
    case $host_os in
    openbsd*)
@@ -14281,7 +13870,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9112,7 +10829,7 @@
+@@ -9112,7 +10116,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14290,7 +13879,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
-@@ -9144,17 +10861,17 @@
+@@ -9144,17 +10148,17 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14314,7 +13903,7 @@
  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9174,7 +10891,7 @@
+@@ -9174,7 +10178,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -14323,7 +13912,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
-@@ -9206,11 +10923,11 @@
+@@ -9206,11 +10210,11 @@
  
  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  if test -n "$MAGIC_CMD"; then
@@ -14339,7 +13928,7 @@
  fi
  
    else
-@@ -9225,21 +10942,21 @@
+@@ -9225,21 +10229,21 @@
  enable_dlopen=yes
  enable_win32_dll=no
  
@@ -14368,7 +13957,7 @@
  test -z "$pic_mode" && pic_mode=default
  
  # Use C for the default configuration in the libtool script
-@@ -9269,68 +10986,25 @@
+@@ -9269,68 +10273,25 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -14452,7 +14041,7 @@
  
  
  ## CAVEAT EMPTOR:
-@@ -9344,8 +11018,8 @@
+@@ -9344,8 +10305,8 @@
    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  
  
@@ -14463,7 +14052,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9359,26 +11033,28 @@
+@@ -9359,26 +10320,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 \
@@ -14472,12 +14061,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9365: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11039: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10326: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9369: \$? = $ac_status" >&5
-+   echo "$as_me:11043: \$? = $ac_status" >&5
++   echo "$as_me:10330: \$? = $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
@@ -14499,7 +14088,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"
-@@ -9392,8 +11068,8 @@
+@@ -9392,8 +10355,8 @@
  lt_prog_compiler_pic=
  lt_prog_compiler_static=
  
@@ -14510,7 +14099,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl='-Wl,'
-@@ -9431,6 +11107,11 @@
+@@ -9431,6 +10394,11 @@
        lt_prog_compiler_pic='-fno-common'
        ;;
  
@@ -14522,7 +14111,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -9447,7 +11128,7 @@
+@@ -9447,7 +10415,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -14531,7 +14120,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9473,6 +11154,16 @@
+@@ -9473,6 +10441,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -14548,7 +14137,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9484,7 +11175,7 @@
+@@ -9484,7 +10462,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.
@@ -14557,7 +14146,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9507,13 +11198,20 @@
+@@ -9507,13 +10485,20 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14580,7 +14169,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9528,15 +11226,15 @@
+@@ -9528,15 +10513,15 @@
        lt_prog_compiler_static='-non_shared'
        ;;
  
@@ -14602,7 +14191,7 @@
        ;;
  
      sunos4*)
-@@ -9545,7 +11243,7 @@
+@@ -9545,7 +10530,7 @@
        lt_prog_compiler_static='-Bstatic'
        ;;
  
@@ -14611,7 +14200,7 @@
        lt_prog_compiler_wl='-Wl,'
        lt_prog_compiler_pic='-KPIC'
        lt_prog_compiler_static='-Bstatic'
-@@ -9558,6 +11256,17 @@
+@@ -9558,6 +10543,17 @@
        fi
        ;;
  
@@ -14629,7 +14218,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9569,16 +11278,16 @@
+@@ -9569,16 +10565,16 @@
      esac
    fi
  
@@ -14650,7 +14239,7 @@
  if test "${lt_prog_compiler_pic_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9592,26 +11301,28 @@
+@@ -9592,26 +10588,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 \
@@ -14659,12 +14248,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11307: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10594: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:9602: \$? = $ac_status" >&5
-+   echo "$as_me:11311: \$? = $ac_status" >&5
++   echo "$as_me:10598: \$? = $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
@@ -14686,7 +14275,7 @@
  
  if test x"$lt_prog_compiler_pic_works" = xyes; then
      case $lt_prog_compiler_pic in
-@@ -9624,7 +11335,7 @@
+@@ -9624,7 +10622,7 @@
  fi
  
  fi
@@ -14695,7 +14284,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9634,8 +11345,50 @@
+@@ -9634,8 +10632,50 @@
      ;;
  esac
  
@@ -14748,7 +14337,7 @@
  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -9646,60 +11399,58 @@
+@@ -9646,60 +10686,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -14770,12 +14359,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:9665: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:11411: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:10698: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:9669: \$? = $ac_status" >&5
-+   echo "$as_me:11415: \$? = $ac_status" >&5
++   echo "$as_me:10702: \$? = $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
@@ -14827,7 +14416,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;}
-@@ -9709,8 +11460,8 @@
+@@ -9709,8 +10747,8 @@
    need_locks=no
  fi
  
@@ -14838,7 +14427,7 @@
  
    runpath_var=
    allow_undefined_flag=
-@@ -9748,6 +11499,16 @@
+@@ -9748,6 +10786,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -14855,7 +14444,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9758,6 +11519,10 @@
+@@ -9758,6 +10806,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -14866,7 +14455,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -9768,6 +11533,27 @@
+@@ -9768,6 +10820,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -14894,7 +14483,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9805,7 +11591,7 @@
+@@ -9805,7 +10878,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -14903,7 +14492,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9815,13 +11601,13 @@
+@@ -9815,13 +10888,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'
@@ -14920,7 +14509,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
-@@ -9830,23 +11616,70 @@
+@@ -9830,23 +10903,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -14996,7 +14585,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs=no
  	cat <<EOF 1>&2
-@@ -9860,13 +11693,40 @@
+@@ -9860,13 +10980,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15039,7 +14628,7 @@
      sunos4*)
        archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -9876,24 +11736,19 @@
+@@ -9876,24 +11023,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -15071,7 +14660,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9905,7 +11760,7 @@
+@@ -9905,7 +11047,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L=yes
@@ -15080,7 +14669,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct=unsupported
-@@ -9927,9 +11782,21 @@
+@@ -9927,9 +11069,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
@@ -15104,7 +14693,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9946,7 +11813,7 @@
+@@ -9946,7 +11100,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -15113,7 +14702,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`
-@@ -9965,8 +11832,12 @@
+@@ -9965,8 +11119,12 @@
    	  hardcode_libdir_flag_spec='-L$libdir'
    	  hardcode_libdir_separator=
  	  fi
@@ -15126,7 +14715,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9974,22 +11845,23 @@
+@@ -9974,22 +11132,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -15157,7 +14746,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -10005,24 +11877,36 @@
+@@ -10005,27 +11164,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15175,34 +14764,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
-@@ -10036,19 +11920,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; }
+ }'`
+@@ -10036,19 +11191,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15228,7 +14812,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -10067,24 +11952,36 @@
+@@ -10067,27 +11223,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -15246,34 +14830,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
-@@ -10098,8 +11995,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; }
+ }'`
+@@ -10098,8 +11250,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -15285,7 +14864,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -10108,13 +12007,11 @@
+@@ -10108,13 +11262,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag=' ${wl}-bernotok'
  	  allow_undefined_flag=' ${wl}-berok'
@@ -15302,7 +14881,7 @@
  	fi
        fi
        ;;
-@@ -10127,7 +12024,7 @@
+@@ -10127,7 +11279,7 @@
        ld_shlibs=no
        ;;
  
@@ -15311,7 +14890,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -10137,13 +12034,13 @@
+@@ -10137,13 +11289,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -15328,7 +14907,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.
-@@ -10153,52 +12050,52 @@
+@@ -10153,52 +11305,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -15421,7 +15000,7 @@
      fi
        ;;
  
-@@ -10232,8 +12129,8 @@
+@@ -10232,8 +11384,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -15432,7 +15011,7 @@
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -10241,7 +12138,7 @@
+@@ -10241,7 +11393,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -15441,7 +15020,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
-@@ -10255,47 +12152,62 @@
+@@ -10255,47 +11407,62 @@
        export_dynamic_flag_spec='${wl}-E'
        ;;
  
@@ -15528,7 +15107,7 @@
  	  hardcode_direct=yes
  	  export_dynamic_flag_spec='${wl}-E'
  
-@@ -10309,7 +12221,7 @@
+@@ -10309,7 +11476,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -15537,7 +15116,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'
-@@ -10319,7 +12231,7 @@
+@@ -10319,7 +11486,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -15546,7 +15125,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10342,7 +12254,8 @@
+@@ -10342,7 +11509,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
@@ -15556,7 +15135,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10352,7 +12265,7 @@
+@@ -10352,7 +11520,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -15565,7 +15144,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10363,14 +12276,14 @@
+@@ -10363,14 +11531,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -15582,7 +15161,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'
-@@ -10382,13 +12295,13 @@
+@@ -10382,13 +11550,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -15598,7 +15177,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10396,21 +12309,15 @@
+@@ -10396,21 +11564,15 @@
        hardcode_libdir_separator=:
        ;;
  
@@ -15624,7 +15203,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'
-@@ -10419,8 +12326,18 @@
+@@ -10419,8 +11581,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -15645,7 +15224,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10429,7 +12346,7 @@
+@@ -10429,7 +11601,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.
@@ -15654,7 +15233,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10477,36 +12394,45 @@
+@@ -10477,36 +11649,45 @@
        fi
        ;;
  
@@ -15721,7 +15300,7 @@
        ;;
  
      uts4*)
-@@ -10521,15 +12447,10 @@
+@@ -10521,15 +11702,10 @@
      esac
    fi
  
@@ -15739,7 +15318,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -10547,8 +12468,8 @@
+@@ -10547,8 +11723,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.
@@ -15750,7 +15329,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -10562,6 +12483,7 @@
+@@ -10562,6 +11738,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl
@@ -15758,7 +15337,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -10584,20 +12506,20 @@
+@@ -10584,20 +11761,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -15784,7 +15363,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10607,7 +12529,20 @@
+@@ -10607,7 +11784,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -15806,7 +15385,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10672,7 +12607,7 @@
+@@ -10672,7 +11862,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -15815,7 +15394,7 @@
    ;;
  
  beos*)
-@@ -10681,7 +12616,7 @@
+@@ -10681,7 +11871,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -15824,7 +15403,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10697,7 +12632,7 @@
+@@ -10697,7 +11887,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -15833,7 +15412,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10709,7 +12644,8 @@
+@@ -10709,7 +11899,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -15843,7 +15422,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10739,7 +12675,7 @@
+@@ -10739,7 +11930,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -15852,7 +15431,7 @@
        ;;
      esac
      ;;
-@@ -10762,7 +12698,7 @@
+@@ -10762,7 +11953,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -15861,7 +15440,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"`
-@@ -10785,20 +12721,17 @@
+@@ -10785,20 +11976,17 @@
    dynamic_linker=no
    ;;
  
@@ -15893,7 +15472,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10816,14 +12749,19 @@
+@@ -10816,14 +12004,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -15915,7 +15494,7 @@
    esac
    ;;
  
-@@ -10843,9 +12781,9 @@
+@@ -10843,9 +12036,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -15927,7 +15506,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10860,7 +12798,7 @@
+@@ -10860,7 +12053,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -15936,7 +15515,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10871,7 +12809,7 @@
+@@ -10871,7 +12064,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -15945,7 +15524,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10883,6 +12821,18 @@
+@@ -10883,6 +12076,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -15964,7 +15543,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -10926,29 +12876,26 @@
+@@ -10926,29 +12131,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -16001,7 +15580,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,
-@@ -10958,6 +12905,18 @@
+@@ -10958,6 +12160,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -16020,7 +15599,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10967,7 +12926,7 @@
+@@ -10967,7 +12181,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -16029,7 +15608,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10995,8 +12954,13 @@
+@@ -10995,8 +12209,13 @@
  
  openbsd*)
    version_type=sunos
@@ -16044,7 +15623,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
-@@ -11016,7 +12980,7 @@
+@@ -11016,7 +12235,7 @@
  
  os2*)
    libname_spec='$name'
@@ -16053,7 +15632,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -11034,13 +12998,6 @@
+@@ -11034,13 +12253,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -16067,7 +15646,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -11066,7 +13023,7 @@
+@@ -11066,7 +12278,7 @@
    need_version=yes
    ;;
  
@@ -16076,7 +15655,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'
-@@ -11099,6 +13056,29 @@
+@@ -11099,6 +12311,29 @@
    fi
    ;;
  
@@ -16106,7 +15685,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -11110,16 +13090,21 @@
+@@ -11110,16 +12345,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -16134,7 +15713,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11139,8 +13124,8 @@
+@@ -11139,8 +12379,8 @@
    # directories.
    hardcode_action=unsupported
  fi
@@ -16145,7 +15724,7 @@
  
  if test "$hardcode_action" = relink; then
    # Fast installation is not supported
-@@ -11153,29 +13138,29 @@
+@@ -11153,29 +12393,29 @@
  
  striplib=
  old_striplib=
@@ -16185,7 +15764,7 @@
      ;;
    esac
  fi
-@@ -11207,8 +13192,8 @@
+@@ -11207,8 +12447,8 @@
  
    darwin*)
    # if libdl is installed we need to link against it
@@ -16196,7 +15775,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11221,40 +13206,52 @@
+@@ -11221,56 +12461,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16234,34 +15813,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
-@@ -11263,14 +13260,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
  
@@ -16281,7 +15853,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
    lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
  else
-@@ -11284,8 +13282,8 @@
+@@ -11284,8 +12521,8 @@
     ;;
  
    *)
@@ -16292,7 +15864,7 @@
  if test "${ac_cv_func_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11312,53 +13310,59 @@
+@@ -11312,73 +12549,64 @@
  
  #undef shl_load
  
@@ -16344,34 +15916,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
-@@ -11367,18 +13371,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
  
@@ -16397,7 +15962,7 @@
  if test "${ac_cv_lib_dld_shl_load+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11391,40 +13396,52 @@
+@@ -11391,61 +12619,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16435,34 +16000,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
-@@ -11433,19 +13450,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
  
@@ -16489,7 +16047,7 @@
  if test "${ac_cv_func_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11472,53 +13490,59 @@
+@@ -11472,73 +12697,64 @@
  
  #undef dlopen
  
@@ -16541,34 +16099,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
-@@ -11527,18 +13551,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
  
@@ -16594,7 +16145,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11551,40 +13576,52 @@
+@@ -11551,61 +12767,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16632,34 +16183,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
-@@ -11593,19 +13630,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
  
@@ -16686,7 +16230,7 @@
  if test "${ac_cv_lib_svld_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11618,40 +13656,52 @@
+@@ -11618,61 +12831,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16724,34 +16268,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
-@@ -11660,19 +13710,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
  
@@ -16778,7 +16315,7 @@
  if test "${ac_cv_lib_dld_dld_link+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11685,40 +13736,52 @@
+@@ -11685,56 +12895,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -16816,34 +16353,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
-@@ -11727,14 +13790,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
  
@@ -16863,7 +16393,7 @@
  if test $ac_cv_lib_dld_dld_link = yes; then
    lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
  fi
-@@ -11769,13 +13833,13 @@
+@@ -11769,13 +12976,13 @@
      test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
  
      save_LDFLAGS="$LDFLAGS"
@@ -16880,16 +16410,16 @@
  if test "${lt_cv_dlopen_self+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11785,7 +13849,7 @@
+@@ -11785,7 +12992,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11788 "configure"
-+#line 13852 "configure"
++#line 12995 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11842,6 +13906,8 @@
+@@ -11842,6 +13049,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16898,7 +16428,7 @@
  
      exit (status);
  }
-@@ -11851,12 +13917,12 @@
+@@ -11851,12 +13060,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16913,7 +16443,7 @@
      esac
    else :
      # compilation failed
-@@ -11867,13 +13933,13 @@
+@@ -11867,13 +13076,13 @@
  
  
  fi
@@ -16932,16 +16462,16 @@
  if test "${lt_cv_dlopen_self_static+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -11883,7 +13949,7 @@
+@@ -11883,7 +13092,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
 -#line 11886 "configure"
-+#line 13952 "configure"
++#line 13095 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11940,6 +14006,8 @@
+@@ -11940,6 +13149,8 @@
        else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
        /* dlclose (self); */
      }
@@ -16950,7 +16480,7 @@
  
      exit (status);
  }
-@@ -11949,12 +14017,12 @@
+@@ -11949,12 +13160,12 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -16965,7 +16495,7 @@
      esac
    else :
      # compilation failed
-@@ -11965,8 +14033,8 @@
+@@ -11965,8 +13176,8 @@
  
  
  fi
@@ -16976,7 +16506,7 @@
      fi
  
      CPPFLAGS="$save_CPPFLAGS"
-@@ -11987,19 +14055,19 @@
+@@ -11987,19 +13198,19 @@
  fi
  
  
@@ -17004,7 +16534,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -12008,58 +14076,21 @@
+@@ -12008,58 +13219,21 @@
    fi
    ;;
  
@@ -17070,7 +16600,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -12074,7 +14105,8 @@
+@@ -12074,7 +13248,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.
@@ -17080,7 +16610,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 \
-@@ -12188,11 +14220,11 @@
+@@ -12188,11 +13363,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -17094,7 +16624,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -12222,6 +14254,12 @@
+@@ -12222,6 +13397,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -17107,7 +16637,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -12233,6 +14271,9 @@
+@@ -12233,6 +13414,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -17117,7 +16647,7 @@
  # A language-specific compiler.
  CC=$lt_compiler
  
-@@ -12252,7 +14293,7 @@
+@@ -12252,7 +13436,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -17126,7 +16656,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -12283,7 +14324,7 @@
+@@ -12283,7 +13467,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -17135,7 +16665,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12298,7 +14339,7 @@
+@@ -12298,7 +13482,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -17144,7 +16674,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12525,7 +14566,10 @@
+@@ -12525,7 +13709,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.
@@ -17156,7 +16686,7 @@
  fi
  
  
-@@ -12538,11 +14582,11 @@
+@@ -12538,11 +13725,11 @@
  CC="$lt_save_CC"
  
  
@@ -17172,7 +16702,7 @@
  
  if test -f "$ltmain" && test -n "$tagnames"; then
    if test ! -f "${ofile}"; then
-@@ -12560,6 +14604,9 @@
+@@ -12560,6 +13747,9 @@
  echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
      fi
    fi
@@ -17182,7 +16712,7 @@
  
    # Extract list of available tagged configurations in $ofile.
    # Note that this assumes the entire list is on one line.
-@@ -12590,8 +14637,10 @@
+@@ -12590,8 +13780,10 @@
  
        case $tagname in
        CXX)
@@ -17195,7 +16725,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'
-@@ -12610,6 +14659,7 @@
+@@ -12610,6 +13802,7 @@
  hardcode_libdir_flag_spec_ld_CXX=
  hardcode_libdir_separator_CXX=
  hardcode_minus_L_CXX=no
@@ -17203,7 +16733,7 @@
  hardcode_automatic_CXX=no
  module_cmds_CXX=
  module_expsym_cmds_CXX=
-@@ -12627,7 +14677,7 @@
+@@ -12627,7 +13820,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -17212,7 +16742,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12637,17 +14687,34 @@
+@@ -12637,17 +13830,34 @@
  lt_simple_compile_test_code="int some_variable = 0;\n"
  
  # Code to be used in simple link tests
@@ -17248,7 +16778,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12658,18 +14725,27 @@
+@@ -12658,18 +13868,27 @@
  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
  else
@@ -17279,7 +16809,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12683,18 +14759,18 @@
+@@ -12683,18 +13902,18 @@
    # Set up default GNU C++ configuration
  
  
@@ -17304,7 +16834,7 @@
    case $host in
    *-*-mingw*)
      # gcc leaves a trailing carriage return which upsets mingw
-@@ -12723,11 +14799,11 @@
+@@ -12723,11 +13942,11 @@
      ;;
    esac
  elif test "$with_gnu_ld" = yes; then
@@ -17320,7 +16850,7 @@
  fi
  if test "${lt_cv_path_LD+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -12740,7 +14816,7 @@
+@@ -12740,7 +13959,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,
@@ -17329,7 +16859,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'*)
-@@ -12760,21 +14836,21 @@
+@@ -12760,21 +13979,21 @@
  
  LD="$lt_cv_path_LD"
  if test -n "$LD"; then
@@ -17358,7 +16888,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12784,8 +14860,8 @@
+@@ -12784,8 +14003,8 @@
    ;;
  esac
  fi
@@ -17369,7 +16899,7 @@
  with_gnu_ld=$lt_cv_prog_gnu_ld
  
  
-@@ -12793,8 +14869,8 @@
+@@ -12793,8 +14012,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
@@ -17380,7 +16910,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12820,7 +14896,7 @@
+@@ -12820,7 +14039,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.
@@ -17389,7 +16919,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12835,8 +14911,8 @@
+@@ -12835,8 +14054,8 @@
  fi
  
  # PORTME: fill in a description of your system's C++ link characteristics
@@ -17400,7 +16930,7 @@
  ld_shlibs_CXX=yes
  case $host_os in
    aix3*)
-@@ -12851,8 +14927,23 @@
+@@ -12851,8 +14070,23 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -17426,7 +16956,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12869,7 +14960,7 @@
+@@ -12869,7 +14103,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -17435,7 +16965,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`
-@@ -12888,8 +14979,12 @@
+@@ -12888,8 +14122,12 @@
  	  hardcode_libdir_flag_spec_CXX='-L$libdir'
  	  hardcode_libdir_separator_CXX=
  	fi
@@ -17448,7 +16978,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12898,15 +14993,16 @@
+@@ -12898,15 +14136,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -17469,7 +16999,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.
-@@ -12928,24 +15024,36 @@
+@@ -12928,27 +14167,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17487,34 +17017,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
-@@ -12959,20 +15067,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; }
+ }'`
+@@ -12959,20 +14194,21 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17540,7 +17065,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12991,24 +15100,36 @@
+@@ -12991,27 +14227,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -17558,34 +17083,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
-@@ -13022,8 +15143,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; }
+ }'`
+@@ -13022,8 +14254,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -17597,7 +17117,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -13032,16 +15155,26 @@
+@@ -13032,16 +14266,26 @@
  	# -berok will link without error, but may produce a broken library.
  	no_undefined_flag_CXX=' ${wl}-bernotok'
  	allow_undefined_flag_CXX=' ${wl}-berok'
@@ -17629,7 +17149,7 @@
    chorus*)
      case $cc_basename in
        *)
-@@ -13055,12 +15188,12 @@
+@@ -13055,12 +14299,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'
@@ -17644,7 +17164,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
-@@ -13069,70 +15202,81 @@
+@@ -13069,70 +14313,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -17778,7 +17298,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13143,14 +15287,14 @@
+@@ -13143,14 +14398,14 @@
  	;;
      esac
      ;;
@@ -17795,7 +17315,7 @@
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -13167,12 +15311,12 @@
+@@ -13167,12 +14422,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -17811,7 +17331,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -13181,11 +15325,11 @@
+@@ -13181,11 +14436,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.
@@ -17825,7 +17345,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -13195,33 +15339,22 @@
+@@ -13195,33 +14450,22 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -17866,7 +17386,7 @@
        ;;
      *)
        hardcode_direct_CXX=yes
-@@ -13232,17 +15365,20 @@
+@@ -13232,17 +14476,20 @@
      esac
  
      case $cc_basename in
@@ -17893,7 +17413,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -13258,12 +15394,15 @@
+@@ -13258,12 +14505,15 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -17913,7 +17433,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -13274,11 +15413,25 @@
+@@ -13274,11 +14524,25 @@
  	;;
      esac
      ;;
@@ -17941,7 +17461,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -13289,9 +15442,9 @@
+@@ -13289,9 +14553,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -17953,7 +17473,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13300,16 +15453,16 @@
+@@ -13300,16 +14564,16 @@
      hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
      hardcode_libdir_separator_CXX=:
      ;;
@@ -17974,7 +17494,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13327,20 +15480,44 @@
+@@ -13327,20 +14591,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -18025,7 +17545,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13368,7 +15545,7 @@
+@@ -13368,7 +14656,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -18034,7 +17554,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13378,7 +15555,7 @@
+@@ -13378,7 +14666,7 @@
  	;;
      esac
      ;;
@@ -18043,7 +17563,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13389,15 +15566,31 @@
+@@ -13389,15 +14677,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::"'
      ;;
@@ -18077,7 +17597,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13407,14 +15600,14 @@
+@@ -13407,14 +14711,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -18095,7 +17615,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13432,7 +15625,7 @@
+@@ -13432,7 +14736,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18104,7 +17624,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13451,13 +15644,13 @@
+@@ -13451,13 +14755,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -18120,7 +17640,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13466,17 +15659,17 @@
+@@ -13466,17 +14770,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -18142,7 +17662,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13495,7 +15688,7 @@
+@@ -13495,7 +14799,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18151,7 +17671,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13516,27 +15709,14 @@
+@@ -13516,27 +14820,14 @@
      # FIXME: insert proper C++ library support
      ld_shlibs_CXX=no
      ;;
@@ -18181,7 +17701,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13549,36 +15729,33 @@
+@@ -13549,36 +14840,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -18230,7 +17750,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13586,9 +15763,9 @@
+@@ -13586,9 +14874,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -18242,7 +17762,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13598,9 +15775,9 @@
+@@ -13598,9 +14886,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
@@ -18254,7 +17774,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13609,9 +15786,9 @@
+@@ -13609,9 +14897,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -18266,7 +17786,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13624,12 +15801,63 @@
+@@ -13624,12 +14912,63 @@
  	;;
      esac
      ;;
@@ -18332,7 +17852,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13649,8 +15877,8 @@
+@@ -13649,8 +14988,8 @@
      ld_shlibs_CXX=no
      ;;
  esac
@@ -18343,7 +17863,7 @@
  test "$ld_shlibs_CXX" = no && can_build_shared=no
  
  GCC_CXX="$GXX"
-@@ -13686,7 +15914,7 @@
+@@ -13686,7 +15025,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.
@@ -18352,7 +17872,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13726,7 +15954,7 @@
+@@ -13726,7 +15065,7 @@
         fi
         ;;
  
@@ -18361,7 +17881,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13762,6 +15990,29 @@
+@@ -13762,6 +15101,29 @@
  
  $rm -f confest.$objext
  
@@ -18391,7 +17911,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13770,8 +16021,8 @@
+@@ -13770,8 +15132,8 @@
  lt_prog_compiler_pic_CXX=
  lt_prog_compiler_static_CXX=
  
@@ -18402,7 +17922,7 @@
  
    # C++ specific cases for pic, static, wl, etc.
    if test "$GXX" = yes; then
-@@ -13809,6 +16060,10 @@
+@@ -13809,6 +15171,10 @@
        # DJGPP does not support shared libraries at all
        lt_prog_compiler_pic_CXX=
        ;;
@@ -18413,7 +17933,7 @@
      sysv4*MP*)
        if test -d /usr/nec; then
  	lt_prog_compiler_pic_CXX=-Kconform_pic
-@@ -13817,7 +16072,7 @@
+@@ -13817,7 +15183,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -18422,7 +17942,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13842,18 +16097,28 @@
+@@ -13842,18 +15208,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -18454,7 +17974,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13861,22 +16126,22 @@
+@@ -13861,22 +15237,22 @@
  	    ;;
  	esac
  	;;
@@ -18483,7 +18003,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13889,9 +16154,13 @@
+@@ -13889,9 +15265,13 @@
  	    ;;
  	esac
  	;;
@@ -18498,7 +18018,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13900,20 +16169,26 @@
+@@ -13900,20 +15280,26 @@
  	    ;;
  	esac
  	;;
@@ -18529,7 +18049,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13930,25 +16205,25 @@
+@@ -13930,25 +15316,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -18560,7 +18080,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13962,24 +16237,15 @@
+@@ -13962,24 +15348,15 @@
  	;;
        psos*)
  	;;
@@ -18587,7 +18107,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13989,12 +16255,12 @@
+@@ -13989,12 +15366,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -18602,7 +18122,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -14004,7 +16270,7 @@
+@@ -14004,7 +15381,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -18611,7 +18131,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -14012,7 +16278,14 @@
+@@ -14012,7 +15389,14 @@
  	    ;;
  	esac
  	;;
@@ -18627,7 +18147,7 @@
  	;;
        vxworks*)
  	;;
-@@ -14022,16 +16295,16 @@
+@@ -14022,16 +15406,16 @@
      esac
    fi
  
@@ -18648,7 +18168,7 @@
  if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14045,26 +16318,28 @@
+@@ -14045,26 +15429,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 \
@@ -18657,12 +18177,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14051: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16324: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15435: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:14055: \$? = $ac_status" >&5
-+   echo "$as_me:16328: \$? = $ac_status" >&5
++   echo "$as_me:15439: \$? = $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
@@ -18684,7 +18204,7 @@
  
  if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
      case $lt_prog_compiler_pic_CXX in
-@@ -14077,7 +16352,7 @@
+@@ -14077,7 +15463,7 @@
  fi
  
  fi
@@ -18693,7 +18213,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -14087,8 +16362,50 @@
+@@ -14087,8 +15473,50 @@
      ;;
  esac
  
@@ -18746,7 +18266,7 @@
  if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -14099,60 +16416,58 @@
+@@ -14099,60 +15527,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -18768,12 +18288,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:14118: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16428: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:15539: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:14122: \$? = $ac_status" >&5
-+   echo "$as_me:16432: \$? = $ac_status" >&5
++   echo "$as_me:15543: \$? = $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
@@ -18825,7 +18345,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;}
-@@ -14162,8 +16477,8 @@
+@@ -14162,8 +15588,8 @@
    need_locks=no
  fi
  
@@ -18836,7 +18356,7 @@
  
    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
    case $host_os in
-@@ -14180,22 +16495,20 @@
+@@ -14180,22 +15606,20 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -18865,7 +18385,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -14213,8 +16526,8 @@
+@@ -14213,8 +15637,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.
@@ -18876,7 +18396,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -14228,6 +16541,7 @@
+@@ -14228,6 +15652,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_CXX
@@ -18884,7 +18404,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -14250,20 +16564,20 @@
+@@ -14250,20 +15675,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -18910,7 +18430,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -14273,7 +16587,20 @@
+@@ -14273,7 +15698,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -18932,7 +18452,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14338,7 +16665,7 @@
+@@ -14338,7 +15776,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -18941,7 +18461,7 @@
    ;;
  
  beos*)
-@@ -14347,7 +16674,7 @@
+@@ -14347,7 +15785,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -18950,7 +18470,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14363,7 +16690,7 @@
+@@ -14363,7 +15801,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -18959,7 +18479,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14375,7 +16702,8 @@
+@@ -14375,7 +15813,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -18969,7 +18489,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14405,7 +16733,7 @@
+@@ -14405,7 +15844,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -18978,7 +18498,7 @@
        ;;
      esac
      ;;
-@@ -14428,7 +16756,7 @@
+@@ -14428,7 +15867,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -18987,7 +18507,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"`
-@@ -14451,20 +16779,17 @@
+@@ -14451,20 +15890,17 @@
    dynamic_linker=no
    ;;
  
@@ -19019,7 +18539,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14482,14 +16807,19 @@
+@@ -14482,14 +15918,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -19041,7 +18561,7 @@
    esac
    ;;
  
-@@ -14509,9 +16839,9 @@
+@@ -14509,9 +15950,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -19053,7 +18573,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14526,7 +16856,7 @@
+@@ -14526,7 +15967,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -19062,7 +18582,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14537,7 +16867,7 @@
+@@ -14537,7 +15978,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -19071,7 +18591,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14549,6 +16879,18 @@
+@@ -14549,6 +15990,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -19090,7 +18610,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -14592,29 +16934,26 @@
+@@ -14592,29 +16045,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -19127,7 +18647,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,
-@@ -14624,8 +16963,20 @@
+@@ -14624,16 +16074,28 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19135,8 +18655,12 @@
 -  version_type=sunos
 +netbsdelf*-gnu)
 +  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   need_lib_prefix=no
+   need_version=no
+-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-    dynamic_linker='NetBSD (a.out) ld.so'
 +  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
@@ -19147,19 +18671,19 @@
 +
 +netbsd*)
 +  version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-@@ -14633,7 +16984,7 @@
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
    else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
 +    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
-@@ -14661,8 +17012,13 @@
+@@ -14661,8 +16123,13 @@
  
  openbsd*)
    version_type=sunos
@@ -19174,7 +18698,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
-@@ -14682,7 +17038,7 @@
+@@ -14682,7 +16149,7 @@
  
  os2*)
    libname_spec='$name'
@@ -19183,7 +18707,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14700,13 +17056,6 @@
+@@ -14700,13 +16167,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -19197,7 +18721,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -14732,7 +17081,7 @@
+@@ -14732,7 +16192,7 @@
    need_version=yes
    ;;
  
@@ -19206,7 +18730,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'
-@@ -14765,6 +17114,29 @@
+@@ -14765,6 +16225,29 @@
    fi
    ;;
  
@@ -19236,7 +18760,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14776,16 +17148,21 @@
+@@ -14776,16 +16259,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -19264,7 +18788,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -14805,8 +17182,8 @@
+@@ -14805,8 +16293,8 @@
    # directories.
    hardcode_action_CXX=unsupported
  fi
@@ -19275,7 +18799,7 @@
  
  if test "$hardcode_action_CXX" = relink; then
    # Fast installation is not supported
-@@ -14817,998 +17194,173 @@
+@@ -14817,1001 +16305,176 @@
    enable_fast_install=needless
  fi
  
@@ -19857,7 +19381,9 @@
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
++# Used on cygwin: assembler.
++AS="$AS"
+ 
 -ac_cv_lib_dl_dlopen=no
 -fi
 -rm -f conftest.err conftest.$ac_objext \
@@ -20408,12 +19934,15 @@
 -
 -# Used on cygwin: assembler.
 -AS="$AS"
-+# Used on cygwin: assembler.
-+AS="$AS"
+-
+-# The name of the directory that contains temporary libtool files.
+-objdir=$objdir
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
  
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
-@@ -15827,7 +17379,7 @@
+ # How to create reloadable object files.
+ reload_flag=$lt_reload_flag
+@@ -15827,7 +16490,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -20422,7 +19951,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15842,7 +17394,7 @@
+@@ -15842,7 +16505,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -20431,7 +19960,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -16044,7 +17596,10 @@
+@@ -16044,7 +16707,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.
@@ -20443,7 +19972,7 @@
  fi
  
  
-@@ -16116,29 +17671,55 @@
+@@ -16116,29 +16782,55 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -20483,19 +20012,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
@@ -20507,7 +20036,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -16146,21 +17727,21 @@
+@@ -16146,21 +16838,21 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -20539,7 +20068,7 @@
  
  GCC_F77="$G77"
  LD_F77="$LD"
-@@ -16169,8 +17750,8 @@
+@@ -16169,8 +16861,8 @@
  lt_prog_compiler_pic_F77=
  lt_prog_compiler_static_F77=
  
@@ -20550,7 +20079,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_F77='-Wl,'
-@@ -16208,6 +17789,11 @@
+@@ -16208,6 +16900,11 @@
        lt_prog_compiler_pic_F77='-fno-common'
        ;;
  
@@ -20562,7 +20091,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -16224,7 +17810,7 @@
+@@ -16224,7 +16921,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -20571,7 +20100,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16250,6 +17836,16 @@
+@@ -16250,6 +16947,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -20588,7 +20117,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -16261,7 +17857,7 @@
+@@ -16261,7 +16968,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.
@@ -20597,7 +20126,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -16284,14 +17880,21 @@
+@@ -16284,13 +16991,20 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20610,7 +20139,6 @@
  	lt_prog_compiler_pic_F77='-KPIC'
  	lt_prog_compiler_static_F77='-static'
          ;;
--      ccc*)
 +      pgcc* | pgf77* | pgf90* | pgf95*)
 +        # Portland Group compilers (*not* the Pentium gcc compiler,
 +	# which looks to be a dead project)
@@ -20618,11 +20146,10 @@
 +	lt_prog_compiler_pic_F77='-fpic'
 +	lt_prog_compiler_static_F77='-Bstatic'
 +        ;;
-+      ccc*)
+       ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-         lt_prog_compiler_static_F77='-non_shared'
-@@ -16305,15 +17908,15 @@
+@@ -16305,15 +17019,15 @@
        lt_prog_compiler_static_F77='-non_shared'
        ;;
  
@@ -20644,7 +20171,7 @@
        ;;
  
      sunos4*)
-@@ -16322,7 +17925,7 @@
+@@ -16322,7 +17036,7 @@
        lt_prog_compiler_static_F77='-Bstatic'
        ;;
  
@@ -20653,25 +20180,32 @@
        lt_prog_compiler_wl_F77='-Wl,'
        lt_prog_compiler_pic_F77='-KPIC'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16335,6 +17938,17 @@
+@@ -16335,27 +17049,38 @@
        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'
-@@ -16346,16 +17960,16 @@
++    uts4*)
++      lt_prog_compiler_pic_F77='-pic'
++      lt_prog_compiler_static_F77='-Bstatic'
++      ;;
++
++    *)
+       lt_prog_compiler_can_build_shared_F77=no
+       ;;
      esac
    fi
  
@@ -20692,7 +20226,7 @@
  if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16369,26 +17983,28 @@
+@@ -16369,26 +17094,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 \
@@ -20701,12 +20235,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16375: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17989: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17100: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:16379: \$? = $ac_status" >&5
-+   echo "$as_me:17993: \$? = $ac_status" >&5
++   echo "$as_me:17104: \$? = $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
@@ -20728,7 +20262,7 @@
  
  if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
      case $lt_prog_compiler_pic_F77 in
-@@ -16401,7 +18017,7 @@
+@@ -16401,7 +17128,7 @@
  fi
  
  fi
@@ -20737,7 +20271,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16411,8 +18027,50 @@
+@@ -16411,8 +17138,50 @@
      ;;
  esac
  
@@ -20790,7 +20324,7 @@
  if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -16423,60 +18081,58 @@
+@@ -16423,60 +17192,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20812,12 +20346,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:16442: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18093: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17204: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:16446: \$? = $ac_status" >&5
-+   echo "$as_me:18097: \$? = $ac_status" >&5
++   echo "$as_me:17208: \$? = $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
@@ -20869,7 +20403,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;}
-@@ -16486,8 +18142,8 @@
+@@ -16486,8 +17253,8 @@
    need_locks=no
  fi
  
@@ -20880,7 +20414,7 @@
  
    runpath_var=
    allow_undefined_flag_F77=
-@@ -16525,6 +18181,16 @@
+@@ -16525,6 +17292,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20897,7 +20431,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16535,6 +18201,10 @@
+@@ -16535,6 +17312,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -20908,7 +20442,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -16545,6 +18215,27 @@
+@@ -16545,6 +17326,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20936,7 +20470,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16582,7 +18273,7 @@
+@@ -16582,7 +17384,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20945,7 +20479,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16592,13 +18283,13 @@
+@@ -16592,13 +17394,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'
@@ -20962,7 +20496,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
-@@ -16607,23 +18298,70 @@
+@@ -16607,23 +17409,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21039,7 +20573,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_F77=no
  	cat <<EOF 1>&2
-@@ -16637,13 +18375,40 @@
+@@ -16637,13 +17486,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21082,7 +20616,7 @@
      sunos4*)
        archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -16653,24 +18418,19 @@
+@@ -16653,24 +17529,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21114,7 +20648,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16682,7 +18442,7 @@
+@@ -16682,7 +17553,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_F77=yes
@@ -21123,7 +20657,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_F77=unsupported
-@@ -16704,9 +18464,21 @@
+@@ -16704,9 +17575,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
@@ -21147,7 +20681,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16723,7 +18495,7 @@
+@@ -16723,7 +17606,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -21156,7 +20690,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`
-@@ -16742,8 +18514,12 @@
+@@ -16742,8 +17625,12 @@
    	  hardcode_libdir_flag_spec_F77='-L$libdir'
    	  hardcode_libdir_separator_F77=
  	  fi
@@ -21169,7 +20703,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16751,45 +18527,58 @@
+@@ -16751,48 +17638,45 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -21216,34 +20750,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
-@@ -16803,19 +18592,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; }
+ }'`
+@@ -16803,19 +17687,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21269,7 +20798,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16824,24 +18614,36 @@
+@@ -16824,27 +17709,23 @@
        end
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -21287,34 +20816,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
-@@ -16855,8 +18657,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; }
+ }'`
+@@ -16855,8 +17736,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -21326,7 +20850,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -16865,13 +18669,11 @@
+@@ -16865,13 +17748,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_F77=' ${wl}-bernotok'
  	  allow_undefined_flag_F77=' ${wl}-berok'
@@ -21343,7 +20867,7 @@
  	fi
        fi
        ;;
-@@ -16884,7 +18686,7 @@
+@@ -16884,7 +17765,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -21352,7 +20876,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16894,68 +18696,68 @@
+@@ -16894,68 +17775,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -21465,7 +20989,7 @@
      fi
        ;;
  
-@@ -16989,8 +18791,8 @@
+@@ -16989,8 +17870,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -21476,7 +21000,7 @@
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16998,7 +18800,7 @@
+@@ -16998,7 +17879,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -21485,7 +21009,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
-@@ -17012,47 +18814,62 @@
+@@ -17012,47 +17893,62 @@
        export_dynamic_flag_spec_F77='${wl}-E'
        ;;
  
@@ -21572,7 +21096,7 @@
  	  hardcode_direct_F77=yes
  	  export_dynamic_flag_spec_F77='${wl}-E'
  
-@@ -17066,7 +18883,7 @@
+@@ -17066,7 +17962,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -21581,7 +21105,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'
-@@ -17076,7 +18893,7 @@
+@@ -17076,7 +17972,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -21590,7 +21114,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
-@@ -17099,7 +18916,8 @@
+@@ -17099,7 +17995,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
@@ -21600,7 +21124,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -17109,7 +18927,7 @@
+@@ -17109,7 +18006,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -21609,7 +21133,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -17120,14 +18938,14 @@
+@@ -17120,14 +18017,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -21626,7 +21150,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'
-@@ -17139,13 +18957,13 @@
+@@ -17139,13 +18036,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -21642,7 +21166,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17153,21 +18971,15 @@
+@@ -17153,21 +18050,15 @@
        hardcode_libdir_separator_F77=:
        ;;
  
@@ -21668,7 +21192,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'
-@@ -17176,8 +18988,18 @@
+@@ -17176,8 +18067,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21689,7 +21213,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -17186,7 +19008,7 @@
+@@ -17186,7 +18087,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.
@@ -21698,7 +21222,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -17234,36 +19056,45 @@
+@@ -17234,36 +18135,45 @@
        fi
        ;;
  
@@ -21765,7 +21289,7 @@
        ;;
  
      uts4*)
-@@ -17278,15 +19109,10 @@
+@@ -17278,15 +18188,10 @@
      esac
    fi
  
@@ -21783,7 +21307,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -17304,8 +19130,8 @@
+@@ -17304,8 +18209,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.
@@ -21794,7 +21318,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -17319,6 +19145,7 @@
+@@ -17319,6 +18224,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_F77
@@ -21802,7 +21326,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -17341,20 +19168,20 @@
+@@ -17341,20 +18247,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -21828,7 +21352,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17364,7 +19191,20 @@
+@@ -17364,7 +18270,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21850,7 +21374,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17429,7 +19269,7 @@
+@@ -17429,7 +18348,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21859,7 +21383,7 @@
    ;;
  
  beos*)
-@@ -17438,7 +19278,7 @@
+@@ -17438,7 +18357,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21868,7 +21392,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17454,7 +19294,7 @@
+@@ -17454,7 +18373,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21877,7 +21401,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17466,7 +19306,8 @@
+@@ -17466,7 +18385,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21887,7 +21411,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17496,7 +19337,7 @@
+@@ -17496,7 +18416,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21896,7 +21420,7 @@
        ;;
      esac
      ;;
-@@ -17519,7 +19360,7 @@
+@@ -17519,7 +18439,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21905,7 +21429,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"`
-@@ -17542,20 +19383,17 @@
+@@ -17542,20 +18462,17 @@
    dynamic_linker=no
    ;;
  
@@ -21937,7 +21461,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17573,14 +19411,19 @@
+@@ -17573,14 +18490,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21959,7 +21483,7 @@
    esac
    ;;
  
-@@ -17600,9 +19443,9 @@
+@@ -17600,9 +18522,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -21971,7 +21495,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17617,7 +19460,7 @@
+@@ -17617,7 +18539,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -21980,7 +21504,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17628,7 +19471,7 @@
+@@ -17628,7 +18550,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -21989,7 +21513,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17640,6 +19483,18 @@
+@@ -17640,6 +18562,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
@@ -22008,7 +21532,7 @@
  irix5* | irix6* | nonstopux*)
    case $host_os in
      nonstopux*) version_type=nonstopux ;;
-@@ -17683,29 +19538,26 @@
+@@ -17683,29 +18617,26 @@
    ;;
  
  # This must be Linux ELF.
@@ -22045,7 +21569,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,
-@@ -17715,6 +19567,18 @@
+@@ -17715,6 +18646,18 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -22064,7 +21588,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17724,7 +19588,7 @@
+@@ -17724,7 +18667,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -22073,7 +21597,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17752,8 +19616,13 @@
+@@ -17752,8 +18695,13 @@
  
  openbsd*)
    version_type=sunos
@@ -22088,7 +21612,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
-@@ -17773,7 +19642,7 @@
+@@ -17773,7 +18721,7 @@
  
  os2*)
    libname_spec='$name'
@@ -22097,7 +21621,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17791,13 +19660,6 @@
+@@ -17791,13 +18739,6 @@
    sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
    ;;
  
@@ -22111,7 +21635,7 @@
  solaris*)
    version_type=linux
    need_lib_prefix=no
-@@ -17823,7 +19685,7 @@
+@@ -17823,7 +18764,7 @@
    need_version=yes
    ;;
  
@@ -22120,7 +21644,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'
-@@ -17856,6 +19718,29 @@
+@@ -17856,6 +18797,29 @@
    fi
    ;;
  
@@ -22150,7 +21674,7 @@
  uts4*)
    version_type=linux
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17867,16 +19752,21 @@
+@@ -17867,16 +18831,21 @@
    dynamic_linker=no
    ;;
  esac
@@ -22178,7 +21702,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17896,8 +19786,8 @@
+@@ -17896,8 +18865,8 @@
    # directories.
    hardcode_action_F77=unsupported
  fi
@@ -22189,7 +21713,7 @@
  
  if test "$hardcode_action_F77" = relink; then
    # Fast installation is not supported
-@@ -17908,36 +19798,6 @@
+@@ -17908,36 +18877,6 @@
    enable_fast_install=needless
  fi
  
@@ -22226,7 +21750,7 @@
  
  # The else clause should only fire when bootstrapping the
  # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -17952,7 +19812,8 @@
+@@ -17952,7 +18891,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.
@@ -22236,7 +21760,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 \
-@@ -18052,6 +19913,12 @@
+@@ -18052,6 +18992,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22249,7 +21773,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -18063,6 +19930,9 @@
+@@ -18063,6 +19009,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -22259,7 +21783,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_F77
  
-@@ -18082,7 +19952,7 @@
+@@ -18082,7 +19031,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22268,7 +21792,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -18113,7 +19983,7 @@
+@@ -18113,7 +19062,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22277,7 +21801,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -18128,7 +19998,7 @@
+@@ -18128,7 +19077,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -22286,7 +21810,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18330,7 +20200,10 @@
+@@ -18330,7 +19279,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.
@@ -22298,7 +21822,7 @@
  fi
  
  
-@@ -18351,7 +20224,6 @@
+@@ -18351,7 +19303,6 @@
  	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
  
  
@@ -22306,7 +21830,7 @@
  # Source file extension for Java test sources.
  ac_ext=java
  
-@@ -18363,26 +20235,55 @@
+@@ -18363,26 +19314,55 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -22363,7 +21887,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
-@@ -18394,8 +20295,8 @@
+@@ -18394,8 +19374,8 @@
    lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
  
  
@@ -22374,7 +21898,7 @@
  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18409,26 +20310,28 @@
+@@ -18409,26 +19389,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 \
@@ -22383,12 +21907,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18415: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20316: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19395: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18419: \$? = $ac_status" >&5
-+   echo "$as_me:20320: \$? = $ac_status" >&5
++   echo "$as_me:19399: \$? = $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
@@ -22410,7 +21934,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"
-@@ -18442,8 +20345,8 @@
+@@ -18442,8 +19424,8 @@
  lt_prog_compiler_pic_GCJ=
  lt_prog_compiler_static_GCJ=
  
@@ -22421,7 +21945,7 @@
  
    if test "$GCC" = yes; then
      lt_prog_compiler_wl_GCJ='-Wl,'
-@@ -18481,6 +20384,11 @@
+@@ -18481,6 +19463,11 @@
        lt_prog_compiler_pic_GCJ='-fno-common'
        ;;
  
@@ -22433,7 +21957,7 @@
      msdosdjgpp*)
        # Just because we use GCC doesn't mean we suddenly get shared libraries
        # on systems that don't support them.
-@@ -18497,7 +20405,7 @@
+@@ -18497,7 +19484,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -22442,7 +21966,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18523,6 +20431,16 @@
+@@ -18523,6 +19510,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -22459,7 +21983,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18534,7 +20452,7 @@
+@@ -18534,7 +19531,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.
@@ -22468,7 +21992,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18557,13 +20475,20 @@
+@@ -18557,13 +19554,20 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22491,7 +22015,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18578,15 +20503,15 @@
+@@ -18578,15 +19582,15 @@
        lt_prog_compiler_static_GCJ='-non_shared'
        ;;
  
@@ -22513,7 +22037,7 @@
        ;;
  
      sunos4*)
-@@ -18595,7 +20520,7 @@
+@@ -18595,7 +19599,7 @@
        lt_prog_compiler_static_GCJ='-Bstatic'
        ;;
  
@@ -22522,7 +22046,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        lt_prog_compiler_pic_GCJ='-KPIC'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18608,6 +20533,17 @@
+@@ -18608,6 +19612,17 @@
        fi
        ;;
  
@@ -22540,7 +22064,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18619,16 +20555,16 @@
+@@ -18619,16 +19634,16 @@
      esac
    fi
  
@@ -22561,7 +22085,7 @@
  if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18642,26 +20578,28 @@
+@@ -18642,26 +19657,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 \
@@ -22570,12 +22094,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18648: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20584: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19663: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
 -   echo "$as_me:18652: \$? = $ac_status" >&5
-+   echo "$as_me:20588: \$? = $ac_status" >&5
++   echo "$as_me:19667: \$? = $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
@@ -22597,7 +22121,7 @@
  
  if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
      case $lt_prog_compiler_pic_GCJ in
-@@ -18674,7 +20612,7 @@
+@@ -18674,7 +19691,7 @@
  fi
  
  fi
@@ -22606,7 +22130,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18684,8 +20622,50 @@
+@@ -18684,8 +19701,50 @@
      ;;
  esac
  
@@ -22659,7 +22183,7 @@
  if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -18696,60 +20676,58 @@
+@@ -18696,60 +19755,58 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -22681,12 +22205,12 @@
     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
 -   (eval echo "\"\$as_me:18715: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:20688: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19767: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
 -   echo "$as_me:18719: \$? = $ac_status" >&5
-+   echo "$as_me:20692: \$? = $ac_status" >&5
++   echo "$as_me:19771: \$? = $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
@@ -22738,7 +22262,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;}
-@@ -18759,8 +20737,8 @@
+@@ -18759,8 +19816,8 @@
    need_locks=no
  fi
  
@@ -22749,7 +22273,7 @@
  
    runpath_var=
    allow_undefined_flag_GCJ=
-@@ -18798,6 +20776,16 @@
+@@ -18798,6 +19855,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -22766,7 +22290,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18808,6 +20796,10 @@
+@@ -18808,6 +19875,10 @@
        with_gnu_ld=no
      fi
      ;;
@@ -22777,7 +22301,7 @@
    openbsd*)
      with_gnu_ld=no
      ;;
-@@ -18818,6 +20810,27 @@
+@@ -18818,6 +19889,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -22805,7 +22329,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18855,7 +20868,7 @@
+@@ -18855,7 +19947,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -22814,7 +22338,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18865,13 +20878,13 @@
+@@ -18865,13 +19957,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'
@@ -22831,7 +22355,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
-@@ -18880,23 +20893,70 @@
+@@ -18880,23 +19972,70 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -22908,7 +22432,7 @@
        if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
  	ld_shlibs_GCJ=no
  	cat <<EOF 1>&2
-@@ -18910,13 +20970,40 @@
+@@ -18910,13 +20049,40 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22951,7 +22475,7 @@
      sunos4*)
        archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
        wlarc=
-@@ -18926,24 +21013,19 @@
+@@ -18926,24 +20092,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -22983,7 +22507,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18955,7 +21037,7 @@
+@@ -18955,7 +20116,7 @@
        # Note: this linker hardcodes the directories in LIBPATH if there
        # are no directories specified by -L.
        hardcode_minus_L_GCJ=yes
@@ -22992,7 +22516,7 @@
  	# Neither direct hardcoding nor static linking is supported with a
  	# broken collect2.
  	hardcode_direct_GCJ=unsupported
-@@ -18977,9 +21059,21 @@
+@@ -18977,9 +20138,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
@@ -23016,7 +22540,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18996,7 +21090,7 @@
+@@ -18996,7 +20169,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -23025,7 +22549,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`
-@@ -19015,8 +21109,12 @@
+@@ -19015,8 +20188,12 @@
    	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
    	  hardcode_libdir_separator_GCJ=
  	  fi
@@ -23038,7 +22562,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -19024,22 +21122,23 @@
+@@ -19024,22 +20201,23 @@
    	# chokes on -Wl,-G. The following line is correct:
  	  shared_flag='-G'
  	else
@@ -23069,7 +22593,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -19055,24 +21154,36 @@
+@@ -19055,27 +20233,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23087,34 +22611,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
-@@ -19086,19 +21197,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; }
+ }'`
+@@ -19086,19 +20260,20 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23140,7 +22659,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -19117,24 +21229,36 @@
+@@ -19117,27 +20292,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -23158,34 +22677,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
-@@ -19148,8 +21272,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; }
+ }'`
+@@ -19148,8 +20319,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -23197,7 +22711,7 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
-@@ -19158,13 +21284,11 @@
+@@ -19158,13 +20331,11 @@
  	  # -berok will link without error, but may produce a broken library.
  	  no_undefined_flag_GCJ=' ${wl}-bernotok'
  	  allow_undefined_flag_GCJ=' ${wl}-berok'
@@ -23214,7 +22728,7 @@
  	fi
        fi
        ;;
-@@ -19177,7 +21301,7 @@
+@@ -19177,7 +20348,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -23223,7 +22737,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -19187,68 +21311,68 @@
+@@ -19187,68 +20358,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -23336,7 +22850,7 @@
      fi
        ;;
  
-@@ -19282,8 +21406,8 @@
+@@ -19282,8 +20453,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
@@ -23347,7 +22861,7 @@
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -19291,7 +21415,7 @@
+@@ -19291,7 +20462,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -23356,7 +22870,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
-@@ -19305,47 +21429,62 @@
+@@ -19305,47 +20476,62 @@
        export_dynamic_flag_spec_GCJ='${wl}-E'
        ;;
  
@@ -23425,25 +22939,25 @@
 +	hppa*64*|ia64*)
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
 -	  hardcode_libdir_separator_GCJ=:
--	  hardcode_direct_GCJ=no
--	  hardcode_shlibpath_var_GCJ=no
--	  ;;
--	ia64*)
--	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
  	  hardcode_direct_GCJ=no
  	  hardcode_shlibpath_var_GCJ=no
+ 	  ;;
+-	ia64*)
+-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
+-	  hardcode_direct_GCJ=no
+-	  hardcode_shlibpath_var_GCJ=no
 -
 -	  # hardcode_minus_L: Not really in the search PATH,
 -	  # but as the default location of the library.
 -	  hardcode_minus_L_GCJ=yes
- 	  ;;
+-	  ;;
  	*)
 -	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
 -	  hardcode_libdir_separator_GCJ=:
  	  hardcode_direct_GCJ=yes
  	  export_dynamic_flag_spec_GCJ='${wl}-E'
  
-@@ -19359,7 +21498,7 @@
+@@ -19359,7 +20545,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -23452,7 +22966,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'
-@@ -19369,7 +21508,7 @@
+@@ -19369,7 +20555,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -23461,7 +22975,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
-@@ -19392,7 +21531,8 @@
+@@ -19392,7 +20578,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
@@ -23471,7 +22985,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19402,7 +21542,7 @@
+@@ -19402,7 +20589,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -23480,7 +22994,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19413,14 +21553,14 @@
+@@ -19413,14 +20600,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -23497,7 +23011,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'
-@@ -19432,13 +21572,13 @@
+@@ -19432,13 +20619,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23513,7 +23027,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19446,21 +21586,15 @@
+@@ -19446,21 +20633,15 @@
        hardcode_libdir_separator_GCJ=:
        ;;
  
@@ -23539,7 +23053,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'
-@@ -19469,8 +21603,18 @@
+@@ -19469,8 +20650,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -23560,7 +23074,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19479,7 +21623,7 @@
+@@ -19479,7 +20670,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.
@@ -23569,7 +23083,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19527,36 +21671,45 @@
+@@ -19527,36 +20718,45 @@
        fi
        ;;
  
@@ -23636,7 +23150,7 @@
        ;;
  
      uts4*)
-@@ -19571,15 +21724,10 @@
+@@ -19571,15 +20771,10 @@
      esac
    fi
  
@@ -23654,7 +23168,7 @@
  #
  # Do we need to explicitly link libc?
  #
-@@ -19597,8 +21745,8 @@
+@@ -19597,8 +20792,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.
@@ -23665,7 +23179,7 @@
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
-@@ -19612,6 +21760,7 @@
+@@ -19612,6 +20807,7 @@
          libobjs=conftest.$ac_objext
          deplibs=
          wl=$lt_prog_compiler_wl_GCJ
@@ -23673,7 +23187,7 @@
          compiler_flags=-v
          linker_flags=-v
          verstring=
-@@ -19634,20 +21783,20 @@
+@@ -19634,20 +20830,20 @@
          cat conftest.err 1>&5
        fi
        $rm conftest*
@@ -23699,7 +23213,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19657,7 +21806,20 @@
+@@ -19657,7 +20853,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -23721,7 +23235,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19722,7 +21884,7 @@
+@@ -19722,7 +20931,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -23730,7 +23244,7 @@
    ;;
  
  beos*)
-@@ -19731,7 +21893,7 @@
+@@ -19731,7 +20940,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -23739,7 +23253,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19747,7 +21909,7 @@
+@@ -19747,7 +20956,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -23748,7 +23262,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19759,7 +21921,8 @@
+@@ -19759,7 +20968,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -23758,7 +23272,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19789,7 +21952,7 @@
+@@ -19789,7 +20999,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -23767,7 +23281,7 @@
        ;;
      esac
      ;;
-@@ -19812,7 +21975,7 @@
+@@ -19812,7 +21022,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -23776,7 +23290,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"`
-@@ -19835,20 +21998,17 @@
+@@ -19835,20 +21045,17 @@
    dynamic_linker=no
    ;;
  
@@ -23808,7 +23322,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19866,14 +22026,19 @@
+@@ -19866,14 +21073,19 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -23830,7 +23344,7 @@
    esac
    ;;
  
-@@ -19893,9 +22058,9 @@
+@@ -19893,9 +21105,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -23842,7 +23356,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19910,7 +22075,7 @@
+@@ -19910,7 +21122,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -23851,7 +23365,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19921,7 +22086,7 @@
+@@ -19921,7 +21133,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -23860,61 +23374,37 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19933,1107 +22098,319 @@
+@@ -19933,6 +21145,18 @@
    postinstall_cmds='chmod 555 $lib'
    ;;
  
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)
--	if test "$lt_cv_prog_gnu_ld" = yes; then
--		version_type=linux
--	else
--		version_type=irix
--	fi ;;
--  esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}${shared_ext}$major'
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
--    ;;
--  *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
--      libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
--      libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
--      libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
--    ;;
--  esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  hardcode_into_libs=yes
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux*oldld* | linux*aout* | linux*coff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux*)
 +interix3*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  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='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+@@ -19976,29 +21200,26 @@
+   ;;
+ 
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  soname_spec='${libname}${release}${shared_ext}$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
 -  libsuff=
 -  if test "x$LINUX_64_MODE" = x64; then
 -    # Some platforms are per default 64-bit, so there's no /lib64
@@ -23922,87 +23412,77 @@
 -      libsuff=64
 -    fi
 -  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
 -  sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
 -  sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
--
--  # 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,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
--  ;;
--
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
+   # This implies no fast_install, which is unacceptable.
+   # Some rework will be needed to allow for fast_install
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
++  # 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
++
+   # 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,
+@@ -20008,6 +21229,18 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  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
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -20017,7 +21250,7 @@
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
 -    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
--    soname_spec='${libname}${release}${shared_ext}$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  ;;
--
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  ;;
--
--nto-qnx*)
--  version_type=linux
--  need_lib_prefix=no
++    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
+@@ -20045,8 +21278,13 @@
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   need_lib_prefix=no
 -  need_version=no
--  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
--  shlibpath_overrides_runpath=yes
--  ;;
--
--openbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  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
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case $host_os in
--      openbsd2.[89] | openbsd2.[89].*)
--	shlibpath_overrides_runpath=no
--	;;
--      *)
--	shlibpath_overrides_runpath=yes
--	;;
--      esac
--  else
--    shlibpath_overrides_runpath=yes
--  fi
--  ;;
--
--os2*)
--  libname_spec='$name'
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
+   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
+@@ -20066,974 +21304,160 @@
+ 
+ os2*)
+   libname_spec='$name'
 -  shrext=".dll"
--  need_lib_prefix=no
--  library_names_spec='$libname${shared_ext} $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+   library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
 -  ;;
 -
 -osf3* | osf4* | osf5*)
@@ -24084,10 +23564,8 @@
 -uts4*)
 -  version_type=linux
 -  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  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='Interix 3.x ld.so.1 (PE, like ELF)'
-   shlibpath_var=LD_LIBRARY_PATH
+-  soname_spec='${libname}${release}${shared_ext}$major'
+-  shlibpath_var=LD_LIBRARY_PATH
 -  ;;
 -
 -*)
@@ -24723,165 +24201,30 @@
 -  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
 -fi
 -
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
- 
+-
 -fi
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
- 
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
+-
+-
 -fi
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
- 
-+  # 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
-+  # 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,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  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
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
- 
+-
+-
 -fi
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    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
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
+-
+-
 -fi
-+nto-qnx*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  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
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
+-
 -    ;;
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-   esac
+-  esac
 -
 -  if test "x$lt_cv_dlopen" != xno; then
 -    enable_dlopen=yes
-+  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
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[89] | openbsd2.[89].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-   else
+-  else
 -    enable_dlopen=no
-+    shlibpath_overrides_runpath=yes
-   fi
-+  ;;
- 
+-  fi
+-
 -  case $lt_cv_dlopen in
 -  dlopen)
 -    save_CPPFLAGS="$CPPFLAGS"
@@ -24912,15 +24255,7 @@
 -#endif
 -
 -#include <stdio.h>
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
+-
 -#ifdef RTLD_GLOBAL
 -#  define LT_DLGLOBAL		RTLD_GLOBAL
 -#else
@@ -24930,17 +24265,7 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
- 
+-
 -/* 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
@@ -24962,78 +24287,24 @@
 -#    endif
 -#  endif
 -#endif
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  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
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
- 
+-
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
- 
+-
 -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}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  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
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
- 
+-
 -    exit (status);
 -}
 -EOF
@@ -25048,29 +24319,11 @@
 -      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 ;;
-+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
-+  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'
-+    shlibpath_overrides_runpath=no
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    shlibpath_overrides_runpath=yes
-+    case $host_os in
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-     esac
+-    esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self=no
-   fi
+-  fi
 -fi
 -rm -fr conftest*
 -
@@ -25110,7 +24363,8 @@
 -#    define LT_DLGLOBAL		0
 -#  endif
 -#endif
--
++  ;;
+ 
 -/* 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
@@ -25132,11 +24386,31 @@
 -#    endif
 -#  endif
 -#endif
--
++osf3* | osf4* | osf5*)
++  version_type=osf
++  need_lib_prefix=no
++  need_version=no
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  ;;
+ 
 -#ifdef __cplusplus
 -extern "C" void exit (int);
 -#endif
-+  sys_lib_dlsearch_path_spec='/usr/lib'
++solaris*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  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
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  # ldd complains unless libraries are executable
++  postinstall_cmds='chmod +x $lib'
 +  ;;
  
 -void fnord() { int i=42;}
@@ -25144,11 +24418,16 @@
 -{
 -  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
 -  int status = $lt_dlunknown;
-+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'
++sunos4*)
++  version_type=sunos
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  if test "$with_gnu_ld" = yes; then
++    need_lib_prefix=no
++  fi
++  need_version=yes
 +  ;;
  
 -  if (self)
@@ -25157,13 +24436,29 @@
 -      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
 -      /* dlclose (self); */
 -    }
-+*)
-+  dynamic_linker=no
++sysv4 | sysv4.3*)
++  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
++  case $host_vendor in
++    sni)
++      shlibpath_overrides_runpath=no
++      need_lib_prefix=no
++      export_dynamic_flag_spec='${wl}-Blargedynsym'
++      runpath_var=LD_RUN_PATH
++      ;;
++    siemens)
++      need_lib_prefix=no
++      ;;
++    motorola)
++      need_lib_prefix=no
++      need_version=no
++      shlibpath_overrides_runpath=no
++      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
++      ;;
++  esac
 +  ;;
-+esac
-+{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
  
 -    exit (status);
 -}
@@ -25179,17 +24474,71 @@
 -      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 ;;
--    esac
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
++  ;;
++
++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
++  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'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
+     esac
 -  else :
 -    # compilation failed
 -    lt_cv_dlopen_self_static=no
--  fi
+   fi
+-fi
+-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
++  ;;
++esac
++{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
++echo "${ECHO_T}$dynamic_linker" >&6; }
++test "$dynamic_linker" = 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
--rm -fr conftest*
+-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
+-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
+-    fi
  
+-    CPPFLAGS="$save_CPPFLAGS"
+-    LDFLAGS="$save_LDFLAGS"
+-    LIBS="$save_LIBS"
+-    ;;
+-  esac
 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
@@ -25197,6 +24546,10 @@
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
  
+-  case $lt_cv_dlopen_self in
+-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+-  *) enable_dlopen_self=unknown ;;
+-  esac
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -25214,21 +24567,7 @@
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
 +  hardcode_action_GCJ=unsupported
- fi
--echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
--echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
--    fi
--
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
--
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
++fi
 +{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
 +echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
  
@@ -25246,7 +24585,7 @@
  fi
  
  
-@@ -21050,7 +22427,8 @@
+@@ -21050,7 +21474,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.
@@ -25256,7 +24595,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 \
-@@ -21150,6 +22528,12 @@
+@@ -21150,6 +21575,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25269,7 +24608,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21161,6 +22545,9 @@
+@@ -21161,6 +21592,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25279,7 +24618,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_GCJ
  
-@@ -21180,7 +22567,7 @@
+@@ -21180,7 +21614,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25288,7 +24627,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21211,7 +22598,7 @@
+@@ -21211,7 +21645,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25297,7 +24636,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21226,7 +22613,7 @@
+@@ -21226,7 +21660,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -25306,7 +24645,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21428,7 +22815,10 @@
+@@ -21428,7 +21862,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.
@@ -25318,7 +24657,7 @@
  fi
  
  
-@@ -21448,7 +22838,6 @@
+@@ -21448,7 +21885,6 @@
        RC)
  
  
@@ -25326,7 +24665,7 @@
  # Source file extension for RC test sources.
  ac_ext=rc
  
-@@ -21467,15 +22856,42 @@
+@@ -21467,15 +21903,42 @@
  # If no C compiler was specified, use CC.
  LTCC=${LTCC-"$CC"}
  
@@ -25369,7 +24708,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21491,7 +22907,8 @@
+@@ -21491,7 +21954,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.
@@ -25379,7 +24718,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 \
-@@ -21591,6 +23008,12 @@
+@@ -21591,6 +22055,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -25392,7 +24731,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21602,6 +23025,9 @@
+@@ -21602,6 +22072,9 @@
  # A C compiler.
  LTCC=$lt_LTCC
  
@@ -25402,7 +24741,7 @@
  # A language-specific compiler.
  CC=$lt_compiler_RC
  
-@@ -21621,7 +23047,7 @@
+@@ -21621,7 +22094,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -25411,7 +24750,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21652,7 +23078,7 @@
+@@ -21652,7 +22125,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -25420,7 +24759,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21667,7 +23093,7 @@
+@@ -21667,7 +22140,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -25429,7 +24768,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21869,7 +23295,10 @@
+@@ -21869,7 +22342,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.
@@ -25441,7 +24780,7 @@
  fi
  
  
-@@ -21916,7 +23345,7 @@
+@@ -21916,7 +22392,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -25450,7 +24789,7 @@
  
  # Prevent multiple expansion
  
-@@ -21971,8 +23400,8 @@
+@@ -21971,8 +22447,8 @@
  
      # Extract the first word of "msgfmt", so it can be a program name with args.
  set dummy msgfmt; ac_word=$2
@@ -25461,7 +24800,7 @@
  if test "${ac_cv_path_MSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -21998,17 +23427,17 @@
+@@ -21998,17 +22474,17 @@
  fi
  MSGFMT="$ac_cv_path_MSGFMT"
  if test -n "$MSGFMT"; then
@@ -25485,12 +24824,12 @@
  if test "${ac_cv_path_GMSGFMT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22023,32 +23452,33 @@
+@@ -22023,32 +22499,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
@@ -25527,7 +24866,7 @@
          GMSGFMT=":"
        fi
        MSGFMT=$GMSGFMT
-@@ -22057,8 +23487,8 @@
+@@ -22057,8 +22534,8 @@
  
        # Extract the first word of "xgettext", so it can be a program name with args.
  set dummy xgettext; ac_word=$2
@@ -25538,7 +24877,7 @@
  if test "${ac_cv_path_XGETTEXT+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22084,11 +23514,11 @@
+@@ -22084,11 +22561,11 @@
  fi
  XGETTEXT="$ac_cv_path_XGETTEXT"
  if test -n "$XGETTEXT"; then
@@ -25554,7 +24893,7 @@
  fi
  
  
-@@ -22096,8 +23526,8 @@
+@@ -22096,8 +22573,8 @@
  			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
  	  : ;
  	else
@@ -25565,7 +24904,7 @@
  	  XGETTEXT=":"
  	fi
        fi
-@@ -22107,8 +23537,7 @@
+@@ -22107,8 +22584,7 @@
  
  
  
@@ -25575,7 +24914,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'
-@@ -22120,8 +23549,8 @@
+@@ -22120,8 +22596,8 @@
      ac_save_CXXFLAGS="$CXXFLAGS"
      CXXFLAGS="`echo $CXXFLAGS | sed s/-fno-exceptions//`"
  
@@ -25586,7 +24925,7 @@
      if test "${kde_cv_stl_works+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22149,24 +23578,36 @@
+@@ -22149,41 +22625,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25604,34 +24943,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
-@@ -22175,15 +23616,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
  
@@ -25652,7 +24983,7 @@
  
     if test "$kde_cv_stl_works" = "yes"; then
       # back compatible
-@@ -22212,15 +23654,14 @@
+@@ -22212,15 +22684,14 @@
  
  
  
@@ -25671,7 +25002,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'
-@@ -22232,9 +23673,6 @@
+@@ -22232,9 +22703,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25681,7 +25012,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22260,24 +23698,36 @@
+@@ -22260,35 +22728,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25699,34 +25030,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
-@@ -22286,9 +23736,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
  
@@ -25739,7 +25062,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22301,11 +23752,11 @@
+@@ -22301,11 +22765,11 @@
  fi
  
  
@@ -25755,7 +25078,7 @@
  if test "${kde_cv_proto_strlcat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22326,8 +23777,7 @@
+@@ -22326,8 +22790,7 @@
  if test "x$kde_cv_proto_strlcat" = xunknown; then
  
  
@@ -25765,7 +25088,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'
-@@ -22365,24 +23815,36 @@
+@@ -22365,37 +22828,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25783,34 +25106,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
-@@ -22392,10 +23854,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
  
@@ -25824,7 +25141,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22408,8 +23871,8 @@
+@@ -22408,8 +22868,8 @@
  
  fi
  
@@ -25835,7 +25152,7 @@
  
  if test "x$kde_cv_func_strlcat" = xyes; then
  
-@@ -22433,15 +23896,14 @@
+@@ -22433,15 +22893,14 @@
  
  
  
@@ -25854,7 +25171,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'
-@@ -22453,9 +23915,6 @@
+@@ -22453,9 +22912,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -25864,7 +25181,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22480,24 +23939,36 @@
+@@ -22480,35 +22936,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -25882,34 +25199,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
-@@ -22506,9 +23977,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
  
@@ -25922,7 +25231,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -22521,11 +23993,11 @@
+@@ -22521,11 +22973,11 @@
  fi
  
  
@@ -25938,7 +25247,7 @@
  if test "${kde_cv_proto_strlcpy+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22546,8 +24018,7 @@
+@@ -22546,8 +22998,7 @@
  if test "x$kde_cv_proto_strlcpy" = xunknown; then
  
  
@@ -25948,7 +25257,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'
-@@ -22584,24 +24055,36 @@
+@@ -22584,37 +23035,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -25966,34 +25275,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
-@@ -22611,10 +24094,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
  
@@ -26007,7 +25310,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -22627,8 +24111,8 @@
+@@ -22627,8 +23075,8 @@
  
  fi
  
@@ -26018,7 +25321,7 @@
  
  if test "x$kde_cv_func_strlcpy" = xyes; then
  
-@@ -22651,8 +24135,8 @@
+@@ -22651,8 +23099,8 @@
  
  
  
@@ -26029,7 +25332,7 @@
  if test "${ac_cv_lib_util_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22669,30 +24153,42 @@
+@@ -22669,52 +23117,49 @@
  int
  main ()
  {
@@ -26054,34 +25357,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
-@@ -22701,20 +24197,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
  
@@ -26109,7 +25405,7 @@
  if test "${ac_cv_lib_compat_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22731,30 +24228,42 @@
+@@ -22731,53 +23176,50 @@
  int
  main ()
  {
@@ -26134,34 +25430,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
-@@ -22763,21 +24272,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
  
@@ -26190,7 +25479,7 @@
  if test "${ac_cv_lib_crypt_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22790,40 +24300,52 @@
+@@ -22790,61 +23232,58 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26228,34 +25517,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
-@@ -22832,19 +24354,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
  
@@ -26282,7 +25564,7 @@
  if test "${ac_cv_lib_c_crypt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -22857,40 +24380,52 @@
+@@ -22857,56 +23296,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26320,34 +25602,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
-@@ -22899,14 +24434,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
  
@@ -26367,7 +25642,7 @@
  if test $ac_cv_lib_c_crypt = yes; then
    kde_have_crypt=yes
  else
-@@ -22932,13 +24468,13 @@
+@@ -22932,13 +23368,13 @@
  
     fi
  
@@ -26384,7 +25659,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'
-@@ -22967,24 +24503,36 @@
+@@ -22967,27 +23403,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26402,34 +25677,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
-@@ -22996,8 +24544,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
+@@ -22996,8 +23427,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26441,7 +25710,7 @@
        ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -23007,17 +24557,17 @@
+@@ -23007,17 +23440,17 @@
  
  fi
  
@@ -26464,7 +25733,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'
-@@ -23046,24 +24596,36 @@
+@@ -23046,27 +23479,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -26482,34 +25751,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
-@@ -23075,8 +24637,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
+@@ -23075,8 +23503,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -26521,7 +25784,7 @@
           done
           ac_ext=c
  ac_cpp='$CPP $CPPFLAGS'
-@@ -23087,8 +24651,8 @@
+@@ -23087,8 +23517,8 @@
  
  fi
  
@@ -26532,7 +25795,7 @@
     fi
  
  cat >>confdefs.h <<_ACEOF
-@@ -23101,8 +24665,8 @@
+@@ -23101,8 +23531,8 @@
  _ACEOF
  
  
@@ -26543,7 +25806,7 @@
  if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23115,40 +24679,52 @@
+@@ -23115,63 +23545,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26581,34 +25844,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
-@@ -23157,21 +24733,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
  
@@ -26637,7 +25893,7 @@
  if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23184,40 +24761,52 @@
+@@ -23184,63 +23611,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26675,34 +25931,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
-@@ -23226,21 +24815,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
  
@@ -26731,7 +25980,7 @@
  if test "${ac_cv_func_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23267,53 +24857,59 @@
+@@ -23267,72 +23691,63 @@
  
  #undef inet_ntoa
  
@@ -26783,34 +26032,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
-@@ -23322,17 +24918,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
  
@@ -26835,7 +26077,7 @@
  if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23345,40 +24942,52 @@
+@@ -23345,63 +23760,60 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -26873,34 +26115,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
-@@ -23387,21 +24996,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
  
@@ -26929,7 +26164,7 @@
  if test "${ac_cv_func_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23428,53 +25038,59 @@
+@@ -23428,72 +23840,63 @@
  
  #undef connect
  
@@ -26981,34 +26216,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
-@@ -23483,17 +25099,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
  
@@ -27033,7 +26261,7 @@
  if test "${ac_cv_lib_socket_connect+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23506,40 +25123,52 @@
+@@ -23506,64 +23909,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27071,34 +26299,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
-@@ -23548,22 +25177,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
  
@@ -27128,7 +26349,7 @@
  if test "${ac_cv_func_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23590,53 +25220,59 @@
+@@ -23590,72 +23990,63 @@
  
  #undef remove
  
@@ -27180,34 +26401,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
-@@ -23645,17 +25281,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
  
@@ -27232,7 +26446,7 @@
  if test "${ac_cv_lib_posix_remove+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23668,40 +25305,52 @@
+@@ -23668,56 +24059,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27270,34 +26484,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
-@@ -23710,14 +25359,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
  
@@ -27317,7 +26524,7 @@
  if test $ac_cv_lib_posix_remove = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
  fi
-@@ -23725,8 +25375,8 @@
+@@ -23725,8 +24113,8 @@
     fi
  
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
@@ -27328,7 +26535,7 @@
  if test "${ac_cv_func_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23753,53 +25403,59 @@
+@@ -23753,73 +24141,64 @@
  
  #undef shmat
  
@@ -27380,34 +26587,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
-@@ -23808,18 +25464,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
  
@@ -27433,7 +26633,7 @@
  if test "${ac_cv_lib_ipc_shmat+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -23832,40 +25489,52 @@
+@@ -23832,56 +24211,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27471,34 +26671,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
-@@ -23874,14 +25543,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
  
@@ -27518,7 +26711,7 @@
  if test $ac_cv_lib_ipc_shmat = yes; then
    X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
  fi
-@@ -23895,18 +25565,19 @@
+@@ -23895,18 +24271,19 @@
  for ac_header in sys/types.h stdint.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27546,7 +26739,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23917,24 +25588,36 @@
+@@ -23917,41 +24294,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27564,34 +26757,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
-@@ -23943,15 +25626,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
  
@@ -27614,7 +26799,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -23960,8 +25644,13 @@
+@@ -23960,24 +24333,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27630,7 +26815,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -23985,9 +25674,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
+@@ -23985,9 +24356,10 @@
  
    ac_header_preproc=no
  fi
@@ -27643,7 +26848,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24011,25 +25701,19 @@
+@@ -24011,25 +24383,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;}
@@ -27676,7 +26881,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24047,18 +25731,19 @@
+@@ -24047,18 +24413,19 @@
  for ac_header in sys/bitypes.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27704,7 +26909,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24069,24 +25754,36 @@
+@@ -24069,41 +24436,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27722,34 +26927,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
-@@ -24095,15 +25792,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
  
@@ -27772,7 +26969,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24112,8 +25810,13 @@
+@@ -24112,24 +24475,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -27788,7 +26985,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24137,9 +25840,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
+@@ -24137,9 +24498,10 @@
  
    ac_header_preproc=no
  fi
@@ -27801,7 +27018,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24163,25 +25867,19 @@
+@@ -24163,25 +24525,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;}
@@ -27834,7 +27051,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24195,8 +25893,8 @@
+@@ -24195,8 +24551,8 @@
  
  
     # darwin requires a poll emulation library
@@ -27845,7 +27062,7 @@
  if test "${ac_cv_lib_poll_poll+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24209,40 +25907,52 @@
+@@ -24209,56 +24565,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -27881,36 +27098,30 @@
    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); } &&
+-  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_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=$?
+-  ac_status=$?
++  cat conftest.err >&5
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
-@@ -24251,14 +25961,15 @@
+-  (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
  
@@ -27930,7 +27141,7 @@
  if test $ac_cv_lib_poll_poll = yes; then
    LIB_POLL="-lpoll"
  fi
-@@ -24269,18 +25980,19 @@
+@@ -24269,18 +24622,19 @@
  for ac_header in Carbon/Carbon.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -27958,7 +27169,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24291,24 +26003,36 @@
+@@ -24291,41 +24645,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -27976,34 +27187,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
-@@ -24317,15 +26041,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
  
@@ -28026,7 +27229,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24334,8 +26059,13 @@
+@@ -24334,24 +24684,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -28042,7 +27245,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24359,9 +26089,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
+@@ -24359,9 +24707,10 @@
  
    ac_header_preproc=no
  fi
@@ -28055,7 +27278,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24385,25 +26116,19 @@
+@@ -24385,25 +24734,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;}
@@ -28088,7 +27311,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -24418,17 +26143,17 @@
+@@ -24418,17 +24761,17 @@
  
     # CoreAudio framework
     if test "${ac_cv_header_CoreAudio_CoreAudio_h+set}" = set; then
@@ -28112,7 +27335,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24439,24 +26164,36 @@
+@@ -24439,41 +24782,37 @@
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28130,34 +27353,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
-@@ -24465,15 +26202,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
  
@@ -28180,7 +27395,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24482,8 +26220,13 @@
+@@ -24482,24 +24821,22 @@
  /* end confdefs.h.  */
  #include <CoreAudio/CoreAudio.h>
  _ACEOF
@@ -28196,7 +27411,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -24507,9 +26250,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
+@@ -24507,9 +24844,10 @@
  
    ac_header_preproc=no
  fi
@@ -28209,7 +27444,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -24533,25 +26277,18 @@
+@@ -24533,25 +24871,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;}
@@ -28240,7 +27475,7 @@
  
  fi
  if test $ac_cv_header_CoreAudio_CoreAudio_h = yes; then
-@@ -24568,8 +26305,8 @@
+@@ -24568,8 +24899,8 @@
  
  
  
@@ -28251,7 +27486,7 @@
    kde_libs_safe="$LIBS"
    LIBS="$LIBS $X_EXTRA_LIBS -lresolv"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -24595,31 +26332,43 @@
+@@ -24595,31 +24926,27 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28269,33 +27504,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
@@ -28305,7 +27532,7 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RES_INIT 1
-@@ -24630,25 +26379,25 @@
+@@ -24630,25 +24957,25 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -28338,7 +27565,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'
-@@ -24660,9 +26409,6 @@
+@@ -24660,9 +24987,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28348,7 +27575,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24688,24 +26434,36 @@
+@@ -24688,35 +25012,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28366,34 +27593,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
-@@ -24714,9 +26472,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
  
@@ -28406,7 +27625,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -24729,11 +26488,11 @@
+@@ -24729,11 +25049,11 @@
  fi
  
  
@@ -28422,7 +27641,7 @@
  if test "${kde_cv_proto_res_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24754,8 +26513,7 @@
+@@ -24754,8 +25074,7 @@
  if test "x$kde_cv_proto_res_init" = xunknown; then
  
  
@@ -28432,7 +27651,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'
-@@ -24793,24 +26551,36 @@
+@@ -24793,37 +25112,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -28450,34 +27669,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
-@@ -24820,10 +26590,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
  
@@ -28491,7 +27704,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -24836,8 +26607,8 @@
+@@ -24836,8 +25152,8 @@
  
  fi
  
@@ -28502,7 +27715,7 @@
  
  if test "x$kde_cv_func_res_init" = xyes; then
  
-@@ -24864,8 +26635,8 @@
+@@ -24864,8 +25180,8 @@
     LIBSOCKET="$X_EXTRA_LIBS"
  
  
@@ -28513,7 +27726,7 @@
  if test "${ac_cv_lib_ucb_killpg+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24878,40 +26649,52 @@
+@@ -24878,69 +25194,66 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28551,34 +27764,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
-@@ -24920,27 +26703,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
  
@@ -28617,7 +27823,7 @@
  if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -24953,40 +26737,52 @@
+@@ -24953,64 +25266,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -28655,34 +27861,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
-@@ -24995,22 +26791,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
  
@@ -28712,7 +27911,7 @@
  if test "${ac_cv_type_int+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25021,36 +26818,49 @@
+@@ -25021,61 +25331,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -28745,34 +27944,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
-@@ -25059,23 +26869,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
  
@@ -28807,12 +27998,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25085,10 +26895,12 @@
+@@ -25085,10 +25391,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -28821,7 +28011,7 @@
  test_array [0] = 0
  
    ;
-@@ -25096,24 +26908,36 @@
+@@ -25096,27 +25403,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28839,39 +28029,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
-@@ -25126,10 +26950,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
+@@ -25126,10 +25428,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -28880,7 +28063,7 @@
  test_array [0] = 0
  
    ;
-@@ -25137,24 +26963,36 @@
+@@ -25137,56 +25440,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28898,34 +28081,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
-@@ -25163,30 +27001,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
  
@@ -28958,8 +28133,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -28968,7 +28142,7 @@
  test_array [0] = 0
  
    ;
-@@ -25194,24 +27035,36 @@
+@@ -25194,27 +25494,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -28986,39 +28160,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
-@@ -25224,10 +27077,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
+@@ -25224,10 +25519,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -29027,7 +28194,7 @@
  test_array [0] = 0
  
    ;
-@@ -25235,24 +27090,36 @@
+@@ -25235,50 +25531,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29045,34 +28212,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
-@@ -25261,24 +27128,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
  
@@ -29110,12 +28269,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`
-@@ -25289,10 +27159,12 @@
+@@ -25289,10 +25583,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef int ac__type_sizeof_;
-+
++   typedef int ac__type_sizeof_;
  int
  main ()
  {
@@ -29124,7 +28282,7 @@
  test_array [0] = 0
  
    ;
-@@ -25300,24 +27172,36 @@
+@@ -25300,52 +25595,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29142,34 +28300,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
-@@ -25326,26 +27210,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
  
@@ -29184,16 +28334,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
@@ -29206,20 +28356,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25353,8 +27235,10 @@
+@@ -25353,8 +25641,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
-@@ -25363,35 +27247,44 @@
+@@ -25363,35 +25652,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29277,13 +28426,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25402,28 +27295,31 @@
+@@ -25402,28 +25700,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)
@@ -29292,17 +28441,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_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
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_int=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
@@ -29321,7 +28470,7 @@
  if test "${ac_cv_type_short+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25434,36 +27330,49 @@
+@@ -25434,61 +25735,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29354,34 +28503,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
-@@ -25472,23 +27381,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
  
@@ -29416,12 +28557,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25498,10 +27407,12 @@
+@@ -25498,10 +25795,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -29430,7 +28570,7 @@
  test_array [0] = 0
  
    ;
-@@ -25509,24 +27420,36 @@
+@@ -25509,27 +25807,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29448,39 +28588,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
-@@ -25539,10 +27462,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
+@@ -25539,10 +25832,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -29489,7 +28622,7 @@
  test_array [0] = 0
  
    ;
-@@ -25550,24 +27475,36 @@
+@@ -25550,56 +25844,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29507,34 +28640,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
-@@ -25576,30 +27513,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
  
@@ -29567,8 +28692,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -29577,7 +28701,7 @@
  test_array [0] = 0
  
    ;
-@@ -25607,24 +27547,36 @@
+@@ -25607,27 +25898,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29595,39 +28719,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
-@@ -25637,10 +27589,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
+@@ -25637,10 +25923,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -29636,7 +28753,7 @@
  test_array [0] = 0
  
    ;
-@@ -25648,24 +27602,36 @@
+@@ -25648,50 +25935,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29654,34 +28771,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
-@@ -25674,24 +27640,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
  
@@ -29719,12 +28828,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`
-@@ -25702,10 +27671,12 @@
+@@ -25702,10 +25987,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef short ac__type_sizeof_;
-+
++   typedef short ac__type_sizeof_;
  int
  main ()
  {
@@ -29733,7 +28841,7 @@
  test_array [0] = 0
  
    ;
-@@ -25713,24 +27684,36 @@
+@@ -25713,52 +25999,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -29751,34 +28859,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
-@@ -25739,26 +27722,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
  
@@ -29793,16 +28893,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
@@ -29815,20 +28915,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -25766,8 +27747,10 @@
+@@ -25766,8 +26045,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
-@@ -25776,35 +27759,44 @@
+@@ -25776,35 +26056,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -29886,13 +28985,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -25815,28 +27807,31 @@
+@@ -25815,28 +26104,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)
@@ -29901,9 +29000,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_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
@@ -29930,7 +29029,7 @@
  if test "${ac_cv_type_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -25847,36 +27842,49 @@
+@@ -25847,61 +26139,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -29963,34 +29062,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
-@@ -25885,23 +27893,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
  
@@ -30025,12 +29116,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -25911,10 +27919,12 @@
+@@ -25911,10 +26199,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -30039,7 +29129,7 @@
  test_array [0] = 0
  
    ;
-@@ -25922,24 +27932,36 @@
+@@ -25922,27 +26211,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30057,39 +29147,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
-@@ -25952,10 +27974,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
+@@ -25952,10 +26236,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -30098,7 +29181,7 @@
  test_array [0] = 0
  
    ;
-@@ -25963,24 +27987,36 @@
+@@ -25963,56 +26248,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30116,34 +29199,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
-@@ -25989,30 +28025,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
  
@@ -30176,8 +29251,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -30186,7 +29260,7 @@
  test_array [0] = 0
  
    ;
-@@ -26020,24 +28059,36 @@
+@@ -26020,27 +26302,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30204,39 +29278,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
-@@ -26050,10 +28101,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
+@@ -26050,10 +26327,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -30245,7 +29312,7 @@
  test_array [0] = 0
  
    ;
-@@ -26061,24 +28114,36 @@
+@@ -26061,50 +26339,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30263,34 +29330,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
-@@ -26087,24 +28152,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
  
@@ -30328,12 +29387,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`
-@@ -26115,10 +28183,12 @@
+@@ -26115,10 +26391,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef long ac__type_sizeof_;
-+
++   typedef long ac__type_sizeof_;
  int
  main ()
  {
@@ -30342,7 +29400,7 @@
  test_array [0] = 0
  
    ;
-@@ -26126,24 +28196,36 @@
+@@ -26126,52 +26403,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30360,34 +29418,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
-@@ -26152,26 +28234,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
  
@@ -30402,16 +29452,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
@@ -30424,20 +29474,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26179,8 +28259,10 @@
+@@ -26179,8 +26449,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
-@@ -26189,35 +28271,44 @@
+@@ -26189,35 +26460,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -30495,13 +29544,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26228,28 +28319,31 @@
+@@ -26228,28 +26508,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)
@@ -30510,17 +29559,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_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
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_long=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
@@ -30539,7 +29588,7 @@
  if test "${ac_cv_type_char_p+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26260,36 +28354,49 @@
+@@ -26260,61 +26543,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -30572,34 +29621,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
-@@ -26298,23 +28405,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
  
@@ -30634,12 +29675,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26324,10 +28431,12 @@
+@@ -26324,10 +26603,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -30648,7 +29688,7 @@
  test_array [0] = 0
  
    ;
-@@ -26335,24 +28444,36 @@
+@@ -26335,27 +26615,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30666,39 +29706,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
-@@ -26365,10 +28486,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
+@@ -26365,10 +26640,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -30707,7 +29740,7 @@
  test_array [0] = 0
  
    ;
-@@ -26376,24 +28499,36 @@
+@@ -26376,56 +26652,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30725,34 +29758,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
-@@ -26402,30 +28537,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
  
@@ -30785,8 +29810,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -30795,7 +29819,7 @@
  test_array [0] = 0
  
    ;
-@@ -26433,24 +28571,36 @@
+@@ -26433,27 +26706,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30813,39 +29837,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
-@@ -26463,10 +28613,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
+@@ -26463,10 +26731,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -30854,7 +29871,7 @@
  test_array [0] = 0
  
    ;
-@@ -26474,24 +28626,36 @@
+@@ -26474,50 +26743,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30872,34 +29889,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
-@@ -26500,24 +28664,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
  
@@ -30937,12 +29946,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`
-@@ -26528,10 +28695,12 @@
+@@ -26528,10 +26795,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
-+	        typedef char * ac__type_sizeof_;
-+
++   typedef char * ac__type_sizeof_;
  int
  main ()
  {
@@ -30951,7 +29959,7 @@
  test_array [0] = 0
  
    ;
-@@ -26539,24 +28708,36 @@
+@@ -26539,52 +26807,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -30969,34 +29977,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
-@@ -26565,25 +28746,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_hi=$ac_mid
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -31008,46 +30008,44 @@
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
  case $ac_lo in
--?*) ac_cv_sizeof_char_p=$ac_lo;;
+ ?*) ac_cv_sizeof_char_p=$ac_lo;;
 -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (char *), 77
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; } ;;
--esac
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-+?*) ac_cv_sizeof_char_p=$ac_lo;;
 +'') 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 run test program while cross compiling
+-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 1); exit 1; }; } ;;
 +   { (exit 77); exit 77; }; }
-+	       else
-+	         ac_cv_sizeof_char_p=0
-+	       fi ;;
-+esac
++   else
++     ac_cv_sizeof_char_p=0
++   fi ;;
+ esac
  else
+-  if test "$cross_compiling" = yes; then
+-  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&5
+-echo "$as_me: error: cannot run test program while cross compiling
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }
+-else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -26592,8 +28771,10 @@
+ _ACEOF
+@@ -26592,8 +26853,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
-@@ -26602,35 +28783,44 @@
+@@ -26602,35 +26864,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31105,13 +30103,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -26641,30 +28831,33 @@
+@@ -26641,30 +26912,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 *)
@@ -31120,9 +30118,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_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
@@ -31151,7 +30149,7 @@
  if test "${ac_cv_lib_dl_dlopen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26677,40 +28870,52 @@
+@@ -26677,56 +26951,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31189,34 +30187,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
-@@ -26719,14 +28924,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
  
@@ -31236,7 +30227,7 @@
  if test $ac_cv_lib_dl_dlopen = yes; then
  
  LIBDL="-ldl"
-@@ -26735,8 +28941,8 @@
+@@ -26735,8 +27006,8 @@
  fi
  
  
@@ -31247,7 +30238,7 @@
  if test "${ac_cv_lib_dld_shl_unload+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26749,40 +28955,52 @@
+@@ -26749,56 +27020,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -31285,34 +30276,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
-@@ -26791,14 +29009,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
  
@@ -31332,7 +30316,7 @@
  if test $ac_cv_lib_dld_shl_unload = yes; then
  
  LIBDL="-ldld"
-@@ -26812,8 +29031,8 @@
+@@ -26812,8 +27080,8 @@
  
  
  
@@ -31343,7 +30327,7 @@
  if test "${ac_cv_type_size_t+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -26824,36 +29043,49 @@
+@@ -26824,61 +27092,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31376,34 +30360,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
-@@ -26862,23 +29094,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
  
@@ -31438,12 +30414,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -26888,10 +29120,12 @@
+@@ -26888,10 +27152,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 ()
  {
@@ -31452,7 +30427,7 @@
  test_array [0] = 0
  
    ;
-@@ -26899,24 +29133,36 @@
+@@ -26899,27 +27164,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31470,39 +30445,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
-@@ -26929,10 +29175,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
+@@ -26929,10 +27189,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 ()
  {
@@ -31511,7 +30479,7 @@
  test_array [0] = 0
  
    ;
-@@ -26940,24 +29188,36 @@
+@@ -26940,56 +27201,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31529,34 +30497,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
-@@ -26966,30 +29226,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
  
@@ -31589,8 +30549,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 ()
  {
@@ -31599,7 +30558,7 @@
  test_array [0] = 0
  
    ;
-@@ -26997,24 +29260,36 @@
+@@ -26997,27 +27255,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31617,39 +30576,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
-@@ -27027,10 +29302,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
+@@ -27027,10 +27280,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 ()
  {
@@ -31658,7 +30610,7 @@
  test_array [0] = 0
  
    ;
-@@ -27038,24 +29315,36 @@
+@@ -27038,50 +27292,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31676,34 +30628,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
-@@ -27064,24 +29353,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
  
@@ -31741,12 +30685,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`
-@@ -27092,10 +29384,12 @@
+@@ -27092,10 +27344,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 ()
  {
@@ -31755,7 +30698,7 @@
  test_array [0] = 0
  
    ;
-@@ -27103,24 +29397,36 @@
+@@ -27103,52 +27356,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -31773,34 +30716,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
-@@ -27129,26 +29435,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
  
@@ -31815,16 +30750,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
@@ -31837,20 +30772,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27156,8 +29460,10 @@
+@@ -27156,8 +27402,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
-@@ -27166,35 +29472,44 @@
+@@ -27166,35 +27413,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -31908,13 +30842,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27205,29 +29520,32 @@
+@@ -27205,29 +27461,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)
@@ -31923,17 +30857,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_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
  rm -f conftest.val
 -else
 -  ac_cv_sizeof_size_t=0
- fi
 -fi
+ fi
 -echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_size_t" >&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
@@ -31953,7 +30887,7 @@
  if test "${ac_cv_type_unsigned_long+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27238,36 +29556,49 @@
+@@ -27238,61 +27497,57 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -31986,34 +30920,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
-@@ -27276,23 +29607,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
  
@@ -32048,12 +30974,11 @@
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
  cat >conftest.$ac_ext <<_ACEOF
-@@ -27302,10 +29633,12 @@
+@@ -27302,10 +27557,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 ()
  {
@@ -32062,7 +30987,7 @@
  test_array [0] = 0
  
    ;
-@@ -27313,24 +29646,36 @@
+@@ -27313,27 +27569,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32080,39 +31005,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
-@@ -27343,10 +29688,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
+@@ -27343,10 +27594,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 ()
  {
@@ -32121,7 +31039,7 @@
  test_array [0] = 0
  
    ;
-@@ -27354,24 +29701,36 @@
+@@ -27354,56 +27606,53 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32139,34 +31057,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
-@@ -27380,30 +29739,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
  
@@ -32199,8 +31109,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 ()
  {
@@ -32209,7 +31118,7 @@
  test_array [0] = 0
  
    ;
-@@ -27411,24 +29773,36 @@
+@@ -27411,27 +27660,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32227,39 +31136,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
-@@ -27441,10 +29815,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
+@@ -27441,10 +27685,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 ()
  {
@@ -32268,7 +31170,7 @@
  test_array [0] = 0
  
    ;
-@@ -27452,24 +29828,36 @@
+@@ -27452,50 +27697,48 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32286,34 +31188,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
-@@ -27478,24 +29866,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
  
@@ -32351,12 +31245,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`
-@@ -27506,10 +29897,12 @@
+@@ -27506,10 +27749,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 ()
  {
@@ -32365,7 +31258,7 @@
  test_array [0] = 0
  
    ;
-@@ -27517,24 +29910,36 @@
+@@ -27517,52 +27761,45 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32383,34 +31276,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
-@@ -27543,26 +29948,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
  
@@ -32425,16 +31310,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
@@ -32447,20 +31332,19 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27570,8 +29973,10 @@
+@@ -27570,8 +27807,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
-@@ -27580,35 +29985,44 @@
+@@ -27580,35 +27818,44 @@
  
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
@@ -32518,13 +31402,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -27619,30 +30033,33 @@
+@@ -27619,30 +27866,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)
@@ -32533,9 +31417,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_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
@@ -32564,7 +31448,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27663,36 +30080,48 @@
+@@ -27663,36 +27913,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32582,35 +31466,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
@@ -32625,17 +31500,17 @@
        { { 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!
-@@ -27704,18 +30133,18 @@
+@@ -27704,18 +27949,18 @@
     { (exit 1); exit 1; }; }
  
  fi
 -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
++
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  
+ 
 -  echo "$as_me:$LINENO: checking for PIE support" >&5
 -echo $ECHO_N "checking for PIE support... $ECHO_C" >&6
-+
 +  { echo "$as_me:$LINENO: checking for PIE support" >&5
 +echo $ECHO_N "checking for PIE support... $ECHO_C" >&6; }
  if test "${kde_cv_val_pie_support+set}" = set; then
@@ -32649,7 +31524,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'
-@@ -27745,24 +30174,36 @@
+@@ -27745,35 +27990,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -32667,34 +31542,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
-@@ -27771,9 +30212,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
  
@@ -32707,7 +31575,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
      CXXFLAGS=$safe_CXXFLAGS
-@@ -27786,26 +30228,26 @@
+@@ -27786,26 +28028,26 @@
  
  
  fi
@@ -32744,7 +31612,7 @@
  
    KDE_USE_FPIE=""
    KDE_USE_PIE=""
-@@ -27824,18 +30266,19 @@
+@@ -27824,18 +28066,19 @@
  for ac_header in crt_externs.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -32772,7 +31640,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27846,24 +30289,36 @@
+@@ -27846,41 +28089,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -32790,34 +31658,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
-@@ -27872,15 +30327,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
  
@@ -32840,7 +31700,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -27889,8 +30345,13 @@
+@@ -27889,24 +28128,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -32856,7 +31716,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -27914,9 +30375,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
+@@ -27914,9 +28151,10 @@
  
    ac_header_preproc=no
  fi
@@ -32869,7 +31749,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -27940,25 +30402,19 @@
+@@ -27940,25 +28178,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;}
@@ -32902,7 +31782,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -27970,8 +30426,8 @@
+@@ -27970,8 +28202,8 @@
  
  done
  
@@ -32913,7 +31793,7 @@
  if test "${ac_cv_func__NSGetEnviron+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -27998,53 +30454,59 @@
+@@ -27998,68 +28230,59 @@
  
  #undef _NSGetEnviron
  
@@ -32965,34 +31845,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
-@@ -28053,13 +30515,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
  
@@ -33011,7 +31884,7 @@
  if test $ac_cv_func__NSGetEnviron = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -28080,9 +30543,9 @@
+@@ -28080,9 +28303,9 @@
  for ac_func in vsnprintf snprintf
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -33024,7 +31897,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -28108,53 +30571,59 @@
+@@ -28108,68 +28331,60 @@
  
  #undef $ac_func
  
@@ -33076,34 +31949,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
-@@ -28163,13 +30632,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
  
@@ -33123,7 +31989,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -28186,32 +30657,32 @@
+@@ -28186,32 +28401,32 @@
  
  
  
@@ -33168,7 +32034,7 @@
  
  # used to disable x11-specific stuff on special platforms
  
-@@ -28227,8 +30698,8 @@
+@@ -28227,8 +28442,8 @@
  
  if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
  
@@ -33179,7 +32045,7 @@
  
  if test "${kde_cv_have_x+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -28265,8 +30736,13 @@
+@@ -28265,24 +28480,22 @@
  /* end confdefs.h.  */
  #include <$x_direct_test_include>
  _ACEOF
@@ -33195,7 +32061,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -28333,6 +30809,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
+@@ -28333,6 +28546,7 @@
      fi
    done
  fi
@@ -33203,7 +32089,7 @@
  rm -f conftest.err conftest.$ac_ext
  fi # $ac_x_includes = NO
  
-@@ -28362,24 +30839,36 @@
+@@ -28362,27 +28576,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33221,34 +32107,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
-@@ -28390,7 +30879,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=
+@@ -28390,7 +28600,7 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -33257,7 +32138,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}/` \
-@@ -28438,7 +30927,8 @@
+@@ -28438,7 +28648,8 @@
    done
  done
  fi
@@ -33267,7 +32148,7 @@
        conftest$ac_exeext conftest.$ac_ext
  fi # $ac_x_libraries = NO
  
-@@ -28448,21 +30938,26 @@
+@@ -28448,21 +28659,26 @@
  *-*-solaris*)
    ;;
  *)
@@ -33302,7 +32183,7 @@
  	ac_im_usrlibdir=$ac_im_libdir; break
        fi
      done
-@@ -28470,7 +30965,7 @@
+@@ -28470,7 +28686,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
@@ -33311,7 +32192,7 @@
  	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
      esac
      case $ac_im_usrlibdir in
-@@ -28479,7 +30974,7 @@
+@@ -28479,7 +28695,7 @@
      esac
    fi
    cd ..
@@ -33320,7 +32201,7 @@
  fi
  
    if test -z "$ac_x_includes"; then
-@@ -28523,12 +31018,12 @@
+@@ -28523,12 +28739,12 @@
  eval "$kde_cv_have_x"
  
  if test "$have_x" != yes; then
@@ -33337,7 +32218,7 @@
  fi
  
  if test -z "$kde_x_includes" || test "x$kde_x_includes" = xNONE; then
-@@ -28556,8 +31051,8 @@
+@@ -28556,8 +28772,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.
@@ -33348,7 +32229,7 @@
  if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28570,40 +31065,52 @@
+@@ -28570,56 +28786,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33386,34 +32267,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
-@@ -28612,14 +31119,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
  
@@ -33433,7 +32307,7 @@
  if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
    LIBSM="-lSM -lICE"
  fi
-@@ -28628,8 +31136,8 @@
+@@ -28628,8 +28841,8 @@
  
  LIB_X11='-lX11 $(LIBSOCKET)'
  
@@ -33444,7 +32318,7 @@
  if test "${kde_cv_have_libXext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28663,24 +31171,36 @@
+@@ -28663,36 +28876,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33462,34 +32336,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
-@@ -28689,10 +31209,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
  
@@ -33503,7 +32370,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
  LDFLAGS=$kde_ldflags_safe
-@@ -28701,8 +31222,8 @@
+@@ -28701,8 +28911,8 @@
  fi
  
  
@@ -33514,7 +32381,7 @@
  
  if test "$kde_cv_have_libXext" = "no"; then
    { { echo "$as_me:$LINENO: error: We need a working libXext to proceed. Since configure
-@@ -28848,8 +31369,8 @@
+@@ -28848,8 +29058,8 @@
      else
        PTHREAD_LIBS_save="$PTHREAD_LIBS"
        PTHREAD_LIBS=`echo "$PTHREAD_LIBS_save" | sed -e 's,^-l,,g'`
@@ -33525,7 +32392,7 @@
  
       kde_save_LDFLAGS="$LDFLAGS"
            kde_save_LIBS="$LIBS"
-@@ -28860,9 +31381,9 @@
+@@ -28860,9 +29070,9 @@
  	;;
       esac
       as_ac_Lib=`echo "ac_cv_lib_$PTHREAD_LIBS''_pthread_create" | $as_tr_sh`
@@ -33538,7 +32405,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -28874,40 +31395,52 @@
+@@ -28874,56 +29084,54 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33576,34 +32443,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
-@@ -28916,14 +31449,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
  
@@ -33624,7 +32484,7 @@
  if test `eval echo '${'$as_ac_Lib'}'` = yes; then
    LIBPTHREAD="$PTHREAD_LIBS_save"
  fi
-@@ -28936,8 +31471,8 @@
+@@ -28936,8 +29144,8 @@
    fi
  
      if test -z "$LIBPTHREAD"; then
@@ -33635,7 +32495,7 @@
  if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -28950,40 +31485,52 @@
+@@ -28950,56 +29158,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -33673,34 +32533,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
-@@ -28992,14 +31539,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
  
@@ -33720,7 +32573,7 @@
  if test $ac_cv_lib_pthread_pthread_create = yes; then
    LIBPTHREAD="-lpthread"
  fi
-@@ -29007,8 +31555,8 @@
+@@ -29007,8 +29212,8 @@
    fi
  
      if test -z "$LIBPTHREAD" ; then
@@ -33731,7 +32584,7 @@
      kde_safe_libs=$LIBS
      LIBS="$LIBS -lpthread"
      cat >conftest.$ac_ext <<_ACEOF
-@@ -29027,40 +31575,53 @@
+@@ -29027,40 +29232,37 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33749,33 +32602,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
@@ -33798,7 +32643,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS=$kde_safe_libs
    fi
-@@ -29075,16 +31636,15 @@
+@@ -29075,16 +29277,15 @@
        USE_THREADS=""
        if test -z "$LIBPTHREAD"; then
  
@@ -33819,7 +32664,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'
-@@ -29111,24 +31671,36 @@
+@@ -29111,34 +29312,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33837,34 +32682,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
-@@ -29137,8 +31709,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
  
@@ -33876,7 +32714,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29151,13 +31725,13 @@
+@@ -29151,13 +29350,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33894,7 +32732,7 @@
   :
  
  fi
-@@ -29169,16 +31743,15 @@
+@@ -29169,16 +29368,15 @@
      case $host_os in
   	solaris*)
  
@@ -33915,7 +32753,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'
-@@ -29205,24 +31778,36 @@
+@@ -29205,34 +29403,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -33933,34 +32771,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
-@@ -29231,8 +31816,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
  
@@ -33972,7 +32803,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -29245,13 +31832,13 @@
+@@ -29245,13 +29441,13 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -33990,7 +32821,7 @@
   :
  
  fi
-@@ -29278,17 +31865,17 @@
+@@ -29278,17 +29474,17 @@
  
  
  
@@ -34014,7 +32845,7 @@
  kde_extra_includes=
  if test -n "$kde_use_extra_includes" && \
     test "$kde_use_extra_includes" != "NONE"; then
-@@ -29306,21 +31893,21 @@
+@@ -29306,21 +29502,21 @@
  fi
  
  
@@ -34044,7 +32875,7 @@
  if test -n "$kde_use_extra_libs" && \
     test "$kde_use_extra_libs" != "NONE"; then
  
-@@ -29339,14 +31926,14 @@
+@@ -29339,14 +29535,14 @@
  
  
  
@@ -34063,7 +32894,7 @@
  if test "${ac_cv_lib_z+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29380,24 +31967,36 @@
+@@ -29380,35 +29576,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34081,34 +32912,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
-@@ -29406,9 +32005,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
  
@@ -34121,7 +32945,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29421,8 +32021,8 @@
+@@ -29421,8 +29614,8 @@
  _ACEOF
  
    LIBZ="$ac_cv_lib_z"
@@ -34132,7 +32956,7 @@
  else
    { { echo "$as_me:$LINENO: error: not found.
            Possibly configure picks up an outdated version
-@@ -29442,8 +32042,8 @@
+@@ -29442,8 +29635,8 @@
  
  
  
@@ -34143,7 +32967,7 @@
  if test "${ac_cv_lib_png+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29479,24 +32079,36 @@
+@@ -29479,36 +29672,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34161,34 +32985,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
-@@ -29505,10 +32117,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
  
@@ -34202,7 +33019,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$kde_save_LIBS"
  CFLAGS="$kde_save_CFLAGS"
-@@ -29522,19 +32135,19 @@
+@@ -29522,19 +29712,19 @@
  
    LIBPNG="$ac_cv_lib_png"
  
@@ -34228,7 +33045,7 @@
  if test "${ac_cv_lib_jpeg_6b+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29567,24 +32180,36 @@
+@@ -29567,35 +29757,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34246,34 +33063,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
-@@ -29593,9 +32218,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
  
@@ -34286,7 +33096,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29605,14 +32231,14 @@
+@@ -29605,14 +29792,14 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_6b`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_6b"
@@ -34307,7 +33117,7 @@
  if test "${ac_cv_lib_jpeg_normal+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -29645,24 +32271,36 @@
+@@ -29645,35 +29832,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34325,34 +33135,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
-@@ -29671,9 +32309,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
  
@@ -34365,7 +33168,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CFLAGS="$ac_save_CFLAGS"
-@@ -29683,11 +32322,11 @@
+@@ -29683,11 +29867,11 @@
  
  if eval "test ! \"`echo $ac_cv_lib_jpeg_normal`\" = no"; then
    LIBJPEG="$ac_cv_lib_jpeg_normal"
@@ -34381,16 +33184,16 @@
  
         LIBJPEG=
  
-@@ -29707,7 +32346,7 @@
+@@ -29707,7 +29891,7 @@
  do
    for j in jpeglib.h;
    do
 -    echo "configure: 29710: $i/$j" >&5
-+    echo "configure: 32349: $i/$j" >&5
++    echo "configure: 29894: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29754,14 +32393,14 @@
+@@ -29754,14 +29938,14 @@
  
  
  
@@ -34408,7 +33211,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -29804,8 +32443,8 @@
+@@ -29804,8 +29988,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34419,7 +33222,7 @@
  
  		    { { echo "$as_me:$LINENO: error: No Perl found in your $PATH.
  We need perl to generate some code." >&5
-@@ -29814,8 +32453,8 @@
+@@ -29814,8 +29998,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34430,7 +33233,7 @@
        PERL=$kde_cv_path
  
     fi
-@@ -29829,10 +32468,9 @@
+@@ -29829,10 +30013,9 @@
  
  
  
@@ -34443,7 +33246,7 @@
  else
  
      if test $kde_qtver = 3; then
-@@ -29842,7 +32480,8 @@
+@@ -29842,7 +30025,8 @@
      fi
  
  
@@ -34453,7 +33256,7 @@
  
  USING_QT_MT=""
  
-@@ -29862,13 +32501,13 @@
+@@ -29862,13 +30046,13 @@
    else
      kde_check_threading_default=yes
    fi
@@ -34471,7 +33274,7 @@
    if test "x$kde_use_threading" = "xyes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -29940,8 +32579,8 @@
+@@ -29940,8 +30124,8 @@
    LIBQT="$LIBQT $LIBDL"
  fi
  
@@ -34482,7 +33285,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"
-@@ -29950,34 +32589,34 @@
+@@ -29950,34 +30134,34 @@
  qt_libraries=""
  qt_includes=""
  
@@ -34497,14 +33300,14 @@
  
 -fi;
 +fi
-+
  
  
 -# Check whether --with-qt-includes or --without-qt-includes was given.
-+# Check whether --with-qt-includes was given.
- if test "${with_qt_includes+set}" = set; then
+-if test "${with_qt_includes+set}" = set; then
 -  withval="$with_qt_includes"
--
+ 
++# Check whether --with-qt-includes was given.
++if test "${with_qt_includes+set}" = set; then
 +  withval=$with_qt_includes;
         ac_qt_includes="$withval"
  
@@ -34529,16 +33332,16 @@
  
  if test "${ac_cv_have_qt+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -30005,7 +32644,7 @@
+@@ -30005,7 +30189,7 @@
  do
    for j in $kde_qt_header;
    do
 -    echo "configure: 30008: $i/$j" >&5
-+    echo "configure: 32647: $i/$j" >&5
++    echo "configure: 30192: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30042,8 +32681,7 @@
+@@ -30042,8 +30226,7 @@
  ac_qt_libraries="$qt_libdir"
  
  
@@ -34548,7 +33351,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'
-@@ -30180,13 +32818,13 @@
+@@ -30180,13 +30363,13 @@
  eval "$ac_cv_have_qt"
  
  if test "$have_qt" != yes; then
@@ -34566,7 +33369,7 @@
  
    qt_libraries="$ac_qt_libraries"
    qt_includes="$ac_qt_includes"
-@@ -30195,15 +32833,14 @@
+@@ -30195,15 +30378,14 @@
  if test ! "$kde_qt_libs_given" = "yes" && test ! "$kde_qtver" = 3; then
  
  
@@ -34585,7 +33388,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'
-@@ -30324,12 +32961,12 @@
+@@ -30324,12 +30506,12 @@
  
  
  if test "$kde_cv_qt_direct" = "yes"; then
@@ -34602,7 +33405,7 @@
  
  fi
  
-@@ -30367,14 +33004,14 @@
+@@ -30367,14 +30549,14 @@
     fi
  
  
@@ -34620,7 +33423,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30417,8 +33054,8 @@
+@@ -30417,8 +30599,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34631,7 +33434,7 @@
  
      { { echo "$as_me:$LINENO: error: No Qt meta object compiler (moc) found!
  Please check whether you installed Qt correctly.
-@@ -30439,22 +33076,22 @@
+@@ -30439,22 +30621,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -34659,7 +33462,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30497,12 +33134,12 @@
+@@ -30497,12 +30679,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -34676,7 +33479,7 @@
        UIC_PATH=$kde_cv_path
  
     fi
-@@ -30532,10 +33169,10 @@
+@@ -30532,10 +30714,10 @@
  
         if test $kde_qtver = 3; then
  
@@ -34690,7 +33493,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30558,22 +33195,22 @@
+@@ -30558,22 +30740,22 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34720,7 +33523,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -30596,13 +33233,13 @@
+@@ -30596,13 +30778,13 @@
  
  
      if eval "test \"`echo '$kde_cv_prog_uic_'$kde_cache`\" = yes"; then
@@ -34738,7 +33541,7 @@
          :
          ac_uic_supports_nounload=no
      fi
-@@ -30633,15 +33270,14 @@
+@@ -30633,15 +30815,14 @@
  
  
  if test -n "$LIBJPEG"; then
@@ -34757,7 +33560,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'
-@@ -30674,24 +33310,36 @@
+@@ -30674,35 +30855,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -34775,34 +33578,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
-@@ -30700,9 +33348,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
  
@@ -34815,7 +33611,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS="$ac_save_LIBS"
  CXXFLAGS="$ac_save_CXXFLAGS"
-@@ -30718,12 +33367,12 @@
+@@ -30718,12 +30896,12 @@
  
  
  if eval "test ! \"`echo $kde_cv_qt_jpeg`\" = no"; then
@@ -34832,7 +33628,7 @@
    LIBJPEG_QT=
  fi
  
-@@ -30754,15 +33403,15 @@
+@@ -30754,15 +30932,15 @@
  
  
  
@@ -34854,7 +33650,7 @@
  
  if test -z "$KDE_RPATH" && test "$USE_RPATH" = "yes"; then
  
-@@ -30786,11 +33435,11 @@
+@@ -30786,11 +30964,11 @@
  
  
  
@@ -34870,34 +33666,34 @@
  
  if test "${prefix}" != NONE; then
    kde_includes=${includedir}
-@@ -30842,7 +33491,7 @@
+@@ -30842,7 +31020,7 @@
  do
    for j in $kde_check_header;
    do
 -    echo "configure: 30845: $i/$j" >&5
-+    echo "configure: 33494: $i/$j" >&5
++    echo "configure: 31023: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30872,7 +33521,7 @@
+@@ -30872,7 +31050,7 @@
  do
    for j in $kde_check_lib;
    do
 -    echo "configure: 30875: $i/$j" >&5
-+    echo "configure: 33524: $i/$j" >&5
++    echo "configure: 31053: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30890,7 +33539,7 @@
+@@ -30890,7 +31068,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
 -    echo "configure: 30893: $i/$j" >&5
-+    echo "configure: 33542: $i/$j" >&5
++    echo "configure: 31071: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
-@@ -30949,12 +33598,12 @@
+@@ -30949,12 +31127,12 @@
   fi
   if test "$exec_prefix" = NONE; then
    ac_kde_exec_prefix="$ac_kde_prefix"
@@ -34914,7 +33710,7 @@
   fi
  
   kde_libraries="${libdir}"
-@@ -30963,8 +33612,8 @@
+@@ -30963,8 +31141,8 @@
  else
    ac_cv_have_kde="have_kde=yes \
      ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
@@ -34925,7 +33721,7 @@
  
    kde_libraries="$ac_kde_libraries"
    kde_includes="$ac_kde_includes"
-@@ -31002,8 +33651,8 @@
+@@ -31002,8 +31180,8 @@
  
  if test x$ac_uic_supports_libpath = xyes; then
  
@@ -34936,7 +33732,7 @@
  if test "${kde_cv_uic_plugins+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -31046,8 +33695,8 @@
+@@ -31046,8 +31224,8 @@
  fi
  
  
@@ -34947,7 +33743,7 @@
  if test "$kde_cv_uic_plugins" != yes; then
  	{ { echo "$as_me:$LINENO: error:
  you need to install kdelibs first.
-@@ -31079,10 +33728,9 @@
+@@ -31079,10 +31257,9 @@
  
  
  
@@ -34960,7 +33756,7 @@
    if test "$enableval" = "no";
      then ac_use_path_checking="default"
      else ac_use_path_checking=""
-@@ -31096,13 +33744,14 @@
+@@ -31096,13 +31273,14 @@
    fi
  
  
@@ -34978,7 +33774,7 @@
  kde_result=""
  kde_cached_paths=yes
  if test "${kde_cv_all_paths+set}" = set; then
-@@ -31213,15 +33862,14 @@
+@@ -31213,15 +31391,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -34999,7 +33795,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'
-@@ -31273,8 +33921,8 @@
+@@ -31273,8 +31450,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35010,7 +33806,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.
-@@ -31313,8 +33961,8 @@
+@@ -31313,8 +31490,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35021,7 +33817,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
-@@ -31322,8 +33970,8 @@
+@@ -31322,8 +31499,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35032,7 +33828,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
-@@ -31516,15 +34164,14 @@
+@@ -31516,15 +31693,14 @@
  else
  
    if test $kde_qtver = 1; then
@@ -35053,7 +33849,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'
-@@ -31576,8 +34223,8 @@
+@@ -31576,8 +31752,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -35064,7 +33860,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.
-@@ -31616,8 +34263,8 @@
+@@ -31616,8 +31792,8 @@
       KDE_TEST_RPATH="$KDE_TEST_RPATH $KDE_EXTRA_RPATH"
    fi
  
@@ -35075,7 +33871,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
-@@ -31625,8 +34272,8 @@
+@@ -31625,8 +31801,8 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest; then
@@ -35086,7 +33882,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
-@@ -31718,22 +34365,22 @@
+@@ -31718,22 +31894,22 @@
     { (exit 1); exit 1; }; }
  else
    rm -f conftest*
@@ -35115,7 +33911,7 @@
  
  
  if test "$build_arts" '!=' "no"; then
-@@ -31766,14 +34413,14 @@
+@@ -31766,14 +31942,14 @@
  
          kde_default_bindirs="$exec_prefix/bin $prefix/bin $kde_libs_prefix/bin $kde_default_bindirs"
  
@@ -35133,7 +33929,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31816,8 +34463,8 @@
+@@ -31816,8 +31992,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35144,7 +33940,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl was not found!
  Please check whether you installed KDE correctly.
-@@ -31828,21 +34475,21 @@
+@@ -31828,21 +32004,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35171,7 +33967,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31885,8 +34532,8 @@
+@@ -31885,8 +32061,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35182,7 +33978,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidl2cpp was not found!
  Please check whether you installed KDE correctly.
-@@ -31897,22 +34544,22 @@
+@@ -31897,22 +32073,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35210,7 +34006,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -31955,8 +34602,8 @@
+@@ -31955,8 +32131,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35221,7 +34017,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program mcopidl was not found!
  Please check whether you installed aRts correctly or use
-@@ -31969,21 +34616,21 @@
+@@ -31969,21 +32145,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35248,7 +34044,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32026,8 +34673,8 @@
+@@ -32026,8 +32202,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35259,7 +34055,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program artsc-config was not found!
  Please check whether you installed aRts correctly or use
-@@ -32040,22 +34687,22 @@
+@@ -32040,22 +32216,22 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35287,7 +34083,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32098,12 +34745,12 @@
+@@ -32098,12 +32274,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35304,7 +34100,7 @@
        MEINPROC=$kde_cv_path
  
     fi
-@@ -32132,14 +34779,14 @@
+@@ -32132,14 +32308,14 @@
  
          if test -n "$kde32ornewer"; then
  
@@ -35322,7 +34118,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32182,8 +34829,8 @@
+@@ -32182,8 +32358,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35333,7 +34129,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program kconfig_compiler was not found!
  Please check whether you installed KDE correctly.
-@@ -32194,21 +34841,21 @@
+@@ -32194,21 +32370,21 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35360,7 +34156,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32251,8 +34898,8 @@
+@@ -32251,8 +32427,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35371,7 +34167,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program dcopidlng was not found!
  Please check whether you installed KDE correctly.
-@@ -32263,8 +34910,8 @@
+@@ -32263,8 +32439,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35382,7 +34178,7 @@
        DCOPIDLNG=$kde_cv_path
  
     fi
-@@ -32272,14 +34919,14 @@
+@@ -32272,14 +32448,14 @@
          fi
          if test -n "$kde33ornewer"; then
  
@@ -35400,7 +34196,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32322,8 +34969,8 @@
+@@ -32322,8 +32498,8 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35411,7 +34207,7 @@
  
      { { echo "$as_me:$LINENO: error: The important program makekdewidgets was not found!
  Please check whether you installed KDE correctly.
-@@ -32334,8 +34981,8 @@
+@@ -32334,8 +32510,8 @@
     { (exit 1); exit 1; }; }
  
     else
@@ -35422,7 +34218,7 @@
        MAKEKDEWIDGETS=$kde_cv_path
  
     fi
-@@ -32343,14 +34990,14 @@
+@@ -32343,14 +32519,14 @@
  
          fi
  
@@ -35440,7 +34236,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32393,12 +35040,12 @@
+@@ -32393,12 +32569,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35457,16 +34253,16 @@
        XMLLINT=$kde_cv_path
  
     fi
-@@ -32413,7 +35060,7 @@
+@@ -32413,7 +32589,7 @@
  do
    for j in apps/ksgmltools2/customization/kde-chunk.xsl;
    do
 -    echo "configure: 32416: $i/$j" >&5
-+    echo "configure: 35063: $i/$j" >&5
++    echo "configure: 32592: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32574,13 +35221,12 @@
+@@ -32574,13 +32750,12 @@
  
  
  
@@ -35483,7 +34279,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'
-@@ -32601,13 +35247,13 @@
+@@ -32601,13 +32776,13 @@
  if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
    $EGREP "GCC visibility push" >/dev/null 2>&1; then
  
@@ -35501,7 +34297,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
-@@ -32627,16 +35273,15 @@
+@@ -32627,16 +32802,15 @@
  
      kde_have_gcc_visibility=no
  
@@ -35522,7 +34318,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'
-@@ -32663,24 +35308,36 @@
+@@ -32663,34 +32837,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35540,34 +34336,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
-@@ -32689,8 +35346,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
  
@@ -35579,7 +34368,7 @@
        conftest$ac_exeext conftest.$ac_ext
    CXXFLAGS="$save_CXXFLAGS"
    ac_ext=c
-@@ -32703,28 +35362,27 @@
+@@ -32703,28 +32875,27 @@
  fi
  
  if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
@@ -35600,10 +34389,10 @@
    kde_have_gcc_visibility=no
 -fi;
 +fi
++
  
 -      echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
 -echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6
-+
 +      { echo "$as_me:$LINENO: checking if Qt is patched for -fvisibility" >&5
 +echo $ECHO_N "checking if Qt is patched for -fvisibility... $ECHO_C" >&6; }
  if test "${kde_cv_val_qt_gcc_visibility_patched+set}" = set; then
@@ -35617,7 +34406,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'
-@@ -32759,24 +35417,36 @@
+@@ -32759,35 +32930,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -35635,34 +34424,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
-@@ -32785,9 +35455,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
  
@@ -35675,7 +34456,7 @@
  
            CXXFLAGS=$safe_CXXFLAGS
            ac_ext=c
-@@ -32799,21 +35470,20 @@
+@@ -32799,21 +32966,20 @@
  
  
  fi
@@ -35702,7 +34483,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'
-@@ -32853,24 +35523,36 @@
+@@ -32853,35 +33019,32 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -35720,34 +34501,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
-@@ -32879,9 +35561,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
  
@@ -35760,7 +34534,7 @@
        conftest$ac_exeext conftest.$ac_ext
  
          CXXFLAGS=$safe_CXXFLAGS
-@@ -32895,8 +35578,8 @@
+@@ -32895,8 +33058,8 @@
  
  
  fi
@@ -35771,7 +34545,7 @@
  
      if test x$kde_cv_val_gcc_visibility_bug = xno; then
        CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
-@@ -32912,8 +35595,8 @@
+@@ -32912,8 +33075,8 @@
        fi
  
  else
@@ -35782,7 +34556,7 @@
   :
  
  fi
-@@ -32921,8 +35604,8 @@
+@@ -32921,8 +33084,8 @@
    fi
  
  
@@ -35793,16 +34567,16 @@
  kde_qtdir=
  if test "${with_qt_dir+set}" = set; then
    kde_qtdir="$with_qt_dir"
-@@ -32934,7 +35617,7 @@
+@@ -32934,7 +33097,7 @@
  do
    for j in qsql.html;
    do
 -    echo "configure: 32937: $i/$j" >&5
-+    echo "configure: 35620: $i/$j" >&5
++    echo "configure: 33100: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        QTDOCDIR=$i
-@@ -32943,20 +35626,20 @@
+@@ -32943,20 +33106,20 @@
    done
  done
  
@@ -35828,7 +34602,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -32999,12 +35682,12 @@
+@@ -32999,12 +33162,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35845,7 +34619,7 @@
        DOT=$kde_cv_path
  
     fi
-@@ -33016,14 +35699,14 @@
+@@ -33016,14 +33179,14 @@
  fi
  
  
@@ -35863,7 +34637,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -33066,12 +35749,12 @@
+@@ -33066,12 +33229,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -35880,7 +34654,7 @@
        DOXYGEN=$kde_cv_path
  
     fi
-@@ -33099,9 +35782,9 @@
+@@ -33099,9 +33262,9 @@
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
    as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
@@ -35893,12 +34667,155 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -33123,24 +35806,36 @@
- }
- _ACEOF
- rm -f conftest.$ac_objext
+@@ -33112,194 +33275,63 @@
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <$ac_hdr>
+-
+-int
+-main ()
+-{
+-if ((DIR *) 0)
+-return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
 -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&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'
+-  { (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
+-  eval "$as_ac_Header=yes"
+-else
+-  echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-eval "$as_ac_Header=no"
+-fi
+-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+-  cat >>confdefs.h <<_ACEOF
+-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+-_ACEOF
+-
+-ac_header_dirent=$ac_hdr; break
+-fi
+-
+-done
+-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+-if test $ac_header_dirent = dirent.h; then
+-  echo "$as_me:$LINENO: checking for library containing opendir" >&5
+-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-ac_cv_search_opendir=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
+-int
+-main ()
+-{
+-opendir ();
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 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'
+-  { (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_exeext'
+-  { (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_search_opendir="none required"
+-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
+-if test "$ac_cv_search_opendir" = no; then
+-  for ac_lib in dir; do
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-/* We use char because int might match the return type of a gcc2
+-   builtin and then its argument prototype would still apply.  */
+-char opendir ();
++
+ int
+ main ()
+ {
+-opendir ();
++if ((DIR *) 0)
++return 0;
+   ;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+-  (eval $ac_link) 2>conftest.er1
++rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
@@ -35911,58 +34828,62 @@
    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_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
-@@ -33149,12 +35844,14 @@
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
+-  ac_cv_search_opendir="-l$ac_lib"
+-break
++  (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
  
--eval "$as_ac_Header=no"
 +	eval "$as_ac_Header=no"
  fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest.err conftest.$ac_objext \
+-      conftest$ac_exeext conftest.$ac_ext
+-  done
+-fi
+-LIBS=$ac_func_search_save_LIBS
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+-echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
+-echo "${ECHO_T}$ac_cv_search_opendir" >&6
+-if test "$ac_cv_search_opendir" != no; then
+-  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
- if test `eval echo '${'$as_ac_Header'}'` = yes; then
-   cat >>confdefs.h <<_ACEOF
- #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-@@ -33166,13 +35863,12 @@
- done
- # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
- if test $ac_header_dirent = dirent.h; then
++if test `eval echo '${'$as_ac_Header'}'` = yes; then
++  cat >>confdefs.h <<_ACEOF
++#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
++_ACEOF
+ 
++ac_header_dirent=$ac_hdr; break
+ fi
+ 
+-else
 -  echo "$as_me:$LINENO: checking for library containing opendir" >&5
 -echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++done
++# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
++if test $ac_header_dirent = dirent.h; then
 +  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
  if test "${ac_cv_search_opendir+set}" = set; then
@@ -35973,7 +34894,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33180,249 +35876,196 @@
+@@ -33307,122 +33339,164 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -36019,191 +34940,69 @@
    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
 -  ac_cv_search_opendir="none required"
++  (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_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
--fi
++
+ fi
 -rm -f conftest.err conftest.$ac_objext \
 -      conftest$ac_exeext conftest.$ac_ext
 -if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in dir; do
+-  for ac_lib in x; do
 -    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
 -    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
- 
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char opendir ();
--int
--main ()
--{
--opendir ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 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'
--  { (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_exeext'
--  { (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_search_opendir="-l$ac_lib"
--break
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+fi
- 
++
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then
 +  break
- fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  done
++fi
 +done
 +if test "${ac_cv_search_opendir+set}" = set; then
 +  :
 +else
 +  ac_cv_search_opendir=no
- fi
++fi
 +rm conftest.$ac_ext
- LIBS=$ac_func_search_save_LIBS
- fi
--echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
--echo "${ECHO_T}$ac_cv_search_opendir" >&6
--if test "$ac_cv_search_opendir" != no; then
--  test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS"
++LIBS=$ac_func_search_save_LIBS
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
 +ac_res=$ac_cv_search_opendir
 +if test "$ac_res" != no; then
 +  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
- 
- fi
- 
- else
--  echo "$as_me:$LINENO: checking for library containing opendir" >&5
--echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6
++
++fi
++
++else
 +  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
- if test "${ac_cv_search_opendir+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_func_search_save_LIBS=$LIBS
--ac_cv_search_opendir=no
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--/* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char opendir ();
--int
--main ()
--{
--opendir ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 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'
--  { (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_exeext'
--  { (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_search_opendir="none required"
--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
--if test "$ac_cv_search_opendir" = no; then
--  for ac_lib in x; do
--    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
--    cat >conftest.$ac_ext <<_ACEOF
++if test "${ac_cv_search_opendir+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  ac_func_search_save_LIBS=$LIBS
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -36253,35 +35052,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
+-  ac_status=$?
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); }; }; then
 -  ac_cv_search_opendir="-l$ac_lib"
 -break
++  (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_search_opendir=$ac_res
  else
    echo "$as_me: failed program was:" >&5
@@ -36328,7 +35119,7 @@
  if test "${ac_cv_header_stdc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33446,24 +36089,36 @@
+@@ -33446,35 +33520,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36346,34 +35137,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
-@@ -33472,9 +36127,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
  
@@ -36386,7 +35169,7 @@
  
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-@@ -33530,6 +36186,7 @@
+@@ -33530,6 +33600,7 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  #include <ctype.h>
@@ -36394,7 +35177,7 @@
  #if ((' ' & 0x0FF) == 0x020)
  # define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
  # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-@@ -33549,18 +36206,27 @@
+@@ -33549,18 +33620,27 @@
    for (i = 0; i < 256; i++)
      if (XOR (islower (i), ISLOWER (i))
  	|| toupper (i) != TOUPPER (i))
@@ -36428,7 +35211,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -33573,12 +36239,14 @@
+@@ -33573,12 +33653,14 @@
  ( exit $ac_status )
  ac_cv_header_stdc=no
  fi
@@ -36446,7 +35229,7 @@
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -33600,18 +36268,19 @@
+@@ -33600,18 +33682,19 @@
  for ac_header in fcntl.h sys/sysctl.h sys/param.h sys/time.h sys/types.h sys/user.h sys/vmmeter.h sys/resource.h vm/vmparam.h unistd.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -36474,7 +35257,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33622,24 +36291,36 @@
+@@ -33622,41 +33705,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36492,34 +35275,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
-@@ -33648,15 +36329,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
  
@@ -36542,7 +35317,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33665,8 +36347,13 @@
+@@ -33665,24 +33744,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -36558,7 +35333,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -33690,9 +36377,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
+@@ -33690,9 +33767,10 @@
  
    ac_header_preproc=no
  fi
@@ -36571,7 +35366,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -33716,25 +36404,19 @@
+@@ -33716,25 +33794,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;}
@@ -36604,7 +35399,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -33749,15 +36431,14 @@
+@@ -33749,15 +33821,14 @@
  
  
  
@@ -36623,7 +35418,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'
-@@ -33769,9 +36450,6 @@
+@@ -33769,9 +33840,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36633,7 +35428,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -33794,24 +36472,36 @@
+@@ -33794,35 +33862,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36651,34 +35446,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
-@@ -33820,9 +36510,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
  
@@ -36691,7 +35478,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -33835,11 +36526,11 @@
+@@ -33835,11 +33899,11 @@
  fi
  
  
@@ -36707,7 +35494,7 @@
  if test "${kde_cv_proto_setenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -33860,8 +36551,7 @@
+@@ -33860,8 +33924,7 @@
  if test "x$kde_cv_proto_setenv" = xunknown; then
  
  
@@ -36717,7 +35504,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'
-@@ -33896,24 +36586,36 @@
+@@ -33896,37 +33959,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36735,34 +35522,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
-@@ -33923,10 +36625,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
  
@@ -36776,7 +35557,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -33939,8 +36642,8 @@
+@@ -33939,8 +33999,8 @@
  
  fi
  
@@ -36787,7 +35568,7 @@
  
  if test "x$kde_cv_func_setenv" = xyes; then
  
-@@ -33964,15 +36667,14 @@
+@@ -33964,15 +34024,14 @@
  
  
  
@@ -36806,7 +35587,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'
-@@ -33984,9 +36686,6 @@
+@@ -33984,9 +34043,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -36816,7 +35597,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34009,24 +36708,36 @@
+@@ -34009,35 +34065,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -36834,34 +35615,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
-@@ -34035,9 +36746,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
  
@@ -36874,7 +35647,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -34050,11 +36762,11 @@
+@@ -34050,11 +34102,11 @@
  fi
  
  
@@ -36890,7 +35663,7 @@
  if test "${kde_cv_proto_unsetenv+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34075,8 +36787,7 @@
+@@ -34075,8 +34127,7 @@
  if test "x$kde_cv_proto_unsetenv" = xunknown; then
  
  
@@ -36900,7 +35673,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'
-@@ -34111,24 +36822,36 @@
+@@ -34111,37 +34162,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -36918,34 +35691,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
-@@ -34138,10 +36861,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
  
@@ -36959,7 +35726,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -34154,8 +36878,8 @@
+@@ -34154,8 +34202,8 @@
  
  fi
  
@@ -36970,7 +35737,7 @@
  
  if test "x$kde_cv_func_unsetenv" = xyes; then
  
-@@ -34181,8 +36905,8 @@
+@@ -34181,8 +34229,8 @@
  CXXFLAGS="$CXXFLAGS $KDE_DEFAULT_CXXFLAGS"
  
  
@@ -36981,7 +35748,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34218,8 +36942,8 @@
+@@ -34218,8 +34266,8 @@
  
  fi
  
@@ -36992,7 +35759,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -34228,15 +36952,14 @@
+@@ -34228,15 +34276,14 @@
  
  
  
@@ -37011,7 +35778,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'
-@@ -34248,9 +36971,6 @@
+@@ -34248,9 +34295,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -37021,7 +35788,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34277,24 +36997,36 @@
+@@ -34277,35 +34321,31 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37039,34 +35806,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
-@@ -34303,9 +37035,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_statfs=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37079,7 +35838,7 @@
  CXXFLAGS="$save_CXXFLAGS"
  LIBS="$kde_safe_LIBS"
  ac_ext=c
-@@ -34318,11 +37051,11 @@
+@@ -34318,11 +34358,11 @@
  fi
  
  
@@ -37095,7 +35854,7 @@
  if test "${kde_cv_proto_statfs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34343,8 +37076,7 @@
+@@ -34343,8 +34383,7 @@
  if test "x$kde_cv_proto_statfs" = xunknown; then
  
  
@@ -37105,7 +35864,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'
-@@ -34385,24 +37117,36 @@
+@@ -34385,37 +34424,34 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -37123,34 +35882,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
-@@ -34412,10 +37156,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_statfs=yes
+   kde_cv_proto_statfs=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37164,7 +35917,7 @@
        conftest$ac_exeext conftest.$ac_ext
  LIBS=$kde_safe_libs
  ac_ext=c
-@@ -34428,8 +37173,8 @@
+@@ -34428,8 +34464,8 @@
  
  fi
  
@@ -37175,7 +35928,7 @@
  
  if test "x$kde_cv_func_statfs" = xyes; then
  
-@@ -34455,18 +37200,19 @@
+@@ -34455,18 +34491,19 @@
  for ac_header in ieeefp.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -37203,7 +35956,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34477,24 +37223,36 @@
+@@ -34477,41 +34514,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -37221,34 +35974,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
-@@ -34503,15 +37261,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
  
@@ -37271,7 +36016,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -34520,8 +37279,13 @@
+@@ -34520,24 +34553,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -37287,7 +36032,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -34545,9 +37309,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
+@@ -34545,9 +34576,10 @@
  
    ac_header_preproc=no
  fi
@@ -37300,7 +36065,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -34571,25 +37336,19 @@
+@@ -34571,25 +34603,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;}
@@ -37333,7 +36098,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -34606,9 +37365,9 @@
+@@ -34606,9 +34632,9 @@
  for ac_func in fabsl
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -37346,7 +36111,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -34634,53 +37393,59 @@
+@@ -34634,68 +34660,60 @@
  
  #undef $ac_func
  
@@ -37398,34 +36163,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
-@@ -34689,13 +37454,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
  
@@ -37445,7 +36203,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -34707,8 +37474,8 @@
+@@ -34707,8 +34725,8 @@
  
  
  
@@ -37456,7 +36214,7 @@
  if test "${ac_cv_c_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34751,13 +37518,22 @@
+@@ -34751,13 +34769,22 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
@@ -37483,7 +36241,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -34770,13 +37546,15 @@
+@@ -34770,13 +34797,15 @@
  ( exit $ac_status )
  ac_cv_c_long_double=no
  fi
@@ -37502,7 +36260,7 @@
    if test $ac_cv_c_long_double = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -34788,8 +37566,8 @@
+@@ -34788,8 +34817,8 @@
  
  have_l_funcs=yes
  
@@ -37513,7 +36271,7 @@
  if test "${ac_cv_lib_m_asinl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34802,40 +37580,52 @@
+@@ -34802,56 +34831,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37551,34 +36309,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
-@@ -34844,14 +37634,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_m_asinl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37598,7 +36349,7 @@
  if test $ac_cv_lib_m_asinl = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
-@@ -34864,8 +37655,8 @@
+@@ -34864,8 +34890,8 @@
  fi
  
  
@@ -37609,7 +36360,7 @@
  if test "${ac_cv_lib_m_sqrtl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34878,40 +37669,52 @@
+@@ -34878,56 +34904,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37647,34 +36398,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
-@@ -34920,14 +37723,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_m_sqrtl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37694,7 +36438,7 @@
  if test $ac_cv_lib_m_sqrtl = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
-@@ -34954,8 +37758,8 @@
+@@ -34954,8 +34977,8 @@
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
@@ -37705,7 +36449,7 @@
  if test "${ac_cv_lib_m_isinf+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -34968,40 +37772,52 @@
+@@ -34968,56 +34991,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37743,34 +36487,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
-@@ -35010,14 +37826,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_m_isinf=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37790,7 +36527,7 @@
  if test $ac_cv_lib_m_isinf = yes; then
  
  
-@@ -35028,8 +37845,8 @@
+@@ -35028,8 +35048,8 @@
  
  fi
  
@@ -37801,7 +36538,7 @@
  if test "${ac_cv_lib_m_round+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35042,40 +37859,52 @@
+@@ -35042,56 +35062,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37839,34 +36576,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
-@@ -35084,14 +37913,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_m_round=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37886,7 +36616,7 @@
  if test $ac_cv_lib_m_round = yes; then
  
  
-@@ -35102,8 +37932,8 @@
+@@ -35102,8 +35119,8 @@
  
  fi
  
@@ -37897,7 +36627,7 @@
  if test "${ac_cv_lib_m_roundl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35116,40 +37946,52 @@
+@@ -35116,56 +35133,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -37935,34 +36665,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
-@@ -35158,14 +38000,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_m_roundl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -37982,7 +36705,7 @@
  if test $ac_cv_lib_m_roundl = yes; then
  
  
-@@ -35183,8 +38026,7 @@
+@@ -35183,8 +35197,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -37992,7 +36715,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'
-@@ -35194,17 +38036,17 @@
+@@ -35194,17 +35207,17 @@
  
  
     if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -38016,7 +36739,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35215,24 +38057,36 @@
+@@ -35215,41 +35228,37 @@
  #include <gmp.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38034,34 +36757,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
-@@ -35241,15 +38095,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
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38084,7 +36799,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35258,8 +38113,13 @@
+@@ -35258,24 +35267,22 @@
  /* end confdefs.h.  */
  #include <gmp.h>
  _ACEOF
@@ -38100,7 +36815,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35283,9 +38143,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
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35283,9 +35290,10 @@
  
    ac_header_preproc=no
  fi
@@ -38113,7 +36848,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35309,25 +38170,18 @@
+@@ -35309,25 +35317,18 @@
  echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -38144,7 +36879,7 @@
  
  fi
  if test $ac_cv_header_gmp_h = yes; then
-@@ -35341,8 +38195,8 @@
+@@ -35341,8 +35342,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -38155,7 +36890,7 @@
  if test "${ac_cv_lib_gmp_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35359,30 +38213,42 @@
+@@ -35359,46 +35360,43 @@
  int
  main ()
  {
@@ -38180,34 +36915,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
-@@ -35391,14 +38257,15 @@
+-  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
+   ac_cv_lib_gmp_main=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38227,7 +36955,7 @@
  if test $ac_cv_lib_gmp_main = yes; then
    LIBGMP="-lgmp"
  
-@@ -35434,8 +38301,8 @@
+@@ -35434,8 +35432,8 @@
  
  
  
@@ -38238,7 +36966,7 @@
  if test "${ac_cv_c_long_double+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35478,13 +38345,22 @@
+@@ -35478,13 +35476,22 @@
  
  _ACEOF
  rm -f conftest$ac_exeext
@@ -38265,7 +36993,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -35497,13 +38373,15 @@
+@@ -35497,13 +35504,15 @@
  ( exit $ac_status )
  ac_cv_c_long_double=no
  fi
@@ -38284,7 +37012,7 @@
    if test $ac_cv_c_long_double = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -35515,8 +38393,8 @@
+@@ -35515,8 +35524,8 @@
  
  have_l_funcs=yes
  
@@ -38295,7 +37023,7 @@
  if test "${ac_cv_lib_m_sqrtl+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35529,40 +38407,52 @@
+@@ -35529,56 +35538,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -38333,34 +37061,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
-@@ -35571,14 +38461,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_m_sqrtl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38380,7 +37101,7 @@
  if test $ac_cv_lib_m_sqrtl = yes; then
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBM 1
-@@ -35604,8 +38495,7 @@
+@@ -35604,8 +35610,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -38390,7 +37111,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'
-@@ -35615,17 +38505,17 @@
+@@ -35615,17 +35620,17 @@
  
  
     if test "${ac_cv_header_gmp_h+set}" = set; then
@@ -38414,7 +37135,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35636,24 +38526,36 @@
+@@ -35636,41 +35641,37 @@
  #include <gmp.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38432,34 +37153,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
-@@ -35662,15 +38564,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
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38482,7 +37195,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -35679,8 +38582,13 @@
+@@ -35679,24 +35680,22 @@
  /* end confdefs.h.  */
  #include <gmp.h>
  _ACEOF
@@ -38498,7 +37211,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -35704,9 +38612,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
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35704,9 +35703,10 @@
  
    ac_header_preproc=no
  fi
@@ -38511,7 +37244,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -35730,32 +38639,24 @@
+@@ -35730,32 +35730,24 @@
  echo "$as_me: WARNING: gmp.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: gmp.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: gmp.h: in the future, the compiler will take precedence" >&2;}
@@ -38550,7 +37283,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'
-@@ -35788,24 +38689,36 @@
+@@ -35788,27 +35780,23 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -38568,34 +37301,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
-@@ -35818,10 +38731,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
+   LIBGMP="-lgmp"
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -35818,10 +35806,11 @@
      DO_NOT_COMPILE="$DO_NOT_COMPILE kcalc"
  
  fi
@@ -38609,7 +37337,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'
-@@ -35844,15 +38758,14 @@
+@@ -35844,15 +35833,14 @@
  
  # kossebau: copied from kdelibs/configure.in.in for khexedit
  
@@ -38627,7 +37355,7 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -35869,7 +38782,8 @@
+@@ -35869,7 +35857,8 @@
  int
  main ()
  {
@@ -38637,7 +37365,7 @@
   bogus endian macros
  #endif
  
-@@ -35878,24 +38792,36 @@
+@@ -35878,27 +35867,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38655,34 +37383,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_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
-@@ -35921,24 +38847,36 @@
+-  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
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -35921,40 +35905,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38700,34 +37422,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
-@@ -35947,14 +38885,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_objext; then
+   ac_cv_c_bigendian=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38746,7 +37460,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -35964,11 +38903,11 @@
+@@ -35964,11 +35944,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38762,7 +37476,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -35979,24 +38918,36 @@
+@@ -35979,27 +35959,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38780,34 +37494,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_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
-@@ -36015,8 +38966,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
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+   ac_cv_c_bigendian=yes
+ fi
+@@ -36015,8 +35990,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -38819,7 +37527,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -36024,27 +38977,41 @@
+@@ -36024,27 +36001,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -38868,7 +37576,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -36057,13 +39024,16 @@
+@@ -36057,13 +36048,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -38889,7 +37597,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -36090,14 +39060,14 @@
+@@ -36090,14 +36084,14 @@
  # kossebau end
  
  
@@ -38907,7 +37615,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
  
-@@ -36140,12 +39110,12 @@
+@@ -36140,12 +36134,12 @@
     fi
  
     if test -z "$kde_cv_path" || test "$kde_cv_path" = NONE; then
@@ -38924,7 +37632,7 @@
        TPCTL=$kde_cv_path
  
     fi
-@@ -36160,18 +39130,19 @@
+@@ -36160,18 +36154,19 @@
  for ac_header in machine/apm_bios.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -38952,7 +37660,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36182,24 +39153,36 @@
+@@ -36182,41 +36177,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -38970,34 +37678,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
-@@ -36208,15 +39191,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
  
@@ -39020,7 +37720,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36225,8 +39209,13 @@
+@@ -36225,24 +36216,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -39036,7 +37736,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -36250,9 +39239,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
+@@ -36250,9 +36239,10 @@
  
    ac_header_preproc=no
  fi
@@ -39049,7 +37769,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36276,25 +39266,19 @@
+@@ -36276,25 +36266,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;}
@@ -39082,7 +37802,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -36321,13 +39305,13 @@
+@@ -36321,13 +36305,13 @@
  
  
  
@@ -39100,7 +37820,7 @@
  
  have_pbbipc=""
  have_pbb=""
-@@ -36342,8 +39326,8 @@
+@@ -36342,8 +36326,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -39111,7 +37831,7 @@
  if test "${ac_cv_lib_pbbipc_create_msgport+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36356,40 +39340,52 @@
+@@ -36356,56 +36340,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39149,34 +37869,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
-@@ -36398,14 +39394,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_pbbipc_create_msgport=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39196,7 +37909,7 @@
  if test $ac_cv_lib_pbbipc_create_msgport = yes; then
    KEYBOARD_LIBS="-lpbbipc $KEYBOARD_LIBS"
  
-@@ -36430,8 +39427,8 @@
+@@ -36430,8 +36411,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -39207,7 +37920,7 @@
  if test "${ac_cv_lib_pbb_init_libpbb+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -36444,40 +39441,52 @@
+@@ -36444,56 +36425,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39245,34 +37958,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
-@@ -36486,14 +39495,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_pbb_init_libpbb=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39292,7 +37998,7 @@
  if test $ac_cv_lib_pbb_init_libpbb = yes; then
    KEYBOARD_LIBS="-lpbb $KEYBOARD_LIBS"
  
-@@ -36537,15 +39547,15 @@
+@@ -36537,15 +36515,15 @@
  fi
  
  
@@ -39312,7 +38018,7 @@
  
  
  if test x$kmilo_delli8k_compile = xyes; then
-@@ -36560,17 +39570,17 @@
+@@ -36560,17 +36538,17 @@
  
  
  if test "${ac_cv_header_linux_sonypi_h+set}" = set; then
@@ -39336,7 +38042,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36581,24 +39591,36 @@
+@@ -36581,41 +36559,37 @@
  #include <linux/sonypi.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39354,34 +38060,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
-@@ -36607,15 +39629,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
  
@@ -39404,7 +38102,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36624,8 +39647,13 @@
+@@ -36624,24 +36598,22 @@
  /* end confdefs.h.  */
  #include <linux/sonypi.h>
  _ACEOF
@@ -39420,7 +38118,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -36649,9 +39677,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
+@@ -36649,9 +36621,10 @@
  
    ac_header_preproc=no
  fi
@@ -39433,7 +38151,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -36675,25 +39704,18 @@
+@@ -36675,25 +36648,18 @@
  echo "$as_me: WARNING: linux/sonypi.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: linux/sonypi.h: in the future, the compiler will take precedence" >&2;}
@@ -39464,7 +38182,7 @@
  
  fi
  if test $ac_cv_header_linux_sonypi_h = yes; then
-@@ -36718,9 +39740,9 @@
+@@ -36718,9 +36684,9 @@
  for ac_func in getloadavg
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -39477,7 +38195,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -36746,53 +39768,59 @@
+@@ -36746,68 +36712,60 @@
  
  #undef $ac_func
  
@@ -39529,34 +38247,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
-@@ -36801,13 +39829,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
  
@@ -39576,7 +38287,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -36826,8 +39856,8 @@
+@@ -36826,8 +36784,8 @@
  
  if test x$sysinfo_check = xyes; then
    sysinfo_ok=no
@@ -39587,7 +38298,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36853,24 +39883,36 @@
+@@ -36853,27 +36811,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39605,34 +38316,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_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
-@@ -36886,11 +39928,13 @@
+-  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
+ 
+     sysinfo_ok=yes
+ 
+@@ -36886,11 +36839,13 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39649,7 +38354,7 @@
  fi
  
  
-@@ -36908,8 +39952,7 @@
+@@ -36908,8 +36863,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -39659,7 +38364,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'
-@@ -36919,17 +39962,17 @@
+@@ -36919,17 +36873,17 @@
  
  
     if test "${ac_cv_header_X11_extensions_extutil_h+set}" = set; then
@@ -39683,7 +38388,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36940,24 +39983,36 @@
+@@ -36940,41 +36894,37 @@
  #include <X11/extensions/extutil.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -39701,34 +38406,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
-@@ -36966,15 +40021,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
+   ac_header_compiler=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39751,7 +38448,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -36983,8 +40039,13 @@
+@@ -36983,24 +36933,22 @@
  /* end confdefs.h.  */
  #include <X11/extensions/extutil.h>
  _ACEOF
@@ -39767,7 +38464,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -37008,9 +40069,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
+   ac_header_preproc=yes
+ else
+   echo "$as_me: failed program was:" >&5
+@@ -37008,9 +36956,10 @@
  
    ac_header_preproc=no
  fi
@@ -39780,7 +38497,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-@@ -37034,25 +40096,18 @@
+@@ -37034,25 +36983,18 @@
  echo "$as_me: WARNING: X11/extensions/extutil.h: proceeding with the preprocessor's result" >&2;}
      { echo "$as_me:$LINENO: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&5
  echo "$as_me: WARNING: X11/extensions/extutil.h: in the future, the compiler will take precedence" >&2;}
@@ -39811,7 +38528,7 @@
  
  fi
  if test $ac_cv_header_X11_extensions_extutil_h = yes; then
-@@ -37083,8 +40138,8 @@
+@@ -37083,8 +37025,8 @@
  fi
  
  
@@ -39822,7 +38539,7 @@
  if test "${ac_cv_lib_devstat_selectdevs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37097,40 +40152,52 @@
+@@ -37097,64 +37039,61 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39860,34 +38577,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
-@@ -37139,22 +40206,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_devstat_selectdevs=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -39917,7 +38627,7 @@
  if test "${ac_cv_lib_devstat_devstat_selectdevs+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37167,40 +40235,52 @@
+@@ -37167,56 +37106,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -39955,34 +38665,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
-@@ -37209,14 +40289,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_devstat_devstat_selectdevs=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40002,7 +38705,7 @@
  if test $ac_cv_lib_devstat_devstat_selectdevs = yes; then
  
          LIB_DEVSTAT="-ldevstat"
-@@ -37241,18 +40322,19 @@
+@@ -37241,18 +37177,19 @@
  for ac_header in sys/mnttab.h mntent.h sys/statvfs.h sys/statfs.h sys/vfs.h sys/mount.h sys/ucred.h sys/loadavg.h
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -40030,7 +38733,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37263,24 +40345,36 @@
+@@ -37263,41 +37200,37 @@
  #include <$ac_header>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40048,34 +38751,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
-@@ -37289,15 +40383,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
  
@@ -40098,7 +38793,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -37306,8 +40401,13 @@
+@@ -37306,24 +37239,22 @@
  /* end confdefs.h.  */
  #include <$ac_header>
  _ACEOF
@@ -40114,7 +38809,27 @@
    ac_status=$?
    grep -v '^ *+' conftest.er1 >conftest.err
    rm -f conftest.er1
-@@ -37331,9 +40431,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
+@@ -37331,9 +37262,10 @@
  
    ac_header_preproc=no
  fi
@@ -40127,7 +38842,7 @@
  
  # So?  What about this header?
  case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-@@ -37357,25 +40458,19 @@
+@@ -37357,25 +37289,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;}
@@ -40160,7 +38875,7 @@
  
  fi
  if test `eval echo '${'$as_ac_Header'}'` = yes; then
-@@ -37391,9 +40486,9 @@
+@@ -37391,9 +37317,9 @@
  for ac_func in statvfs
  do
  as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
@@ -40173,7 +38888,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -37419,53 +40514,59 @@
+@@ -37419,68 +37345,60 @@
  
  #undef $ac_func
  
@@ -40225,34 +38940,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
-@@ -37474,13 +40575,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
  
@@ -40272,7 +38980,7 @@
  if test `eval echo '${'$as_ac_var'}'` = yes; then
    cat >>confdefs.h <<_ACEOF
  #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-@@ -37491,13 +40594,13 @@
+@@ -37491,13 +37409,13 @@
  
  
  
@@ -40290,7 +38998,7 @@
  
  enable_snmp=no
  if test "x$with_snmp" != xno; then
-@@ -37505,8 +40608,7 @@
+@@ -37505,8 +37423,7 @@
     kde_safe_cppflags=$CPPFLAGS
     CPPFLAGS="$CPPFLAGS $all_includes"
  
@@ -40300,7 +39008,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'
-@@ -37515,8 +40617,8 @@
+@@ -37515,8 +37432,8 @@
  ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  
  
@@ -40311,7 +39019,7 @@
  if test "${ac_cv_header_net_snmp_library_snmp_api_h+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37534,24 +40636,36 @@
+@@ -37534,38 +37451,34 @@
  #include <net-snmp/library/snmp_api.h>
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40329,34 +39037,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
-@@ -37560,12 +40674,13 @@
+-  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_header_net_snmp_library_snmp_api_h=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40374,7 +39074,7 @@
  if test $ac_cv_header_net_snmp_library_snmp_api_h = yes; then
     have_netsnmp_h=yes
  else
-@@ -37592,8 +40707,8 @@
+@@ -37592,8 +37505,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -40385,7 +39085,7 @@
  if test "${ac_cv_lib_netsnmp_snmp_sess_init+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37606,40 +40721,52 @@
+@@ -37606,56 +37519,53 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40423,34 +39123,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
-@@ -37648,14 +40775,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_netsnmp_snmp_sess_init=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40470,7 +39163,7 @@
  if test $ac_cv_lib_netsnmp_snmp_sess_init = yes; then
    LIBSNMP="-lnetsnmp"
  
-@@ -37669,8 +40797,8 @@
+@@ -37669,8 +37579,8 @@
    fi
  
    if test "$enable_snmp" != yes; then
@@ -40481,7 +39174,7 @@
  
  
       kde_save_LDFLAGS="$LDFLAGS"
-@@ -37681,8 +40809,8 @@
+@@ -37681,8 +37591,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -40492,7 +39185,7 @@
  if test "${ac_cv_lib_netsnmp_snmp_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37695,40 +40823,52 @@
+@@ -37695,66 +37605,63 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -40530,34 +39223,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
-@@ -37737,24 +40877,25 @@
+-  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_netsnmp_snmp_open=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40591,7 +39277,7 @@
  
  fi
  
-@@ -37783,8 +40924,8 @@
+@@ -37783,8 +37690,8 @@
  
  #MIN_CONFIG
  
@@ -40602,7 +39288,7 @@
  if test "${ac_cv_c_bigendian+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -37801,7 +40942,8 @@
+@@ -37801,7 +37708,8 @@
  int
  main ()
  {
@@ -40612,7 +39298,7 @@
   bogus endian macros
  #endif
  
-@@ -37810,24 +40952,36 @@
+@@ -37810,27 +37718,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40630,34 +39316,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_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
-@@ -37853,24 +41007,36 @@
+-  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
+   # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+@@ -37853,40 +37756,36 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40675,34 +39355,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
-@@ -37879,14 +41045,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_objext; then
+   ac_cv_c_bigendian=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40721,7 +39393,7 @@
  if test "$cross_compiling" = yes; then
    # try to guess the endianness by grepping values into an object file
    ac_cv_c_bigendian=unknown
-@@ -37896,11 +41063,11 @@
+@@ -37896,11 +37795,11 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -40737,7 +39409,7 @@
  void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
  int
  main ()
-@@ -37911,24 +41078,36 @@
+@@ -37911,27 +37810,22 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext
@@ -40755,34 +39427,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_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
-@@ -37947,8 +41126,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
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
+   ac_cv_c_bigendian=yes
+ fi
+@@ -37947,8 +37841,10 @@
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -40794,7 +39460,7 @@
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -37956,27 +41137,41 @@
+@@ -37956,27 +37852,41 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -40843,7 +39509,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; }; then
-@@ -37989,13 +41184,16 @@
+@@ -37989,13 +37899,16 @@
  ( exit $ac_status )
  ac_cv_c_bigendian=yes
  fi
@@ -40864,7 +39530,7 @@
  case $ac_cv_c_bigendian in
    yes)
  
-@@ -38014,8 +41212,8 @@
+@@ -38014,8 +37927,8 @@
  esac
  
  
@@ -40875,7 +39541,7 @@
  if test "${ac_cv_maxpathlen+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -38051,8 +41249,8 @@
+@@ -38051,8 +37964,8 @@
  
  fi
  
@@ -40886,7 +39552,7 @@
  
  cat >>confdefs.h <<_ACEOF
  #define KDEMAXPATHLEN $ac_cv_maxpathlen
-@@ -38062,8 +41260,8 @@
+@@ -38062,8 +37975,8 @@
  
  
  
@@ -40897,7 +39563,7 @@
  
  if test "${kde_cv_pythondir+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -38079,19 +41277,19 @@
+@@ -38079,19 +37992,19 @@
  
  
  
@@ -40923,7 +39589,7 @@
  
  
  
-@@ -38105,8 +41303,8 @@
+@@ -38105,8 +38018,8 @@
    version=""2.5""
  fi
  
@@ -40934,61 +39600,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38115,7 +41313,7 @@
+@@ -38115,7 +38028,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38118: $i/$j" >&5
-+    echo "configure: 41316: $i/$j" >&5
++    echo "configure: 38031: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38131,7 +41329,7 @@
+@@ -38131,7 +38044,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38134: $i/$j" >&5
-+    echo "configure: 41332: $i/$j" >&5
++    echo "configure: 38047: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38155,7 +41353,7 @@
+@@ -38155,7 +38068,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38158: $i/$j" >&5
-+    echo "configure: 41356: $i/$j" >&5
++    echo "configure: 38071: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38171,7 +41369,7 @@
+@@ -38171,7 +38084,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38174: $i/$j" >&5
-+    echo "configure: 41372: $i/$j" >&5
++    echo "configure: 38087: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38187,7 +41385,7 @@
+@@ -38187,7 +38100,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38190: $i/$j" >&5
-+    echo "configure: 41388: $i/$j" >&5
++    echo "configure: 38103: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38215,7 +41413,7 @@
+@@ -38215,7 +38128,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38218: $i/$j" >&5
-+    echo "configure: 41416: $i/$j" >&5
++    echo "configure: 38131: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38231,8 +41429,8 @@
+@@ -38231,8 +38144,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -40999,7 +39665,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38249,8 +41447,8 @@
+@@ -38249,8 +38162,8 @@
    version=""2.4""
  fi
  
@@ -41010,61 +39676,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38259,7 +41457,7 @@
+@@ -38259,7 +38172,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38262: $i/$j" >&5
-+    echo "configure: 41460: $i/$j" >&5
++    echo "configure: 38175: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38275,7 +41473,7 @@
+@@ -38275,7 +38188,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38278: $i/$j" >&5
-+    echo "configure: 41476: $i/$j" >&5
++    echo "configure: 38191: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38299,7 +41497,7 @@
+@@ -38299,7 +38212,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38302: $i/$j" >&5
-+    echo "configure: 41500: $i/$j" >&5
++    echo "configure: 38215: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38315,7 +41513,7 @@
+@@ -38315,7 +38228,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38318: $i/$j" >&5
-+    echo "configure: 41516: $i/$j" >&5
++    echo "configure: 38231: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38331,7 +41529,7 @@
+@@ -38331,7 +38244,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38334: $i/$j" >&5
-+    echo "configure: 41532: $i/$j" >&5
++    echo "configure: 38247: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38359,7 +41557,7 @@
+@@ -38359,7 +38272,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38362: $i/$j" >&5
-+    echo "configure: 41560: $i/$j" >&5
++    echo "configure: 38275: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38375,8 +41573,8 @@
+@@ -38375,8 +38288,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41075,7 +39741,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38393,8 +41591,8 @@
+@@ -38393,8 +38306,8 @@
    version=""2.3""
  fi
  
@@ -41086,61 +39752,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38403,7 +41601,7 @@
+@@ -38403,7 +38316,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38406: $i/$j" >&5
-+    echo "configure: 41604: $i/$j" >&5
++    echo "configure: 38319: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38419,7 +41617,7 @@
+@@ -38419,7 +38332,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38422: $i/$j" >&5
-+    echo "configure: 41620: $i/$j" >&5
++    echo "configure: 38335: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38443,7 +41641,7 @@
+@@ -38443,7 +38356,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38446: $i/$j" >&5
-+    echo "configure: 41644: $i/$j" >&5
++    echo "configure: 38359: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38459,7 +41657,7 @@
+@@ -38459,7 +38372,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38462: $i/$j" >&5
-+    echo "configure: 41660: $i/$j" >&5
++    echo "configure: 38375: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38475,7 +41673,7 @@
+@@ -38475,7 +38388,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38478: $i/$j" >&5
-+    echo "configure: 41676: $i/$j" >&5
++    echo "configure: 38391: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38503,7 +41701,7 @@
+@@ -38503,7 +38416,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38506: $i/$j" >&5
-+    echo "configure: 41704: $i/$j" >&5
++    echo "configure: 38419: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38519,8 +41717,8 @@
+@@ -38519,8 +38432,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41151,7 +39817,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38537,8 +41735,8 @@
+@@ -38537,8 +38450,8 @@
    version=""2.2""
  fi
  
@@ -41162,61 +39828,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38547,7 +41745,7 @@
+@@ -38547,7 +38460,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38550: $i/$j" >&5
-+    echo "configure: 41748: $i/$j" >&5
++    echo "configure: 38463: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38563,7 +41761,7 @@
+@@ -38563,7 +38476,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38566: $i/$j" >&5
-+    echo "configure: 41764: $i/$j" >&5
++    echo "configure: 38479: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38587,7 +41785,7 @@
+@@ -38587,7 +38500,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38590: $i/$j" >&5
-+    echo "configure: 41788: $i/$j" >&5
++    echo "configure: 38503: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38603,7 +41801,7 @@
+@@ -38603,7 +38516,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38606: $i/$j" >&5
-+    echo "configure: 41804: $i/$j" >&5
++    echo "configure: 38519: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38619,7 +41817,7 @@
+@@ -38619,7 +38532,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38622: $i/$j" >&5
-+    echo "configure: 41820: $i/$j" >&5
++    echo "configure: 38535: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38647,7 +41845,7 @@
+@@ -38647,7 +38560,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38650: $i/$j" >&5
-+    echo "configure: 41848: $i/$j" >&5
++    echo "configure: 38563: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38663,8 +41861,8 @@
+@@ -38663,8 +38576,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41227,7 +39893,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38681,8 +41879,8 @@
+@@ -38681,8 +38594,8 @@
    version=""2.1""
  fi
  
@@ -41238,61 +39904,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38691,7 +41889,7 @@
+@@ -38691,7 +38604,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38694: $i/$j" >&5
-+    echo "configure: 41892: $i/$j" >&5
++    echo "configure: 38607: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38707,7 +41905,7 @@
+@@ -38707,7 +38620,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38710: $i/$j" >&5
-+    echo "configure: 41908: $i/$j" >&5
++    echo "configure: 38623: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38731,7 +41929,7 @@
+@@ -38731,7 +38644,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38734: $i/$j" >&5
-+    echo "configure: 41932: $i/$j" >&5
++    echo "configure: 38647: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38747,7 +41945,7 @@
+@@ -38747,7 +38660,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38750: $i/$j" >&5
-+    echo "configure: 41948: $i/$j" >&5
++    echo "configure: 38663: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38763,7 +41961,7 @@
+@@ -38763,7 +38676,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38766: $i/$j" >&5
-+    echo "configure: 41964: $i/$j" >&5
++    echo "configure: 38679: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38791,7 +41989,7 @@
+@@ -38791,7 +38704,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38794: $i/$j" >&5
-+    echo "configure: 41992: $i/$j" >&5
++    echo "configure: 38707: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38807,8 +42005,8 @@
+@@ -38807,8 +38720,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41303,7 +39969,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38825,8 +42023,8 @@
+@@ -38825,8 +38738,8 @@
    version=""2.0""
  fi
  
@@ -41314,61 +39980,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38835,7 +42033,7 @@
+@@ -38835,7 +38748,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38838: $i/$j" >&5
-+    echo "configure: 42036: $i/$j" >&5
++    echo "configure: 38751: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38851,7 +42049,7 @@
+@@ -38851,7 +38764,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38854: $i/$j" >&5
-+    echo "configure: 42052: $i/$j" >&5
++    echo "configure: 38767: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38875,7 +42073,7 @@
+@@ -38875,7 +38788,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 38878: $i/$j" >&5
-+    echo "configure: 42076: $i/$j" >&5
++    echo "configure: 38791: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38891,7 +42089,7 @@
+@@ -38891,7 +38804,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 38894: $i/$j" >&5
-+    echo "configure: 42092: $i/$j" >&5
++    echo "configure: 38807: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38907,7 +42105,7 @@
+@@ -38907,7 +38820,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 38910: $i/$j" >&5
-+    echo "configure: 42108: $i/$j" >&5
++    echo "configure: 38823: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -38935,7 +42133,7 @@
+@@ -38935,7 +38848,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 38938: $i/$j" >&5
-+    echo "configure: 42136: $i/$j" >&5
++    echo "configure: 38851: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -38951,8 +42149,8 @@
+@@ -38951,8 +38864,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41379,7 +40045,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -38969,8 +42167,8 @@
+@@ -38969,8 +38882,8 @@
    version=""
  fi
  
@@ -41390,61 +40056,61 @@
  
  python_incdirs="$ac_python_dir/include /usr/include /usr/local/include/ $kde_extra_includes"
  
-@@ -38979,7 +42177,7 @@
+@@ -38979,7 +38892,7 @@
  do
    for j in Python.h;
    do
 -    echo "configure: 38982: $i/$j" >&5
-+    echo "configure: 42180: $i/$j" >&5
++    echo "configure: 38895: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -38995,7 +42193,7 @@
+@@ -38995,7 +38908,7 @@
  do
    for j in python$version/Python.h;
    do
 -    echo "configure: 38998: $i/$j" >&5
-+    echo "configure: 42196: $i/$j" >&5
++    echo "configure: 38911: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_incdir=$i
-@@ -39019,7 +42217,7 @@
+@@ -39019,7 +38932,7 @@
  do
    for j in libpython$version.so;
    do
 -    echo "configure: 39022: $i/$j" >&5
-+    echo "configure: 42220: $i/$j" >&5
++    echo "configure: 38935: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -39035,7 +42233,7 @@
+@@ -39035,7 +38948,7 @@
  do
    for j in libpython$version.a;
    do
 -    echo "configure: 39038: $i/$j" >&5
-+    echo "configure: 42236: $i/$j" >&5
++    echo "configure: 38951: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -39051,7 +42249,7 @@
+@@ -39051,7 +38964,7 @@
  do
    for j in python$version/config/libpython$version.a;
    do
 -    echo "configure: 39054: $i/$j" >&5
-+    echo "configure: 42252: $i/$j" >&5
++    echo "configure: 38967: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_libdir=$i
-@@ -39079,7 +42277,7 @@
+@@ -39079,7 +38992,7 @@
  do
    for j in python$version/copy.py;
    do
 -    echo "configure: 39082: $i/$j" >&5
-+    echo "configure: 42280: $i/$j" >&5
++    echo "configure: 38995: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        python_moddir=$i
-@@ -39095,8 +42293,8 @@
+@@ -39095,8 +39008,8 @@
  
  PYTHONMODDIR=$python_moddir
  
@@ -41455,7 +40121,7 @@
  
  if test x$python_incdir = xno ||  test x$python_libdir = xno ||  test x$python_moddir = xno; then
     LIBPYTHON=$kde_orig_LIBPYTHON
-@@ -39109,11 +42307,11 @@
+@@ -39109,11 +39022,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -41471,7 +40137,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -39147,24 +42345,36 @@
+@@ -39147,36 +39060,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41489,34 +40155,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
-@@ -39173,10 +42383,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41530,7 +40189,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39186,16 +42397,16 @@
+@@ -39186,16 +39096,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -41551,7 +40210,7 @@
  
  fi
  
-@@ -39206,11 +42417,11 @@
+@@ -39206,11 +39116,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -41567,7 +40226,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -39244,24 +42455,36 @@
+@@ -39244,36 +39154,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41585,34 +40244,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
-@@ -39270,10 +42493,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41626,7 +40278,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39283,16 +42507,16 @@
+@@ -39283,16 +39190,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -41647,7 +40299,7 @@
  
  fi
  
-@@ -39303,11 +42527,11 @@
+@@ -39303,11 +39210,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -41663,7 +40315,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -39341,24 +42565,36 @@
+@@ -39341,36 +39248,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41681,34 +40333,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
-@@ -39367,10 +42603,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41722,7 +40367,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39380,16 +42617,16 @@
+@@ -39380,16 +39284,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -41743,7 +40388,7 @@
  
  fi
  
-@@ -39400,11 +42637,11 @@
+@@ -39400,11 +39304,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -41759,7 +40404,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -39438,24 +42675,36 @@
+@@ -39438,36 +39342,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41777,34 +40422,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
-@@ -39464,10 +42713,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41818,7 +40456,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39477,16 +42727,16 @@
+@@ -39477,16 +39378,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -41839,7 +40477,7 @@
  
  fi
  
-@@ -39497,11 +42747,11 @@
+@@ -39497,11 +39398,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -41855,7 +40493,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -39535,24 +42785,36 @@
+@@ -39535,36 +39436,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41873,34 +40511,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
-@@ -39561,10 +42823,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -41914,7 +40545,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39574,16 +42837,16 @@
+@@ -39574,16 +39472,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -41935,7 +40566,7 @@
  
  fi
  
-@@ -39594,11 +42857,11 @@
+@@ -39594,11 +39492,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -41951,7 +40582,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -39632,24 +42895,36 @@
+@@ -39632,36 +39530,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -41969,34 +40600,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
-@@ -39658,10 +42933,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42010,7 +40634,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39671,16 +42947,16 @@
+@@ -39671,16 +39566,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -42031,7 +40655,7 @@
  
  fi
  
-@@ -39691,11 +42967,11 @@
+@@ -39691,11 +39586,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -42047,7 +40671,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -39729,24 +43005,36 @@
+@@ -39729,36 +39624,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42065,34 +40689,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
-@@ -39755,10 +43043,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42106,7 +40723,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39768,16 +43057,16 @@
+@@ -39768,16 +39660,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -42127,7 +40744,7 @@
  
  fi
  
-@@ -39788,11 +43077,11 @@
+@@ -39788,11 +39680,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -42143,7 +40760,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -39826,24 +43115,36 @@
+@@ -39826,36 +39718,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42161,34 +40778,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
-@@ -39852,10 +43153,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42202,7 +40812,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39865,16 +43167,16 @@
+@@ -39865,16 +39754,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -42223,7 +40833,7 @@
  
  fi
  
-@@ -39885,11 +43187,11 @@
+@@ -39885,11 +39774,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -42239,7 +40849,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -39923,24 +43225,36 @@
+@@ -39923,36 +39812,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42257,34 +40867,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
-@@ -39949,10 +43263,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42298,7 +40901,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -39962,16 +43277,16 @@
+@@ -39962,16 +39848,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -42319,7 +40922,7 @@
  
  fi
  
-@@ -39982,11 +43297,11 @@
+@@ -39982,11 +39868,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -42335,7 +40938,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -40020,24 +43335,36 @@
+@@ -40020,36 +39906,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42353,34 +40956,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
-@@ -40046,10 +43373,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42394,7 +40990,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40059,16 +43387,16 @@
+@@ -40059,16 +39942,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -42415,7 +41011,7 @@
  
  fi
  
-@@ -40079,11 +43407,11 @@
+@@ -40079,11 +39962,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -42431,7 +41027,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -40117,24 +43445,36 @@
+@@ -40117,36 +40000,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42449,34 +41045,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
-@@ -40143,10 +43483,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42490,7 +41079,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40156,16 +43497,16 @@
+@@ -40156,16 +40036,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -42511,7 +41100,7 @@
  
  fi
  
-@@ -40176,11 +43517,11 @@
+@@ -40176,11 +40056,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -42527,7 +41116,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -40214,24 +43555,36 @@
+@@ -40214,36 +40094,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42545,34 +41134,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
-@@ -40240,10 +43593,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42586,7 +41168,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40253,16 +43607,16 @@
+@@ -40253,16 +40130,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -42607,7 +41189,7 @@
  
  fi
  
-@@ -40273,11 +43627,11 @@
+@@ -40273,11 +40150,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -42623,7 +41205,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -40311,24 +43665,36 @@
+@@ -40311,36 +40188,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42641,34 +41223,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
-@@ -40337,10 +43703,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42682,7 +41257,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40350,16 +43717,16 @@
+@@ -40350,16 +40224,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -42703,7 +41278,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -40392,11 +43759,11 @@
+@@ -40392,11 +40266,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -42719,7 +41294,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -40430,24 +43797,36 @@
+@@ -40430,36 +40304,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42737,34 +41312,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
-@@ -40456,10 +43835,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42778,7 +41346,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40469,16 +43849,16 @@
+@@ -40469,16 +40340,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -42799,7 +41367,7 @@
  
  fi
  
-@@ -40489,11 +43869,11 @@
+@@ -40489,11 +40360,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -42815,7 +41383,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -40527,24 +43907,36 @@
+@@ -40527,36 +40398,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42833,34 +41401,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
-@@ -40553,10 +43945,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42874,7 +41435,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40566,16 +43959,16 @@
+@@ -40566,16 +40434,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -42895,7 +41456,7 @@
  
  fi
  
-@@ -40586,11 +43979,11 @@
+@@ -40586,11 +40454,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -42911,7 +41472,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -40624,24 +44017,36 @@
+@@ -40624,36 +40492,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -42929,34 +41490,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
-@@ -40650,10 +44055,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -42970,7 +41524,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40663,16 +44069,16 @@
+@@ -40663,16 +40528,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -42991,7 +41545,7 @@
  
  fi
  
-@@ -40683,11 +44089,11 @@
+@@ -40683,11 +40548,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -43007,7 +41561,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -40721,24 +44127,36 @@
+@@ -40721,36 +40586,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43025,34 +41579,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
-@@ -40747,10 +44165,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43066,7 +41613,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40760,16 +44179,16 @@
+@@ -40760,16 +40622,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -43087,7 +41634,7 @@
  
  fi
  
-@@ -40780,11 +44199,11 @@
+@@ -40780,11 +40642,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -43103,7 +41650,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -40818,24 +44237,36 @@
+@@ -40818,36 +40680,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43121,34 +41668,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
-@@ -40844,10 +44275,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43162,7 +41702,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40857,16 +44289,16 @@
+@@ -40857,16 +40716,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -43183,7 +41723,7 @@
  
  fi
  
-@@ -40877,11 +44309,11 @@
+@@ -40877,11 +40736,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -43199,7 +41739,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -40915,24 +44347,36 @@
+@@ -40915,36 +40774,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43217,34 +41757,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
-@@ -40941,10 +44385,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43258,7 +41791,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -40954,16 +44399,16 @@
+@@ -40954,16 +40810,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -43279,7 +41812,7 @@
  
  fi
  
-@@ -40974,11 +44419,11 @@
+@@ -40974,11 +40830,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -43295,7 +41828,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -41012,24 +44457,36 @@
+@@ -41012,36 +40868,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43313,34 +41846,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
-@@ -41038,10 +44495,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43354,7 +41880,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41051,16 +44509,16 @@
+@@ -41051,16 +40904,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -43375,7 +41901,7 @@
  
  fi
  
-@@ -41071,11 +44529,11 @@
+@@ -41071,11 +40924,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -43391,7 +41917,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -41109,24 +44567,36 @@
+@@ -41109,36 +40962,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43409,34 +41935,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
-@@ -41135,10 +44605,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43450,7 +41969,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41148,16 +44619,16 @@
+@@ -41148,16 +40998,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -43471,7 +41990,7 @@
  
  fi
  
-@@ -41168,11 +44639,11 @@
+@@ -41168,11 +41018,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -43487,7 +42006,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -41206,24 +44677,36 @@
+@@ -41206,36 +41056,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43505,34 +42024,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
-@@ -41232,10 +44715,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43546,7 +42058,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41245,16 +44729,16 @@
+@@ -41245,16 +41092,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -43567,7 +42079,7 @@
  
  fi
  
-@@ -41265,11 +44749,11 @@
+@@ -41265,11 +41112,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -43583,7 +42095,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -41303,24 +44787,36 @@
+@@ -41303,36 +41150,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43601,34 +42113,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
-@@ -41329,10 +44825,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43642,7 +42147,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41342,16 +44839,16 @@
+@@ -41342,16 +41186,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -43663,7 +42168,7 @@
  
  fi
  
-@@ -41362,11 +44859,11 @@
+@@ -41362,11 +41206,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -43679,7 +42184,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -41400,24 +44897,36 @@
+@@ -41400,36 +41244,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43697,34 +42202,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
-@@ -41426,10 +44935,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43738,7 +42236,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41439,16 +44949,16 @@
+@@ -41439,16 +41280,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -43759,7 +42257,7 @@
  
  fi
  
-@@ -41459,11 +44969,11 @@
+@@ -41459,11 +41300,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -43775,7 +42273,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -41497,24 +45007,36 @@
+@@ -41497,36 +41338,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43793,34 +42291,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
-@@ -41523,10 +45045,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43834,7 +42325,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41536,16 +45059,16 @@
+@@ -41536,16 +41374,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -43855,7 +42346,7 @@
  
  fi
  
-@@ -41556,11 +45079,11 @@
+@@ -41556,11 +41394,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -43871,7 +42362,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -41594,24 +45117,36 @@
+@@ -41594,36 +41432,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43889,34 +42380,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
-@@ -41620,10 +45155,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -43930,7 +42414,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41633,16 +45169,16 @@
+@@ -41633,16 +41468,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -43951,7 +42435,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -41676,11 +45212,11 @@
+@@ -41676,11 +41511,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -43967,7 +42451,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -41714,24 +45250,36 @@
+@@ -41714,36 +41549,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -43985,34 +42469,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
-@@ -41740,10 +45288,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44026,7 +42503,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41753,16 +45302,16 @@
+@@ -41753,16 +41585,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -44047,7 +42524,7 @@
  
  fi
  
-@@ -41773,11 +45322,11 @@
+@@ -41773,11 +41605,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -44063,7 +42540,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -41811,24 +45360,36 @@
+@@ -41811,36 +41643,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44081,34 +42558,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
-@@ -41837,10 +45398,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44122,7 +42592,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41850,16 +45412,16 @@
+@@ -41850,16 +41679,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -44143,7 +42613,7 @@
  
  fi
  
-@@ -41870,11 +45432,11 @@
+@@ -41870,11 +41699,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -44159,7 +42629,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -41908,24 +45470,36 @@
+@@ -41908,36 +41737,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44177,34 +42647,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
-@@ -41934,10 +45508,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44218,7 +42681,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -41947,16 +45522,16 @@
+@@ -41947,16 +41773,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -44239,7 +42702,7 @@
  
  fi
  
-@@ -41967,11 +45542,11 @@
+@@ -41967,11 +41793,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -44255,7 +42718,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -42005,24 +45580,36 @@
+@@ -42005,36 +41831,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44273,34 +42736,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
-@@ -42031,10 +45618,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44314,7 +42770,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42044,16 +45632,16 @@
+@@ -42044,16 +41867,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -44335,7 +42791,7 @@
  
  fi
  
-@@ -42064,11 +45652,11 @@
+@@ -42064,11 +41887,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -44351,7 +42807,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -42102,24 +45690,36 @@
+@@ -42102,36 +41925,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44369,34 +42825,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
-@@ -42128,10 +45728,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44410,7 +42859,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42141,16 +45742,16 @@
+@@ -42141,16 +41961,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -44431,7 +42880,7 @@
  
  fi
  
-@@ -42161,11 +45762,11 @@
+@@ -42161,11 +41981,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -44447,7 +42896,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -42199,24 +45800,36 @@
+@@ -42199,36 +42019,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44465,34 +42914,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
-@@ -42225,10 +45838,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44506,7 +42948,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42238,16 +45852,16 @@
+@@ -42238,16 +42055,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -44527,7 +42969,7 @@
  
  fi
  
-@@ -42258,11 +45872,11 @@
+@@ -42258,11 +42075,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -44543,7 +42985,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -42296,24 +45910,36 @@
+@@ -42296,36 +42113,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44561,34 +43003,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
-@@ -42322,10 +45948,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44602,7 +43037,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42335,16 +45962,16 @@
+@@ -42335,16 +42149,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -44623,7 +43058,7 @@
  
  fi
  
-@@ -42355,11 +45982,11 @@
+@@ -42355,11 +42169,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -44639,7 +43074,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -42393,24 +46020,36 @@
+@@ -42393,36 +42207,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44657,34 +43092,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
-@@ -42419,10 +46058,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44698,7 +43126,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42432,16 +46072,16 @@
+@@ -42432,16 +42243,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -44719,7 +43147,7 @@
  
  fi
  
-@@ -42452,11 +46092,11 @@
+@@ -42452,11 +42263,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -44735,7 +43163,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -42490,24 +46130,36 @@
+@@ -42490,36 +42301,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44753,34 +43181,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
-@@ -42516,10 +46168,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44794,7 +43215,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42529,16 +46182,16 @@
+@@ -42529,16 +42337,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -44815,7 +43236,7 @@
  
  fi
  
-@@ -42549,11 +46202,11 @@
+@@ -42549,11 +42357,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -44831,7 +43252,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -42587,24 +46240,36 @@
+@@ -42587,36 +42395,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44849,34 +43270,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
-@@ -42613,10 +46278,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44890,7 +43304,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42626,16 +46292,16 @@
+@@ -42626,16 +42431,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -44911,7 +43325,7 @@
  
  fi
  
-@@ -42646,11 +46312,11 @@
+@@ -42646,11 +42451,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -44927,7 +43341,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -42684,24 +46350,36 @@
+@@ -42684,36 +42489,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -44945,34 +43359,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
-@@ -42710,10 +46388,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -44986,7 +43393,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42723,16 +46402,16 @@
+@@ -42723,16 +42525,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -45007,7 +43414,7 @@
  
  fi
  
-@@ -42743,11 +46422,11 @@
+@@ -42743,11 +42545,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -45023,7 +43430,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -42781,24 +46460,36 @@
+@@ -42781,36 +42583,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45041,34 +43448,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
-@@ -42807,10 +46498,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45082,7 +43482,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42820,16 +46512,16 @@
+@@ -42820,16 +42619,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -45103,7 +43503,7 @@
  
  fi
  
-@@ -42840,11 +46532,11 @@
+@@ -42840,11 +42639,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -45119,7 +43519,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -42878,24 +46570,36 @@
+@@ -42878,36 +42677,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45137,34 +43537,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
-@@ -42904,10 +46608,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45178,7 +43571,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -42917,16 +46622,16 @@
+@@ -42917,16 +42713,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -45199,7 +43592,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -42960,11 +46665,11 @@
+@@ -42960,11 +42756,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -45215,7 +43608,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -42998,24 +46703,36 @@
+@@ -42998,36 +42794,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45233,34 +43626,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
-@@ -43024,10 +46741,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45274,7 +43660,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43037,16 +46755,16 @@
+@@ -43037,16 +42830,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -45295,7 +43681,7 @@
  
  fi
  
-@@ -43057,11 +46775,11 @@
+@@ -43057,11 +42850,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -45311,7 +43697,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -43095,24 +46813,36 @@
+@@ -43095,36 +42888,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45329,34 +43715,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
-@@ -43121,10 +46851,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45370,7 +43749,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43134,16 +46865,16 @@
+@@ -43134,16 +42924,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -45391,7 +43770,7 @@
  
  fi
  
-@@ -43154,11 +46885,11 @@
+@@ -43154,11 +42944,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -45407,7 +43786,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -43192,24 +46923,36 @@
+@@ -43192,36 +42982,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45425,34 +43804,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
-@@ -43218,10 +46961,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45466,7 +43838,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43231,16 +46975,16 @@
+@@ -43231,16 +43018,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -45487,7 +43859,7 @@
  
  fi
  
-@@ -43251,11 +46995,11 @@
+@@ -43251,11 +43038,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -45503,7 +43875,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -43289,24 +47033,36 @@
+@@ -43289,36 +43076,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45521,34 +43893,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
-@@ -43315,10 +47071,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45562,7 +43927,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43328,16 +47085,16 @@
+@@ -43328,16 +43112,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -45583,7 +43948,7 @@
  
  fi
  
-@@ -43348,11 +47105,11 @@
+@@ -43348,11 +43132,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -45599,7 +43964,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -43386,24 +47143,36 @@
+@@ -43386,36 +43170,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45617,34 +43982,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
-@@ -43412,10 +47181,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45658,7 +44016,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43425,16 +47195,16 @@
+@@ -43425,16 +43206,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -45679,7 +44037,7 @@
  
  fi
  
-@@ -43445,11 +47215,11 @@
+@@ -43445,11 +43226,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -45695,7 +44053,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -43483,24 +47253,36 @@
+@@ -43483,36 +43264,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45713,34 +44071,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
-@@ -43509,10 +47291,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45754,7 +44105,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43522,16 +47305,16 @@
+@@ -43522,16 +43300,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -45775,7 +44126,7 @@
  
  fi
  
-@@ -43542,11 +47325,11 @@
+@@ -43542,11 +43320,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -45791,7 +44142,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -43580,24 +47363,36 @@
+@@ -43580,36 +43358,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45809,34 +44160,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
-@@ -43606,10 +47401,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45850,7 +44194,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43619,16 +47415,16 @@
+@@ -43619,16 +43394,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -45871,7 +44215,7 @@
  
  fi
  
-@@ -43639,11 +47435,11 @@
+@@ -43639,11 +43414,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -45887,7 +44231,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -43677,24 +47473,36 @@
+@@ -43677,36 +43452,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -45905,34 +44249,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
-@@ -43703,10 +47511,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -45946,7 +44283,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43716,16 +47525,16 @@
+@@ -43716,16 +43488,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -45967,7 +44304,7 @@
  
  fi
  
-@@ -43736,11 +47545,11 @@
+@@ -43736,11 +43508,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -45983,7 +44320,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -43774,24 +47583,36 @@
+@@ -43774,36 +43546,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46001,34 +44338,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
-@@ -43800,10 +47621,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46042,7 +44372,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43813,16 +47635,16 @@
+@@ -43813,16 +43582,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -46063,7 +44393,7 @@
  
  fi
  
-@@ -43833,11 +47655,11 @@
+@@ -43833,11 +43602,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -46079,7 +44409,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -43871,24 +47693,36 @@
+@@ -43871,36 +43640,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46097,34 +44427,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
-@@ -43897,10 +47731,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46138,7 +44461,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -43910,16 +47745,16 @@
+@@ -43910,16 +43676,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -46159,7 +44482,7 @@
  
  fi
  
-@@ -43930,11 +47765,11 @@
+@@ -43930,11 +43696,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -46175,7 +44498,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -43968,24 +47803,36 @@
+@@ -43968,36 +43734,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46193,34 +44516,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
-@@ -43994,10 +47841,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46234,7 +44550,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44007,16 +47855,16 @@
+@@ -44007,16 +43770,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -46255,7 +44571,7 @@
  
  fi
  
-@@ -44027,11 +47875,11 @@
+@@ -44027,11 +43790,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -46271,7 +44587,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -44065,24 +47913,36 @@
+@@ -44065,36 +43828,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46289,34 +44605,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
-@@ -44091,10 +47951,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46330,7 +44639,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44104,16 +47965,16 @@
+@@ -44104,16 +43864,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -46351,7 +44660,7 @@
  
  fi
  
-@@ -44124,11 +47985,11 @@
+@@ -44124,11 +43884,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -46367,7 +44676,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -44162,24 +48023,36 @@
+@@ -44162,36 +43922,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46385,34 +44694,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
-@@ -44188,10 +48061,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46426,7 +44728,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44201,16 +48075,16 @@
+@@ -44201,16 +43958,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -46447,7 +44749,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -44244,11 +48118,11 @@
+@@ -44244,11 +44001,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -46463,7 +44765,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -44282,24 +48156,36 @@
+@@ -44282,36 +44039,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46481,34 +44783,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
-@@ -44308,10 +48194,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46522,7 +44817,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44321,16 +48208,16 @@
+@@ -44321,16 +44075,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -46543,7 +44838,7 @@
  
  fi
  
-@@ -44341,11 +48228,11 @@
+@@ -44341,11 +44095,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -46559,7 +44854,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -44379,24 +48266,36 @@
+@@ -44379,36 +44133,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46577,34 +44872,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
-@@ -44405,10 +48304,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46618,7 +44906,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44418,16 +48318,16 @@
+@@ -44418,16 +44169,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -46639,7 +44927,7 @@
  
  fi
  
-@@ -44438,11 +48338,11 @@
+@@ -44438,11 +44189,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -46655,7 +44943,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -44476,24 +48376,36 @@
+@@ -44476,36 +44227,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46673,34 +44961,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
-@@ -44502,10 +48414,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46714,7 +44995,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44515,16 +48428,16 @@
+@@ -44515,16 +44263,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -46735,7 +45016,7 @@
  
  fi
  
-@@ -44535,11 +48448,11 @@
+@@ -44535,11 +44283,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -46751,7 +45032,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -44573,24 +48486,36 @@
+@@ -44573,36 +44321,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46769,34 +45050,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
-@@ -44599,10 +48524,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46810,7 +45084,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44612,16 +48538,16 @@
+@@ -44612,16 +44357,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -46831,7 +45105,7 @@
  
  fi
  
-@@ -44632,11 +48558,11 @@
+@@ -44632,11 +44377,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -46847,7 +45121,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -44670,24 +48596,36 @@
+@@ -44670,36 +44415,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46865,34 +45139,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
-@@ -44696,10 +48634,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -46906,7 +45173,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44709,16 +48648,16 @@
+@@ -44709,16 +44451,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -46927,7 +45194,7 @@
  
  fi
  
-@@ -44729,11 +48668,11 @@
+@@ -44729,11 +44471,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -46943,7 +45210,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -44767,24 +48706,36 @@
+@@ -44767,36 +44509,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -46961,34 +45228,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
-@@ -44793,10 +48744,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47002,7 +45262,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44806,16 +48758,16 @@
+@@ -44806,16 +44545,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -47023,7 +45283,7 @@
  
  fi
  
-@@ -44826,11 +48778,11 @@
+@@ -44826,11 +44565,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -47039,7 +45299,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -44864,24 +48816,36 @@
+@@ -44864,36 +44603,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47057,34 +45317,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
-@@ -44890,10 +48854,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47098,7 +45351,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -44903,16 +48868,16 @@
+@@ -44903,16 +44639,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -47119,7 +45372,7 @@
  
  fi
  
-@@ -44923,11 +48888,11 @@
+@@ -44923,11 +44659,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -47135,7 +45388,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -44961,24 +48926,36 @@
+@@ -44961,36 +44697,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47153,34 +45406,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
-@@ -44987,10 +48964,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47194,7 +45440,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45000,16 +48978,16 @@
+@@ -45000,16 +44733,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -47215,7 +45461,7 @@
  
  fi
  
-@@ -45020,11 +48998,11 @@
+@@ -45020,11 +44753,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -47231,7 +45477,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -45058,24 +49036,36 @@
+@@ -45058,36 +44791,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47249,34 +45495,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
-@@ -45084,10 +49074,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47290,7 +45529,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45097,16 +49088,16 @@
+@@ -45097,16 +44827,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -47311,7 +45550,7 @@
  
  fi
  
-@@ -45117,11 +49108,11 @@
+@@ -45117,11 +44847,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -47327,7 +45566,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -45155,24 +49146,36 @@
+@@ -45155,36 +44885,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47345,34 +45584,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
-@@ -45181,10 +49184,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47386,7 +45618,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45194,16 +49198,16 @@
+@@ -45194,16 +44921,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -47407,7 +45639,7 @@
  
  fi
  
-@@ -45214,11 +49218,11 @@
+@@ -45214,11 +44941,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -47423,7 +45655,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -45252,24 +49256,36 @@
+@@ -45252,36 +44979,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47441,34 +45673,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
-@@ -45278,10 +49294,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47482,7 +45707,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45291,16 +49308,16 @@
+@@ -45291,16 +45015,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -47503,7 +45728,7 @@
  
  fi
  
-@@ -45311,11 +49328,11 @@
+@@ -45311,11 +45035,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -47519,7 +45744,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -45349,24 +49366,36 @@
+@@ -45349,36 +45073,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47537,34 +45762,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
-@@ -45375,10 +49404,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47578,7 +45796,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45388,16 +49418,16 @@
+@@ -45388,16 +45109,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -47599,7 +45817,7 @@
  
  fi
  
-@@ -45408,11 +49438,11 @@
+@@ -45408,11 +45129,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -47615,7 +45833,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -45446,24 +49476,36 @@
+@@ -45446,36 +45167,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47633,34 +45851,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
-@@ -45472,10 +49514,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47674,7 +45885,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45485,16 +49528,16 @@
+@@ -45485,16 +45203,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -47695,7 +45906,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -45528,11 +49571,11 @@
+@@ -45528,11 +45246,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -47711,7 +45922,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -45566,24 +49609,36 @@
+@@ -45566,36 +45284,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47729,34 +45940,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
-@@ -45592,10 +49647,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47770,7 +45974,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45605,16 +49661,16 @@
+@@ -45605,16 +45320,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -47791,7 +45995,7 @@
  
  fi
  
-@@ -45625,11 +49681,11 @@
+@@ -45625,11 +45340,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -47807,7 +46011,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -45663,24 +49719,36 @@
+@@ -45663,36 +45378,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47825,34 +46029,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
-@@ -45689,10 +49757,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47866,7 +46063,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45702,16 +49771,16 @@
+@@ -45702,16 +45414,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -47887,7 +46084,7 @@
  
  fi
  
-@@ -45722,11 +49791,11 @@
+@@ -45722,11 +45434,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -47903,7 +46100,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -45760,24 +49829,36 @@
+@@ -45760,36 +45472,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -47921,34 +46118,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
-@@ -45786,10 +49867,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -47962,7 +46152,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45799,16 +49881,16 @@
+@@ -45799,16 +45508,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -47983,7 +46173,7 @@
  
  fi
  
-@@ -45819,11 +49901,11 @@
+@@ -45819,11 +45528,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -47999,7 +46189,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -45857,24 +49939,36 @@
+@@ -45857,36 +45566,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48017,34 +46207,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
-@@ -45883,10 +49977,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48058,7 +46241,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45896,16 +49991,16 @@
+@@ -45896,16 +45602,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -48079,7 +46262,7 @@
  
  fi
  
-@@ -45916,11 +50011,11 @@
+@@ -45916,11 +45622,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -48095,7 +46278,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -45954,24 +50049,36 @@
+@@ -45954,36 +45660,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48113,34 +46296,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
-@@ -45980,10 +50087,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48154,7 +46330,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -45993,16 +50101,16 @@
+@@ -45993,16 +45696,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -48175,7 +46351,7 @@
  
  fi
  
-@@ -46013,11 +50121,11 @@
+@@ -46013,11 +45716,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -48191,7 +46367,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -46051,24 +50159,36 @@
+@@ -46051,36 +45754,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48209,34 +46385,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
-@@ -46077,10 +50197,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48250,7 +46419,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46090,16 +50211,16 @@
+@@ -46090,16 +45790,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -48271,7 +46440,7 @@
  
  fi
  
-@@ -46110,11 +50231,11 @@
+@@ -46110,11 +45810,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -48287,7 +46456,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -46148,24 +50269,36 @@
+@@ -46148,36 +45848,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48305,34 +46474,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
-@@ -46174,10 +50307,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48346,7 +46508,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46187,16 +50321,16 @@
+@@ -46187,16 +45884,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -48367,7 +46529,7 @@
  
  fi
  
-@@ -46207,11 +50341,11 @@
+@@ -46207,11 +45904,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -48383,7 +46545,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -46245,24 +50379,36 @@
+@@ -46245,36 +45942,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48401,34 +46563,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
-@@ -46271,10 +50417,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48442,7 +46597,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46284,16 +50431,16 @@
+@@ -46284,16 +45978,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -48463,7 +46618,7 @@
  
  fi
  
-@@ -46304,11 +50451,11 @@
+@@ -46304,11 +45998,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -48479,7 +46634,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -46342,24 +50489,36 @@
+@@ -46342,36 +46036,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48497,34 +46652,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
-@@ -46368,10 +50527,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48538,7 +46686,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46381,16 +50541,16 @@
+@@ -46381,16 +46072,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -48559,7 +46707,7 @@
  
  fi
  
-@@ -46401,11 +50561,11 @@
+@@ -46401,11 +46092,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -48575,7 +46723,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -46439,24 +50599,36 @@
+@@ -46439,36 +46130,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48593,34 +46741,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
-@@ -46465,10 +50637,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48634,7 +46775,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46478,16 +50651,16 @@
+@@ -46478,16 +46166,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -48655,7 +46796,7 @@
  
  fi
  
-@@ -46498,11 +50671,11 @@
+@@ -46498,11 +46186,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -48671,7 +46812,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -46536,24 +50709,36 @@
+@@ -46536,36 +46224,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48689,34 +46830,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
-@@ -46562,10 +50747,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48730,7 +46864,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46575,16 +50761,16 @@
+@@ -46575,16 +46260,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -48751,7 +46885,7 @@
  
  fi
  
-@@ -46595,11 +50781,11 @@
+@@ -46595,11 +46280,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -48767,7 +46901,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -46633,24 +50819,36 @@
+@@ -46633,36 +46318,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48785,34 +46919,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
-@@ -46659,10 +50857,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48826,7 +46953,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46672,16 +50871,16 @@
+@@ -46672,16 +46354,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -48847,7 +46974,7 @@
  
  fi
  
-@@ -46692,11 +50891,11 @@
+@@ -46692,11 +46374,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -48863,7 +46990,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -46730,24 +50929,36 @@
+@@ -46730,36 +46412,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48881,34 +47008,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
-@@ -46756,10 +50967,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -48922,7 +47042,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46769,16 +50981,16 @@
+@@ -46769,16 +46448,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -48943,7 +47063,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -46812,11 +51024,11 @@
+@@ -46812,11 +46491,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "normal" = normal; then
@@ -48959,7 +47079,7 @@
  fi
  
  if test "${kde_cv_try_link_python_normal+set}" = set; then
-@@ -46850,24 +51062,36 @@
+@@ -46850,36 +46529,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -48977,34 +47097,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
-@@ -46876,10 +51100,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_try_link_python_normal=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49018,7 +47131,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46889,16 +51114,16 @@
+@@ -46889,16 +46565,16 @@
  
  
  if test "$kde_cv_try_link_python_normal" = "yes"; then
@@ -49039,7 +47152,7 @@
  
  fi
  
-@@ -46909,11 +51134,11 @@
+@@ -46909,11 +46585,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m" = normal; then
@@ -49055,7 +47168,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m+set}" = set; then
-@@ -46947,24 +51172,36 @@
+@@ -46947,36 +46623,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49073,34 +47186,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
-@@ -46973,10 +51210,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_try_link_python_m=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49114,7 +47220,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -46986,16 +51224,16 @@
+@@ -46986,16 +46659,16 @@
  
  
  if test "$kde_cv_try_link_python_m" = "yes"; then
@@ -49135,7 +47241,7 @@
  
  fi
  
-@@ -47006,11 +51244,11 @@
+@@ -47006,11 +46679,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread" = normal; then
@@ -49151,7 +47257,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread+set}" = set; then
-@@ -47044,24 +51282,36 @@
+@@ -47044,36 +46717,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49169,34 +47275,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
-@@ -47070,10 +51320,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_try_link_python_pthread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49210,7 +47309,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47083,16 +51334,16 @@
+@@ -47083,16 +46753,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread" = "yes"; then
@@ -49231,7 +47330,7 @@
  
  fi
  
-@@ -47103,11 +51354,11 @@
+@@ -47103,11 +46773,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "tcl" = normal; then
@@ -49247,7 +47346,7 @@
  fi
  
  if test "${kde_cv_try_link_python_tcl+set}" = set; then
-@@ -47141,24 +51392,36 @@
+@@ -47141,36 +46811,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49265,34 +47364,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
-@@ -47167,10 +51430,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_try_link_python_tcl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49306,7 +47398,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47180,16 +51444,16 @@
+@@ -47180,16 +46847,16 @@
  
  
  if test "$kde_cv_try_link_python_tcl" = "yes"; then
@@ -49327,7 +47419,7 @@
  
  fi
  
-@@ -47200,11 +51464,11 @@
+@@ -47200,11 +46867,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "db2" = normal; then
@@ -49343,7 +47435,7 @@
  fi
  
  if test "${kde_cv_try_link_python_db2+set}" = set; then
-@@ -47238,24 +51502,36 @@
+@@ -47238,36 +46905,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49361,34 +47453,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
-@@ -47264,10 +51540,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_try_link_python_db2=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49402,7 +47487,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47277,16 +51554,16 @@
+@@ -47277,16 +46941,16 @@
  
  
  if test "$kde_cv_try_link_python_db2" = "yes"; then
@@ -49423,7 +47508,7 @@
  
  fi
  
-@@ -47297,11 +51574,11 @@
+@@ -47297,11 +46961,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread" = normal; then
@@ -49439,7 +47524,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread+set}" = set; then
-@@ -47335,24 +51612,36 @@
+@@ -47335,36 +46999,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49457,34 +47542,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
-@@ -47361,10 +51650,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_try_link_python_m_and_thread=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49498,7 +47576,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47374,16 +51664,16 @@
+@@ -47374,16 +47035,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread" = "yes"; then
@@ -49519,7 +47597,7 @@
  
  fi
  
-@@ -47394,11 +51684,11 @@
+@@ -47394,11 +47055,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_util" = normal; then
@@ -49535,7 +47613,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_util+set}" = set; then
-@@ -47432,24 +51722,36 @@
+@@ -47432,36 +47093,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49553,34 +47631,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
-@@ -47458,10 +51760,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_try_link_python_m_and_thread_and_util=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49594,7 +47665,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47471,16 +51774,16 @@
+@@ -47471,16 +47129,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_util" = "yes"; then
@@ -49615,7 +47686,7 @@
  
  fi
  
-@@ -47491,11 +51794,11 @@
+@@ -47491,11 +47149,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db3" = normal; then
@@ -49631,7 +47702,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db3+set}" = set; then
-@@ -47529,24 +51832,36 @@
+@@ -47529,36 +47187,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49649,34 +47720,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
-@@ -47555,10 +51870,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_try_link_python_m_and_thread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49690,7 +47754,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47568,16 +51884,16 @@
+@@ -47568,16 +47223,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db3" = "yes"; then
@@ -49711,7 +47775,7 @@
  
  fi
  
-@@ -47588,11 +51904,11 @@
+@@ -47588,11 +47243,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_db3" = normal; then
@@ -49727,7 +47791,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_db3+set}" = set; then
-@@ -47626,24 +51942,36 @@
+@@ -47626,36 +47281,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49745,34 +47809,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
-@@ -47652,10 +51980,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_try_link_python_pthread_and_db3=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49786,7 +47843,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47665,16 +51994,16 @@
+@@ -47665,16 +47317,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_db3" = "yes"; then
@@ -49807,7 +47864,7 @@
  
  fi
  
-@@ -47685,11 +52014,11 @@
+@@ -47685,11 +47337,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db" = normal; then
@@ -49823,7 +47880,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db+set}" = set; then
-@@ -47723,24 +52052,36 @@
+@@ -47723,36 +47375,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49841,34 +47898,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
-@@ -47749,10 +52090,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_try_link_python_m_and_thread_and_db=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49882,7 +47932,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47762,16 +52104,16 @@
+@@ -47762,16 +47411,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db" = "yes"; then
@@ -49903,7 +47953,7 @@
  
  fi
  
-@@ -47782,11 +52124,11 @@
+@@ -47782,11 +47431,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_dl" = normal; then
@@ -49919,7 +47969,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_dl+set}" = set; then
-@@ -47820,24 +52162,36 @@
+@@ -47820,36 +47469,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -49937,34 +47987,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
-@@ -47846,10 +52200,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_try_link_python_pthread_and_dl=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -49978,7 +48021,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47859,16 +52214,16 @@
+@@ -47859,16 +47505,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_dl" = "yes"; then
@@ -49999,7 +48042,7 @@
  
  fi
  
-@@ -47879,11 +52234,11 @@
+@@ -47879,11 +47525,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "pthread_and_panel_curses" = normal; then
@@ -50015,7 +48058,7 @@
  fi
  
  if test "${kde_cv_try_link_python_pthread_and_panel_curses+set}" = set; then
-@@ -47917,24 +52272,36 @@
+@@ -47917,36 +47563,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -50033,34 +48076,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
-@@ -47943,10 +52310,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_try_link_python_pthread_and_panel_curses=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -50074,7 +48110,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -47956,16 +52324,16 @@
+@@ -47956,16 +47599,16 @@
  
  
  if test "$kde_cv_try_link_python_pthread_and_panel_curses" = "yes"; then
@@ -50095,7 +48131,7 @@
  
  fi
  
-@@ -47976,11 +52344,11 @@
+@@ -47976,11 +47619,11 @@
  if test "$kde_python_link_found" = no; then
  
  if test "m_and_thread_and_db_special" = normal; then
@@ -50111,7 +48147,7 @@
  fi
  
  if test "${kde_cv_try_link_python_m_and_thread_and_db_special+set}" = set; then
-@@ -48014,24 +52382,36 @@
+@@ -48014,36 +47657,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -50129,34 +48165,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
-@@ -48040,10 +52420,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_try_link_python_m_and_thread_and_db_special=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -50170,7 +48199,7 @@
        conftest$ac_exeext conftest.$ac_ext
  CFLAGS="$kde_save_cflags"
  LIBS="$kde_save_libs"
-@@ -48053,16 +52434,16 @@
+@@ -48053,16 +47693,16 @@
  
  
  if test "$kde_cv_try_link_python_m_and_thread_and_db_special" = "yes"; then
@@ -50191,7 +48220,7 @@
    { echo "$as_me:$LINENO: WARNING: it seems, Python depends on another library.
      Please set LIBPYTHON to '-lpython$version -lotherlib' before calling configure to fix this
      and contact the authors to let them know about this problem" >&5
-@@ -48093,18 +52474,18 @@
+@@ -48093,18 +47733,18 @@
  
  
  
@@ -50216,7 +48245,7 @@
    if test "${ac_cv_have_xmms+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48131,24 +52512,36 @@
+@@ -48131,36 +47771,33 @@
  }
  _ACEOF
  rm -f conftest.$ac_objext conftest$ac_exeext
@@ -50234,34 +48263,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
-@@ -48157,10 +52550,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
+   ac_cv_have_xmms="yes"
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -50275,7 +48297,7 @@
        conftest$ac_exeext conftest.$ac_ext
      LIBS="$ac_save_libs"
      LDFLAGS="$ac_LDFLAGS_save"
-@@ -48168,8 +52562,8 @@
+@@ -48168,8 +47805,8 @@
  
  fi
  
@@ -50286,7 +48308,7 @@
    if test "$ac_cv_have_xmms" = "yes"; then
      XMMS_INCLUDES="`xmms-config --cflags`"
  
-@@ -48210,8 +52604,8 @@
+@@ -48210,8 +47847,8 @@
  	test "$GCC" = yes && LDFLAGS="-Wl,$LDFLAGS"
  	;;
       esac
@@ -50297,7 +48319,7 @@
  if test "${ac_cv_lib_knewstuff_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48228,30 +52622,42 @@
+@@ -48228,46 +47865,43 @@
  int
  main ()
  {
@@ -50322,34 +48344,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
-@@ -48260,14 +52666,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_knewstuff_main=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -50369,7 +48384,7 @@
  if test $ac_cv_lib_knewstuff_main = yes; then
    MY_LIBKNEWSTUFF="-lknewstuff"
  else
-@@ -48286,8 +52693,8 @@
+@@ -48286,8 +47920,8 @@
  
  fi
  
@@ -50380,7 +48395,7 @@
  if test "${ac_cv_lib_kvm_main+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
-@@ -48304,30 +52711,42 @@
+@@ -48304,46 +47938,43 @@
  int
  main ()
  {
@@ -50405,34 +48420,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
-@@ -48336,14 +52755,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_kvm_main=yes
+ else
    echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
@@ -50452,7 +48460,7 @@
  if test $ac_cv_lib_kvm_main = yes; then
    LIBKVM="-lkvm"
  fi
-@@ -48373,8 +52793,8 @@
+@@ -48373,8 +48004,8 @@
  fi
  
  for i in $ac_topsubdirs; do
@@ -50463,7 +48471,7 @@
    if test -d $srcdir/$i; then
      install_it="yes"
      for j in $DO_NOT_COMPILE; do
-@@ -48385,8 +52805,8 @@
+@@ -48385,8 +48016,8 @@
    else
      install_it="no"
    fi
@@ -50474,7 +48482,7 @@
    vari=`echo $i | sed -e 's,[-+.@],_,g'`
    if test $install_it = "yes"; then
      TOPSUBDIRS="$TOPSUBDIRS $i"
-@@ -48598,221 +53018,221 @@
+@@ -48598,221 +48229,221 @@
    superkaramba_SUBDIR_included_FALSE=
  fi
  
@@ -50804,7 +48812,7 @@
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -48832,39 +53252,58 @@
+@@ -48832,39 +48463,58 @@
  
  # The following way of writing the cache mishandles newlines in values,
  # but we know of no workaround that is simple, portable, and efficient.
@@ -50879,7 +48887,7 @@
    fi
  fi
  rm -f confcache
-@@ -48873,38 +53312,31 @@
+@@ -48873,38 +48523,31 @@
  # Let make expand exec_prefix.
  test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
  
@@ -50931,7 +48939,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
-@@ -49167,11 +53599,35 @@
+@@ -49160,17 +48803,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+"$@"}'='"$@"'
@@ -50939,12 +48956,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'
@@ -50964,12 +48984,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
-@@ -49180,8 +53636,43 @@
+@@ -49180,8 +48851,43 @@
  fi
  
  
@@ -51014,7 +49034,7 @@
  PS1='$ '
  PS2='> '
  PS4='+ '
-@@ -49195,18 +53686,19 @@
+@@ -49195,18 +48901,19 @@
    if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
      eval $as_var=C; export $as_var
    else
@@ -51037,7 +49057,7 @@
    as_basename=basename
  else
    as_basename=false
-@@ -49214,159 +53706,120 @@
+@@ -49214,159 +48921,120 @@
  
  
  # Name of the executable.
@@ -51054,6 +49074,14 @@
 -  	  /^X\/\(\/\).*/{ s//\1/; q; }
 -  	  s/.*/./; q'`
 -
+-
+-# PATH needs CR, and LINENO needs CR and PATH.
+-# Avoid depending upon Character Ranges.
+-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+-as_cr_digits='0123456789'
+-as_cr_alnum=$as_cr_Letters$as_cr_digits
 +    sed '/^.*\/\([^/][^/]*\)\/*$/{
 +	    s//\1/
 +	    q
@@ -51068,14 +49096,6 @@
 +	  }
 +	  s/.*/./; q'`
  
--# PATH needs CR, and LINENO needs CR and PATH.
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
 -# The user is always right.
 -if test "${PATH_SEPARATOR+set}" != set; then
 -  echo "#! /bin/sh" >conf$$.sh
@@ -51268,28 +49288,37 @@
  
  if mkdir -p . 2>/dev/null; then
    as_mkdir_p=:
-@@ -49375,7 +53828,19 @@
+@@ -49375,7 +49043,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'"
-@@ -49384,31 +53849,14 @@
+@@ -49384,31 +49073,14 @@
  as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
  
  
@@ -51321,11 +49350,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
-@@ -49416,30 +53864,20 @@
+@@ -49416,30 +49088,20 @@
    CONFIG_COMMANDS = $CONFIG_COMMANDS
    $ $0 $@
  
@@ -51364,7 +49393,7 @@
  ac_cs_usage="\
  \`$as_me' instantiates files from templates according to the
  current configuration.
-@@ -49447,7 +53885,7 @@
+@@ -49447,7 +49109,7 @@
  Usage: $0 [OPTIONS] [FILE]...
  
    -h, --help       print this help, then exit
@@ -51373,7 +49402,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
-@@ -49466,19 +53904,21 @@
+@@ -49466,19 +49128,21 @@
  $config_commands
  
  Report bugs to <bug-autoconf at gnu.org>."
@@ -51385,7 +49414,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.
@@ -51401,7 +49430,7 @@
  _ACEOF
  
  cat >>$CONFIG_STATUS <<\_ACEOF
-@@ -49489,39 +53929,24 @@
+@@ -49489,39 +49153,24 @@
  do
    case $1 in
    --*=*)
@@ -51447,7 +49476,7 @@
      debug=: ;;
    --file | --fil | --fi | --f )
      $ac_shift
-@@ -49531,18 +53956,24 @@
+@@ -49531,18 +49180,24 @@
      $ac_shift
      CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
      ac_need_defaults=false;;
@@ -51477,7 +49506,7 @@
  
    esac
    shift
-@@ -49558,144 +53989,156 @@
+@@ -49558,144 +49213,156 @@
  _ACEOF
  cat >>$CONFIG_STATUS <<_ACEOF
  if \$ac_cs_recheck; then
@@ -51752,7 +49781,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
-@@ -49707,566 +54150,758 @@
+@@ -49707,566 +49374,758 @@
  fi
  
  # Have a temporary directory for convenience.  Make it in the build tree
@@ -53016,7 +51045,7 @@
  cat >>$CONFIG_STATUS <<_ACEOF
    sed "$ac_vpsub
  $extrasub
-@@ -50274,248 +54909,130 @@
+@@ -50274,248 +50133,130 @@
  cat >>$CONFIG_STATUS <<\_ACEOF
  :t
  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b
@@ -53366,7 +51395,7 @@
  # Compute $ac_file's index in $config_headers.
  _am_stamp_count=1
  for _am_header in $config_headers :; do
-@@ -50526,135 +55043,39 @@
+@@ -50526,135 +50267,39 @@
        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
    esac
  done
@@ -53528,7 +51557,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.
-@@ -50664,18 +55085,29 @@
+@@ -50664,18 +50309,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
@@ -53566,7 +51595,7 @@
    else
      continue
    fi
-@@ -50697,53 +55129,79 @@
+@@ -50697,53 +50353,79 @@
         sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
      # Make sure the directory exists.
      test -f "$dirpart/$file" && continue
@@ -53679,7 +51708,7 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(kdeutils, "3.5.5") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(kdeutils, "3.5.6") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
@@ -53880,39 +51909,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -558,7 +567,7 @@
- KDE_DIST=index.docbook commands.docbook kcalc_on_OSF.txt index.cache.bz2 kcalc_on_Aix.txt Makefile.in Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt commands.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kcalc_on_Aix.txt commands.docbook kcalc_on_OSF.txt 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
-@@ -585,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc
--	@for base in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt commands.docbook ; do \
-+	@for base in kcalc_on_Aix.txt commands.docbook kcalc_on_OSF.txt index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt commands.docbook ; do \
-+	for base in kcalc_on_Aix.txt commands.docbook kcalc_on_OSF.txt index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kcalc/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook kcalc_on_Aix.txt kcalc_on_OSF.txt commands.docbook ; do \
-+	for file in kcalc_on_Aix.txt commands.docbook kcalc_on_OSF.txt index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kcharselect/Makefile.in
 +++ doc/kcharselect/Makefile.in
 @@ -94,6 +94,7 @@
@@ -54377,15 +52373,6 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -381,7 +390,7 @@
- xdg_menudir = @xdg_menudir@
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. laptop powerctrl kcmlowbatcrit kcmlowbatwarn
-+SUBDIRS =. powerctrl laptop kcmlowbatcrit kcmlowbatwarn
- KDE_LANG = en
- KDE_DOCS = AUTO
- #>- all: all-recursive
 @@ -389,7 +398,7 @@
  all: docs-am  all-recursive
  
@@ -54892,39 +52879,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -558,7 +567,7 @@
- KDE_DIST=index.docbook kdf_config.png index.cache.bz2 kdf.png Makefile.in Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook kdf.png kdf_config.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kdf.png kdf_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
-@@ -585,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf
--	@for base in index.docbook kdf.png kdf_config.png ; do \
-+	@for base in kdf.png kdf_config.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook kdf.png kdf_config.png ; do \
-+	for base in kdf.png kdf_config.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kdf/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook kdf.png kdf_config.png ; do \
-+	for file in kdf.png kdf_config.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kedit/Makefile.in
 +++ doc/kedit/Makefile.in
 @@ -94,6 +94,7 @@
@@ -55216,43 +53170,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -555,10 +564,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=index.docbook options.png kicker.png keygen.png keymanage.png index.cache.bz2 keys.png Makefile.in editor.png Makefile.am 
-+KDE_DIST=index.docbook options.png kicker.png keymanage.png keygen.png index.cache.bz2 keys.png Makefile.in editor.png Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.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
-@@ -585,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg
--	@for base in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
-+	@for base in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
-+	for base in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kgpg/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in keymanage.png keygen.png index.docbook editor.png kicker.png keys.png options.png ; do \
-+	for file in options.png kicker.png keygen.png keymanage.png editor.png index.docbook keys.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/khexedit/Makefile.in
 +++ doc/khexedit/Makefile.in
 @@ -94,6 +94,7 @@
@@ -55350,39 +53267,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -558,7 +567,7 @@
- KDE_DIST=index.docbook index.cache.bz2 Makefile.in khexedit1.png Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook khexedit1.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) khexedit1.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
-@@ -585,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit
--	@for base in index.docbook khexedit1.png ; do \
-+	@for base in khexedit1.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook khexedit1.png ; do \
-+	for base in khexedit1.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/khexedit/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook khexedit1.png ; do \
-+	for file in khexedit1.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/kinfocenter/blockdevices/Makefile.in
 +++ doc/kinfocenter/blockdevices/Makefile.in
 @@ -94,6 +94,7 @@
@@ -55777,43 +53661,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -556,10 +564,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=repeattool.png begline.png lookaheadtools.png index.docbook characters.png wordboundary.png neglookahead.png compound.png poslookahead.png charactertool.png repeat.png select.png compoundtool.png index.cache.bz2 theEditor.png altntool.png anychartool.png endline.png linestartendtool.png texttool.png boundarytools.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am 
-+KDE_DIST=repeattool.png begline.png lookaheadtools.png index.docbook characters.png wordboundary.png neglookahead.png poslookahead.png compound.png charactertool.png repeat.png select.png compoundtool.png index.cache.bz2 theEditor.png altntool.png anychartool.png endline.png linestartendtool.png texttool.png boundarytools.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.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
-@@ -586,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor
--	@for base in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
-+	@for base in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
-+	for base in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/KRegExpEditor/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in index.docbook altntool.png altn.png boundarytools.png begline.png lookaheadtools.png poslookahead.png endline.png repeattool.png characters.png select.png wordboundary.png repeat.png neglookahead.png compoundtool.png texttool.png anychartool.png compound.png text.png anychar.png theEditor.png linestartendtool.png charactertool.png nonwordboundary.png ; do \
-+	for file in characters.png repeattool.png linestartendtool.png charactertool.png begline.png lookaheadtools.png anychar.png neglookahead.png compound.png anychartool.png boundarytools.png select.png text.png poslookahead.png compoundtool.png repeat.png texttool.png altntool.png wordboundary.png nonwordboundary.png endline.png index.docbook altn.png theEditor.png ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/ksim/Makefile.in
 +++ doc/ksim/Makefile.in
 @@ -94,6 +94,7 @@
@@ -56105,39 +53952,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -558,7 +567,7 @@
- KDE_DIST=index.docbook edit1.png cr22-action-wallet_open.png cr22-action-wallet_closed.png password2.png index.cache.bz2 edit3.png edit2.png Makefile.in kwalletmanager.png Makefile.am password1.png 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.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
-@@ -585,20 +594,20 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet
--	@for base in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
-+	@for base in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
-+	for base in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/kwallet/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in kwalletmanager.png index.docbook cr22-action-wallet_closed.png password1.png password2.png edit1.png edit2.png edit3.png cr22-action-wallet_open.png ; do \
-+	for file in password1.png password2.png edit1.png edit2.png edit3.png kwalletmanager.png cr22-action-wallet_open.png cr22-action-wallet_closed.png index.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
 --- doc/Makefile.in
 +++ doc/Makefile.in
 @@ -110,6 +110,7 @@
@@ -56214,14 +54028,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -383,13 +392,13 @@
- KDE_DOCS = AUTO
- #>- SUBDIRS = $(AUTODIRS)
- #>+ 1
--SUBDIRS =. kfloppy kgpg kcharselect kjots ktimer kcontrol kedit ksim kwallet kdf khexedit kinfocenter KRegExpEditor kdelirc kcalc ark superkaramba
-+SUBDIRS =. ark kdf kgpg ksim kdelirc kfloppy khexedit kcalc kedit kjots kwallet kcontrol ktimer kcharselect superkaramba KRegExpEditor kinfocenter
- #>- all: all-recursive
- #>+ 1
+@@ -389,7 +398,7 @@
  all: docs-am  all-recursive
  
  .SUFFIXES:
@@ -56630,76 +54437,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1179,18 +1188,18 @@
- mocs: kcalc_const_button.moc
- 
- #>+ 3
--dlabel.moc: $(srcdir)/dlabel.h
--	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
-+kcalc_const_menu.moc: $(srcdir)/kcalc_const_menu.h
-+	$(MOC) $(srcdir)/kcalc_const_menu.h -o kcalc_const_menu.moc
- 
- #>+ 2
--mocs: dlabel.moc
-+mocs: kcalc_const_menu.moc
- 
- #>+ 3
--kcalc_const_menu.moc: $(srcdir)/kcalc_const_menu.h
--	$(MOC) $(srcdir)/kcalc_const_menu.h -o kcalc_const_menu.moc
-+dlabel.moc: $(srcdir)/dlabel.h
-+	$(MOC) $(srcdir)/dlabel.h -o dlabel.moc
- 
- #>+ 2
--mocs: kcalc_const_menu.moc
-+mocs: dlabel.moc
- 
- #>+ 3
- kcalc_button.moc: $(srcdir)/kcalc_button.h
-@@ -1201,7 +1210,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kcalc.moc kcalcdisplay.moc kcalc_const_button.moc dlabel.moc kcalc_const_menu.moc kcalc_button.moc
-+	-rm -f  kcalc.moc kcalcdisplay.moc kcalc_const_button.moc kcalc_const_menu.moc dlabel.moc kcalc_button.moc
- 
- #>+ 2
- KDE_DIST=configure.in.bot hi16-app-kcalc.png kcalc.kcfg hisc-app-kcalc.svgz kcalc.desktop confvalues.h hi22-app-kcalc.png colors.ui hi48-app-kcalc.png kcalcui.rc constants.ui configure.in.in kcalcrc.upd general.ui kcalc_settings.kcfgc Makefile.in hi32-app-kcalc.png version.h hi64-app-kcalc.png Makefile.am 
-@@ -1223,26 +1232,26 @@
- 
- #>+ 22
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/hisc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcalc.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcalc.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcalc.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kcalc.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/hisc-app-kcalc.svgz $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcalc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcalc.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kcalc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kcalc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcalc.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/scalable/apps/kcalc.svgz
- 
- #>+ 15
- force-reedit:
 --- kcharselect/Makefile.in
 +++ kcharselect/Makefile.in
 @@ -144,6 +144,7 @@
@@ -56797,27 +54534,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -803,17 +812,17 @@
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcharselect.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcharselect.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kcharselect.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kcharselect.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kcharselect.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kcharselect.png
- 
- #>+ 15
- force-reedit:
 --- kdelirc/icons/Makefile.in
 +++ kdelirc/icons/Makefile.in
 @@ -94,6 +94,7 @@
@@ -56915,80 +54631,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -553,7 +562,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=hi32-action-ledblue.png hi16-action-ledlightblue.png hi32-action-ledlightblue.png hi32-action-ledred.png hi16-action-ledorange.png hi16-action-ledred.png hi16-action-ledyellow.png hi32-action-ledorange.png hi16-action-ledpurple.png hi32-action-ledlightgreen.png hi32-action-ledpurple.png hi32-action-ledyellow.png hi16-action-ledlightgreen.png Makefile.in hi16-action-ledgreen.png hi32-action-ledgreen.png Makefile.am hi16-action-ledblue.png 
-+KDE_DIST=hi32-action-ledblue.png hi16-action-ledlightblue.png hi32-action-ledlightblue.png hi32-action-ledred.png hi16-action-ledorange.png hi16-action-ledred.png hi16-action-ledyellow.png hi32-action-ledorange.png hi16-action-ledpurple.png hi32-action-ledlightgreen.png hi32-action-ledpurple.png hi16-action-ledlightgreen.png hi32-action-ledyellow.png Makefile.in hi16-action-ledgreen.png hi32-action-ledgreen.png Makefile.am hi16-action-ledblue.png 
- 
- #>+ 2
- docs-am:
-@@ -561,41 +570,41 @@
- #>+ 38
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
--	$(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/hi16-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
- 	$(INSTALL_DATA) $(srcdir)/hi32-action-ledgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledgreen.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
-+	$(mkinstalldirs) $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-ledgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledgreen.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
- 	$(INSTALL_DATA) $(srcdir)/hi32-action-ledyellow.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledyellow.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledred.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-ledyellow.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledyellow.png
--	$(INSTALL_DATA) $(srcdir)/hi16-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
- 	$(INSTALL_DATA) $(srcdir)/hi16-action-ledlightblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightblue.png
--	$(INSTALL_DATA) $(srcdir)/hi32-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-ledblue.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-ledlightgreen.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-action-ledpurple.png $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-action-ledorange.png $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
- 	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledgreen.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
- 	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledgreen.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
- 	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledyellow.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledred.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledpurple.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledred.png
- 	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledyellow.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledorange.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightblue.png
- 	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightblue.png
--	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledblue.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledlightgreen.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledblue.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledlightgreen.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/16x16/actions/ledpurple.png
-+	-rm -f $(DESTDIR)$(kdelirciconsdir)/hicolor/32x32/actions/ledorange.png
- 
- #>+ 15
- force-reedit:
 --- kdelirc/irkick/icons/Makefile.in
 +++ kdelirc/irkick/icons/Makefile.in
 @@ -94,6 +94,7 @@
@@ -57183,35 +54825,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kdeinitLTLIBRARIES: $(kdeinit_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1078,22 +1087,22 @@
- 
- #>+ 19
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/irkick.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/lo32-app-irkick.png $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/irkick.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-irkick.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/locolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/lo16-app-irkick.png $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/irkick.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/irkick.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/32x32/apps/irkick.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/irkick.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/irkick.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/locolor/16x16/apps/irkick.png
- 
- #>+ 15
 --- kdelirc/kcmlirc/Makefile.in
 +++ kdelirc/kcmlirc/Makefile.in
 @@ -146,6 +146,7 @@
@@ -57309,49 +54922,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -781,18 +790,18 @@
- mocs: editmode.moc
- 
- #>+ 3
--kcmlirc.moc: $(srcdir)/kcmlirc.h
--	$(MOC) $(srcdir)/kcmlirc.h -o kcmlirc.moc
-+editaction.moc: $(srcdir)/editaction.h
-+	$(MOC) $(srcdir)/editaction.h -o editaction.moc
- 
- #>+ 2
--mocs: kcmlirc.moc
-+mocs: editaction.moc
- 
- #>+ 3
--editaction.moc: $(srcdir)/editaction.h
--	$(MOC) $(srcdir)/editaction.h -o editaction.moc
-+kcmlirc.moc: $(srcdir)/kcmlirc.h
-+	$(MOC) $(srcdir)/kcmlirc.h -o kcmlirc.moc
- 
- #>+ 2
--mocs: editaction.moc
-+mocs: kcmlirc.moc
- 
- #>+ 3
- modeslist.moc: $(srcdir)/modeslist.h
-@@ -810,7 +819,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  editmode.moc kcmlirc.moc editaction.moc modeslist.moc addaction.moc
-+	-rm -f  editmode.moc editaction.moc kcmlirc.moc modeslist.moc addaction.moc
- 
- #>+ 2
- KDE_DIST=newmode.ui selectprofile.ui newmode.ui.h editmodebase.ui kcmlirc.desktop editaction.h addactionbase.ui kcmlircbase.ui editactionbase.ui Makefile.in kcmlircbase.ui.h modeslist.h editmode.h Makefile.am 
-@@ -876,7 +885,7 @@
- 
- 
- #>+ 11
--kcm_kcmlirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmlirc.cpp $(srcdir)/addaction.cpp $(srcdir)/editmode.cpp $(srcdir)/editaction.cpp $(srcdir)/modeslist.cpp kcmlirc_skel.cpp selectprofile.cpp newmode.cpp kcmlircbase.cpp addactionbase.cpp editactionbase.cpp editmodebase.cpp  editmode.moc modeslist.moc newmode.moc addaction.moc addactionbase.moc kcmlirc.moc editaction.moc editactionbase.moc selectprofile.moc kcmlircbase.moc editmodebase.moc
-+kcm_kcmlirc_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kcmlirc.cpp $(srcdir)/addaction.cpp $(srcdir)/editmode.cpp $(srcdir)/editaction.cpp $(srcdir)/modeslist.cpp kcmlirc_skel.cpp selectprofile.cpp newmode.cpp kcmlircbase.cpp addactionbase.cpp editactionbase.cpp editmodebase.cpp  editmode.moc modeslist.moc newmode.moc addaction.moc addactionbase.moc editaction.moc kcmlirc.moc editactionbase.moc selectprofile.moc kcmlircbase.moc editmodebase.moc
- 	@echo 'creating kcm_kcmlirc_la.all_cpp.cpp ...'; \
- 	rm -f kcm_kcmlirc_la.all_cpp.files kcm_kcmlirc_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kcm_kcmlirc_la.all_cpp.final; \
 --- kdelirc/kdelirc/Makefile.in
 +++ kdelirc/kdelirc/Makefile.in
 @@ -135,6 +135,7 @@
@@ -57643,15 +55213,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -581,7 +590,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=konqueror.profile.xml noatun.profile.xml profile.dtd Makefile.in klauncher.profile.xml Makefile.am 
-+KDE_DIST=konqueror.profile.xml noatun.profile.xml profile.dtd Makefile.in Makefile.am klauncher.profile.xml 
- 
- #>+ 2
- docs-am:
 --- kdelirc/remotes/Makefile.in
 +++ kdelirc/remotes/Makefile.in
 @@ -104,6 +104,7 @@
@@ -57943,52 +55504,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1021,13 +1030,6 @@
- mocs: disks.moc
- 
- #>+ 3
--kdfconfig.moc: $(srcdir)/kdfconfig.h
--	$(MOC) $(srcdir)/kdfconfig.h -o kdfconfig.moc
--
--#>+ 2
--mocs: kdfconfig.moc
--
--#>+ 3
- listview.moc: $(srcdir)/listview.h
- 	$(MOC) $(srcdir)/listview.h -o listview.moc
- 
-@@ -1042,6 +1044,13 @@
- mocs: kcmdf.moc
- 
- #>+ 3
-+kdfconfig.moc: $(srcdir)/kdfconfig.h
-+	$(MOC) $(srcdir)/kdfconfig.h -o kdfconfig.moc
-+
-+#>+ 2
-+mocs: kdfconfig.moc
-+
-+#>+ 3
- kdf.moc: $(srcdir)/kdf.h
- 	$(MOC) $(srcdir)/kdf.h -o kdf.moc
- 
-@@ -1064,7 +1073,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kdfwidget.moc disklist.moc mntconfig.moc disks.moc kdfconfig.moc listview.moc kcmdf.moc kdf.moc kwikdisk.moc optiondialog.moc
-+	-rm -f  kdfwidget.moc disklist.moc mntconfig.moc disks.moc listview.moc kcmdf.moc kdfconfig.moc kdf.moc kwikdisk.moc optiondialog.moc
- 
- #>+ 2
- KDE_DIST=kdfui.rc kconftest.cpp kwikdisk.desktop kdf.desktop Makefile.in kcmdf.desktop Makefile.am 
-@@ -1115,7 +1124,7 @@
- 
- 
- #>+ 11
--libkdf_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdfwidget.cpp $(srcdir)/kdfconfig.cpp $(srcdir)/mntconfig.cpp $(srcdir)/disklist.cpp $(srcdir)/disks.cpp $(srcdir)/listview.cpp $(srcdir)/optiondialog.cpp $(srcdir)/stdoption.cpp  kdfwidget.moc disklist.moc mntconfig.moc disks.moc kdfconfig.moc listview.moc optiondialog.moc
-+libkdf_common_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kdfwidget.cpp $(srcdir)/kdfconfig.cpp $(srcdir)/mntconfig.cpp $(srcdir)/disklist.cpp $(srcdir)/disks.cpp $(srcdir)/listview.cpp $(srcdir)/optiondialog.cpp $(srcdir)/stdoption.cpp  kdfwidget.moc disklist.moc mntconfig.moc disks.moc listview.moc kdfconfig.moc optiondialog.moc
- 	@echo 'creating libkdf_common_la.all_cpp.cpp ...'; \
- 	rm -f libkdf_common_la.all_cpp.files libkdf_common_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkdf_common_la.all_cpp.final; \
 --- kdf/pics/Makefile.in
 +++ kdf/pics/Makefile.in
 @@ -104,6 +104,7 @@
@@ -58086,89 +55601,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -584,54 +593,54 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr32-app-kcmdf.png hi32-app-kwikdisk.png hi16-app-kwikdisk.png hi48-app-kdf.png delete.png cr16-app-kcmdf.png hi128-app-kdf.png cr22-app-kcmdf.png hi64-app-kwikdisk.png hi64-app-kdf.png mini-root.png hi22-app-kwikdisk.png hi32-app-kdf.png hi48-app-kwikdisk.png hi128-app-kwikdisk.png Makefile.in hi22-app-kdf.png tick.png hi16-app-kdf.png Makefile.am 
-+KDE_DIST=cr32-app-kcmdf.png hi32-app-kwikdisk.png hi16-app-kwikdisk.png hi48-app-kdf.png delete.png cr16-app-kcmdf.png hi128-app-kdf.png cr22-app-kcmdf.png hi64-app-kwikdisk.png hi64-app-kdf.png mini-root.png hi22-app-kwikdisk.png hi48-app-kwikdisk.png hi32-app-kdf.png hi128-app-kwikdisk.png Makefile.in tick.png hi22-app-kdf.png hi16-app-kdf.png Makefile.am 
- 
- #>+ 2
- docs-am:
- 
- #>+ 43
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwikdisk.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
--	$(INSTALL_DATA) $(srcdir)/hi48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdf.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/cr22-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdf.png
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwikdisk.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdf.png
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kdf.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-kcmdf.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-kwikdisk.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwikdisk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/kcmdf.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwikdisk.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwikdisk.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwikdisk.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwikdisk.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/kcmdf.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwikdisk.png
- 
- #>+ 15
- force-reedit:
 --- kedit/Makefile.in
 +++ kedit/Makefile.in
 @@ -180,6 +180,7 @@
@@ -58363,31 +55795,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -559,21 +568,21 @@
- 
- #>+ 19
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kedit.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kedit.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kedit.png
- 
 --- kfloppy/Makefile.in
 +++ kfloppy/Makefile.in
 @@ -145,6 +145,7 @@
@@ -58485,50 +55892,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -785,33 +794,33 @@
- 	-rm -f  format.moc floppy.moc
- 
- #>+ 2
--KDE_DIST=zip.cpp format.h hi128-app-kfloppy.png floppy_format.desktop hi32-app-kfloppy.png debug.h hi48-app-kfloppy.png hi22-app-kfloppy.png Makefile.in KFloppy.desktop hi64-app-kfloppy.png hi16-app-kfloppy.png zip.h Makefile.am 
-+KDE_DIST=zip.cpp format.h hi128-app-kfloppy.png floppy_format.desktop hi32-app-kfloppy.png debug.h hi48-app-kfloppy.png hi22-app-kfloppy.png KFloppy.desktop Makefile.in hi64-app-kfloppy.png hi16-app-kfloppy.png zip.h Makefile.am 
- 
- #>+ 2
- docs-am:
- 
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfloppy.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/hi64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfloppy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kfloppy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/hi64-app-kfloppy.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kfloppy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kfloppy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kfloppy.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kfloppy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kfloppy.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kfloppy.png
- 
- #>+ 15
- force-reedit:
 --- kgpg/icons/Makefile.in
 +++ kgpg/icons/Makefile.in
 @@ -94,6 +94,7 @@
@@ -58626,58 +55989,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -561,37 +570,37 @@
- #>+ 34
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_identity.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_edit.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_term.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_gen.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_gen.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_photo.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_import.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_import.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_identity.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_info.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_info.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_photo.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_edit.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_export.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_show.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_sign.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
- 	$(mkinstalldirs) $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key1.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key1.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key2.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key2.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key3.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key3.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-kgpg_key4.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key4.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_show.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_sign.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_export.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-kgpg_term.png $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_gen.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_import.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_identity.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_info.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_photo.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_edit.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key1.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key2.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key3.png
- 	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/16x16/actions/kgpg_key4.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_show.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_sign.png
--	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_export.png
-+	-rm -f $(DESTDIR)$(kgpgiconsdir)/crystalsvg/22x22/actions/kgpg_term.png
- 
- #>+ 15
- force-reedit:
 --- kgpg/Makefile.in
 +++ kgpg/Makefile.in
 @@ -174,6 +174,7 @@
@@ -58775,80 +56086,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1079,18 +1088,18 @@
- mocs: kgpgview.moc
- 
- #>+ 3
--popuppublic.moc: $(srcdir)/popuppublic.h
--	$(MOC) $(srcdir)/popuppublic.h -o popuppublic.moc
-+keyinfowidget.moc: $(srcdir)/keyinfowidget.h
-+	$(MOC) $(srcdir)/keyinfowidget.h -o keyinfowidget.moc
- 
- #>+ 2
--mocs: popuppublic.moc
-+mocs: keyinfowidget.moc
- 
- #>+ 3
--keyinfowidget.moc: $(srcdir)/keyinfowidget.h
--	$(MOC) $(srcdir)/keyinfowidget.h -o keyinfowidget.moc
-+popuppublic.moc: $(srcdir)/popuppublic.h
-+	$(MOC) $(srcdir)/popuppublic.h -o popuppublic.moc
- 
- #>+ 2
--mocs: keyinfowidget.moc
-+mocs: popuppublic.moc
- 
- #>+ 3
- keyservers.moc: $(srcdir)/keyservers.h
-@@ -1101,10 +1110,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kgpglibrary.moc keygener.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc listkeys.moc kgpgview.moc popuppublic.moc keyinfowidget.moc keyservers.moc
-+	-rm -f  kgpglibrary.moc keygener.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc listkeys.moc kgpgview.moc keyinfowidget.moc popuppublic.moc keyservers.moc
- 
- #>+ 2
--KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui hi22-app-kgpg.png encryptfile.desktop kgpgwizard.ui kgpginterface.h listkeys.h tips newkey.ui.h conf_gpg.ui groupedit.ui hi48-app-kgpg.png kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h keyproperties.ui dcopiface.h conf_misc.ui keyservers.h adduid.ui kgpgview.h hi32-app-kgpg.png keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h kgpg.desktop hi16-app-kgpg.png conf_decryption.ui Makefile.am popuppublic.h detailedconsole.h kgpgsettings.kcfgc keyexport.ui 
-+KDE_DIST=kgpg_docked.png listkeys.rc sourceselect.ui kgpg_blank.png conf_servers.ui conf_ui2.ui kgpglibrary.h kgpg.rc kgpg_docked.gif conf_encryption.ui.h keyserver.ui kgpgsettings_addons.h searchres.ui kgpg_anim.gif kgpg_fill.png encryptfolder.desktop kgpgrevokewidget.ui hi22-app-kgpg.png encryptfile.desktop kgpgwizard.ui kgpginterface.h listkeys.h tips newkey.ui.h conf_gpg.ui groupedit.ui hi48-app-kgpg.png kgpg.h kgpgoptions.h kgpg.kcfg kgpgrevokewidget.ui.h keyproperties.ui conf_misc.ui dcopiface.h keyservers.h adduid.ui hi32-app-kgpg.png kgpgview.h keygener.h Makefile.in keyinfowidget.h keyexport.ui.h conf_encryption.ui newkey.ui kgpgeditor.h kgpg.desktop hi16-app-kgpg.png conf_decryption.ui detailedconsole.h Makefile.am popuppublic.h kgpgsettings.kcfgc keyexport.ui 
- 
- #>+ 4
- clean-idl:
-@@ -1141,20 +1150,20 @@
- 
- #>+ 16
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgpg.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgpg.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kgpg.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kgpg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kgpg.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kgpg.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kgpg.png
- 
- #>+ 15
- force-reedit:
-@@ -1195,7 +1204,7 @@
- 
- 
- #>+ 11
--kgpg.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgpgoptions.cpp $(srcdir)/listkeys.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgview.cpp $(srcdir)/kgpg.cpp $(srcdir)/main.cpp $(srcdir)/keygener.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/keyservers.cpp $(srcdir)/kgpgeditor.cpp $(srcdir)/detailedconsole.cpp $(srcdir)/kgpglibrary.cpp $(srcdir)/keyinfowidget.cpp dcopiface_skel.cpp keyserver.cpp searchres.cpp kgpgwizard.cpp keyproperties.cpp conf_encryption.cpp conf_decryption.cpp conf_gpg.cpp groupedit.cpp kgpgrevokewidget.cpp newkey.cpp adduid.cpp keyexport.cpp sourceselect.cpp conf_servers.cpp conf_ui2.cpp conf_misc.cpp kgpgsettings.cpp  keyserver.moc keygener.moc conf_misc.moc kgpgrevokewidget.moc searchres.moc kgpgview.moc listkeys.moc sourceselect.moc adduid.moc keyinfowidget.moc popuppublic.moc newkey.moc keyproperties.moc conf_gpg.moc keyexport.moc kgpglibrary.moc conf_decryption.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc conf_encryption.moc conf_servers.moc groupedit.moc keyservers.moc conf_ui2.moc kgpgwizard.moc
-+kgpg.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kgpgoptions.cpp $(srcdir)/listkeys.cpp $(srcdir)/popuppublic.cpp $(srcdir)/kgpgview.cpp $(srcdir)/kgpg.cpp $(srcdir)/main.cpp $(srcdir)/keygener.cpp $(srcdir)/kgpginterface.cpp $(srcdir)/keyservers.cpp $(srcdir)/kgpgeditor.cpp $(srcdir)/detailedconsole.cpp $(srcdir)/kgpglibrary.cpp $(srcdir)/keyinfowidget.cpp dcopiface_skel.cpp keyserver.cpp searchres.cpp kgpgwizard.cpp keyproperties.cpp conf_encryption.cpp conf_decryption.cpp conf_gpg.cpp groupedit.cpp kgpgrevokewidget.cpp newkey.cpp adduid.cpp keyexport.cpp sourceselect.cpp conf_servers.cpp conf_ui2.cpp conf_misc.cpp kgpgsettings.cpp  keyserver.moc keygener.moc conf_misc.moc kgpgrevokewidget.moc searchres.moc kgpgview.moc listkeys.moc sourceselect.moc adduid.moc popuppublic.moc keyinfowidget.moc newkey.moc keyproperties.moc conf_gpg.moc keyexport.moc kgpglibrary.moc conf_decryption.moc kgpg.moc kgpgoptions.moc kgpginterface.moc kgpgeditor.moc conf_encryption.moc conf_servers.moc groupedit.moc keyservers.moc conf_ui2.moc kgpgwizard.moc
- 	@echo 'creating kgpg.all_cpp.cpp ...'; \
- 	rm -f kgpg.all_cpp.files kgpg.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kgpg.all_cpp.final; \
 --- khexedit/lib/codecs/Makefile.in
 +++ khexedit/lib/codecs/Makefile.in
 @@ -136,6 +136,7 @@
@@ -59237,75 +56474,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -1002,11 +1011,11 @@
- mocs: listview.moc
- 
- #>+ 3
--hexmanagerwidget.moc: $(srcdir)/hexmanagerwidget.h
--	$(MOC) $(srcdir)/hexmanagerwidget.h -o hexmanagerwidget.moc
-+chartabledialog.moc: $(srcdir)/chartabledialog.h
-+	$(MOC) $(srcdir)/chartabledialog.h -o chartabledialog.moc
- 
- #>+ 2
--mocs: hexmanagerwidget.moc
-+mocs: chartabledialog.moc
- 
- #>+ 3
- searchbar.moc: $(srcdir)/searchbar.h
-@@ -1016,11 +1025,11 @@
- mocs: searchbar.moc
- 
- #>+ 3
--chartabledialog.moc: $(srcdir)/chartabledialog.h
--	$(MOC) $(srcdir)/chartabledialog.h -o chartabledialog.moc
-+hexmanagerwidget.moc: $(srcdir)/hexmanagerwidget.h
-+	$(MOC) $(srcdir)/hexmanagerwidget.h -o hexmanagerwidget.moc
- 
- #>+ 2
--mocs: chartabledialog.moc
-+mocs: hexmanagerwidget.moc
- 
- #>+ 3
- optiondialog.moc: $(srcdir)/optiondialog.h
-@@ -1087,7 +1096,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc hexmanagerwidget.moc searchbar.moc chartabledialog.moc optiondialog.moc bitswapwidget.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
-+	-rm -f  hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc optiondialog.moc bitswapwidget.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
- 
- #>+ 2
- KDE_DIST=bitswapwidget.h khexedit.desktop stringdialog.h hi16-app-khexedit.png hi48-app-khexedit.png configure.in.in khexeditui.rc hi32-app-khexedit.png Makefile.in version.h Makefile.am 
-@@ -1097,17 +1106,17 @@
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khexedit.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khexedit.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-khexedit.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/khexedit.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/khexedit.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/khexedit.png
- 
- #>+ 15
- force-reedit:
-@@ -1148,7 +1157,7 @@
- 
- 
- #>+ 11
--khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc  hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc chartabledialog.moc searchbar.moc hexmanagerwidget.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
-+khexedit.all_cc.cc: $(srcdir)/Makefile.in $(srcdir)/main.cc $(srcdir)/toplevel.cc $(srcdir)/hexmanagerwidget.cc $(srcdir)/hexeditorwidget.cc $(srcdir)/hextoolwidget.cc $(srcdir)/hexviewwidget.cc $(srcdir)/hexbuffer.cc $(srcdir)/conversion.cc $(srcdir)/dialog.cc $(srcdir)/hexvalidator.cc $(srcdir)/hexclipboard.cc $(srcdir)/optiondialog.cc $(srcdir)/printdialogpage.cc $(srcdir)/statusbarprogress.cc $(srcdir)/hexprinter.cc $(srcdir)/hexerror.cc $(srcdir)/draglabel.cc $(srcdir)/stringdialog.cc $(srcdir)/bitswapwidget.cc $(srcdir)/chartabledialog.cc $(srcdir)/hexdrag.cc $(srcdir)/exportdialog.cc $(srcdir)/fileinfodialog.cc $(srcdir)/converterdialog.cc $(srcdir)/listview.cc $(srcdir)/searchbar.cc  hexvalidator.moc converterdialog.moc fileinfodialog.moc exportdialog.moc hextoolwidget.moc dialog.moc printdialogpage.moc listview.moc hexmanagerwidget.moc searchbar.moc chartabledialog.moc bitswapwidget.moc optiondialog.moc statusbarprogress.moc hexeditorwidget.moc hexviewwidget.moc hexdrag.moc draglabel.moc toplevel.moc stringdialog.moc
- 	@echo 'creating khexedit.all_cc.cc ...'; \
- 	rm -f khexedit.all_cc.files khexedit.all_cc.final; \
- 	echo "#define KDE_USE_FINAL 1" >> khexedit.all_cc.final; \
 --- khexedit/parts/kbytesedit/Makefile.in
 +++ khexedit/parts/kbytesedit/Makefile.in
 @@ -141,6 +141,7 @@
@@ -59791,30 +56959,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -593,20 +602,20 @@
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjots.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjots.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjots.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kjots.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjots.png
- 
- uninstall-kde-icons:
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kjots.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kjots.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kjots.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kjots.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kjots.png
- 
- #>+ 15
 --- kjots/Makefile.in
 +++ kjots/Makefile.in
 @@ -162,6 +162,7 @@
@@ -59912,45 +57056,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -935,22 +944,22 @@
- mocs: KJotsMain.moc
- 
- #>+ 3
--kjotsentry.moc: $(srcdir)/kjotsentry.h
--	$(MOC) $(srcdir)/kjotsentry.h -o kjotsentry.moc
-+kjotsbookmarks.moc: $(srcdir)/kjotsbookmarks.h
-+	$(MOC) $(srcdir)/kjotsbookmarks.h -o kjotsbookmarks.moc
- 
- #>+ 2
--mocs: kjotsentry.moc
-+mocs: kjotsbookmarks.moc
- 
- #>+ 3
--kjotsbookmarks.moc: $(srcdir)/kjotsbookmarks.h
--	$(MOC) $(srcdir)/kjotsbookmarks.h -o kjotsbookmarks.moc
-+kjotsentry.moc: $(srcdir)/kjotsentry.h
-+	$(MOC) $(srcdir)/kjotsentry.h -o kjotsentry.moc
- 
- #>+ 2
--mocs: kjotsbookmarks.moc
-+mocs: kjotsentry.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kjotsedit.moc KJotsMain.moc kjotsentry.moc kjotsbookmarks.moc
-+	-rm -f  kjotsedit.moc KJotsMain.moc kjotsbookmarks.moc kjotsentry.moc
- 
- #>+ 2
- KDE_DIST=kjotsbookmarks.h kjots.kcfg kjotsedit.h kjotsui.rc ANNOUNCE confpagemisc.ui kjotsentry.h confpagefont.ui KJotsSettings.kcfgc CHANGES KJotsMain.h Makefile.in Kjots.desktop BUGS Makefile.am 
-@@ -1008,7 +1017,7 @@
- 
- 
- #>+ 11
--kjots.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/KJotsMain.cpp $(srcdir)/kjotsentry.cpp $(srcdir)/kjotsedit.cpp $(srcdir)/kjotsbookmarks.cpp confpagefont.cpp confpagemisc.cpp KJotsSettings.cpp  kjotsedit.moc KJotsMain.moc confpagemisc.moc confpagefont.moc kjotsbookmarks.moc kjotsentry.moc
-+kjots.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/main.cpp $(srcdir)/KJotsMain.cpp $(srcdir)/kjotsentry.cpp $(srcdir)/kjotsedit.cpp $(srcdir)/kjotsbookmarks.cpp confpagefont.cpp confpagemisc.cpp KJotsSettings.cpp  kjotsedit.moc KJotsMain.moc confpagemisc.moc confpagefont.moc kjotsentry.moc kjotsbookmarks.moc
- 	@echo 'creating kjots.all_cpp.cpp ...'; \
- 	rm -f kjots.all_cpp.files kjots.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> kjots.all_cpp.final; \
 --- klaptopdaemon/applnk/Makefile.in
 +++ klaptopdaemon/applnk/Makefile.in
 @@ -105,6 +105,7 @@
@@ -60145,69 +57250,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1082,18 +1091,18 @@
- mocs: profile.moc
- 
- #>+ 3
--apm.moc: $(srcdir)/apm.h
--	$(MOC) $(srcdir)/apm.h -o apm.moc
-+acpi.moc: $(srcdir)/acpi.h
-+	$(MOC) $(srcdir)/acpi.h -o acpi.moc
- 
- #>+ 2
--mocs: apm.moc
-+mocs: acpi.moc
- 
- #>+ 3
--acpi.moc: $(srcdir)/acpi.h
--	$(MOC) $(srcdir)/acpi.h -o acpi.moc
-+apm.moc: $(srcdir)/apm.h
-+	$(MOC) $(srcdir)/apm.h -o apm.moc
- 
- #>+ 2
--mocs: acpi.moc
-+mocs: apm.moc
- 
- #>+ 3
- battery.moc: $(srcdir)/battery.h
-@@ -1159,18 +1168,18 @@
- mocs: main.moc
- 
- #>+ 3
--pcmcia.moc: $(srcdir)/pcmcia.h
--	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
-+warning.moc: $(srcdir)/warning.h
-+	$(MOC) $(srcdir)/warning.h -o warning.moc
- 
- #>+ 2
--mocs: pcmcia.moc
-+mocs: warning.moc
- 
- #>+ 3
--warning.moc: $(srcdir)/warning.h
--	$(MOC) $(srcdir)/warning.h -o warning.moc
-+pcmcia.moc: $(srcdir)/pcmcia.h
-+	$(MOC) $(srcdir)/pcmcia.h -o pcmcia.moc
- 
- #>+ 2
--mocs: warning.moc
-+mocs: pcmcia.moc
- 
- #>+ 3
- buttons.moc: $(srcdir)/buttons.h
-@@ -1194,10 +1203,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  profile.moc apm.moc acpi.moc battery.moc daemondock.moc xautolock.moc power.moc krichtextlabel.moc laptop_daemon.moc kpcmcia.moc kpcmciainfo.moc main.moc pcmcia.moc warning.moc buttons.moc sony.moc
-+	-rm -f  profile.moc acpi.moc apm.moc battery.moc daemondock.moc xautolock.moc power.moc krichtextlabel.moc laptop_daemon.moc kpcmcia.moc kpcmciainfo.moc main.moc warning.moc pcmcia.moc buttons.moc sony.moc
- 
- #>+ 2
--KDE_DIST=configure.in.bot pcmcia.h portable.h power.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h apm.h thinkpad_common.h daemon_state.h krichtextlabel.h buttons.h warning.h checkcrc.h kpcmcia.h smapibios.h configure.in.in acpi.h sony.h Makefile.in battery.h version.h smapidev.h profile.h xautolock.h smapi.h Makefile.am 
-+KDE_DIST=configure.in.bot pcmcia.h power.h portable.h daemondock.h laptop_daemon.h kpcmciainfo.h main.h apm.h thinkpad_common.h daemon_state.h krichtextlabel.h buttons.h warning.h checkcrc.h kpcmcia.h smapibios.h configure.in.in acpi.h sony.h Makefile.in battery.h version.h smapidev.h profile.h xautolock.h smapi.h Makefile.am 
- 
- #>+ 4
- clean-idl:
 --- klaptopdaemon/pics/actions/Makefile.in
 +++ klaptopdaemon/pics/actions/Makefile.in
 @@ -94,6 +94,7 @@
@@ -60305,67 +57347,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -561,41 +570,41 @@
- #>+ 39
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions
--	$(INSTALL_DATA) $(srcdir)/cr16-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
-+	$(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions
-+	$(INSTALL_DATA) $(srcdir)/cr32-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
- 	$(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions
--	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_power.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nobattery.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-laptop_nobattery.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nobattery.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
--	$(mkinstalldirs) $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions
--	$(INSTALL_DATA) $(srcdir)/cr32-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/power.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-alt2_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_power.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-alt3_laptop_power.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
--	$(INSTALL_DATA) $(srcdir)/cr16-action-alt_laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-laptop_charge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-action-laptop_nocharge.png $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nocharge.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nobattery.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_power.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_charge.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nobattery.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_power.png
-+	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nobattery.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_nocharge.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_nocharge.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/32x32/actions/power.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/power.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt2_laptop_power.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt3_laptop_power.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_nocharge.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/alt_laptop_nocharge.png
--	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/22x22/actions/laptop_charge.png
- 	-rm -f $(DESTDIR)$(klaptopdaemoniconsdir)/crystalsvg/16x16/actions/laptop_nocharge.png
- 
- #>+ 15
 --- klaptopdaemon/pics/Makefile.in
 +++ klaptopdaemon/pics/Makefile.in
 @@ -110,6 +110,7 @@
@@ -60463,57 +57444,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -727,32 +736,32 @@
- 
- #>+ 28
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/cr32-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
-+	$(INSTALL_DATA) $(srcdir)/crsc-app-laptop_battery.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/cr16-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
--	$(INSTALL_DATA) $(srcdir)/cr32-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
--	$(INSTALL_DATA) $(srcdir)/crsc-app-laptop_battery.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
--	$(INSTALL_DATA) $(srcdir)/cr48-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
-+	$(INSTALL_DATA) $(srcdir)/cr32-app-laptop_pcmcia.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
-+	$(INSTALL_DATA) $(srcdir)/cr16-app-laptop_battery.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_battery.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/laptop_battery.svgz
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/laptop_pcmcia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_pcmcia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_battery.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/laptop_battery.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/laptop_battery.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/laptop_pcmcia.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/laptop_battery.png
- 
- #>+ 15
- force-reedit:
 --- kmilo/asus/Makefile.in
 +++ kmilo/asus/Makefile.in
 @@ -162,6 +162,7 @@
@@ -61193,40 +58123,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -897,18 +906,18 @@
- 
- 
- #>+ 3
--kmilo_kvaio.moc.cpp: $(srcdir)/kmilo_kvaio.h
--	$(MOC) $(srcdir)/kmilo_kvaio.h -o kmilo_kvaio.moc.cpp
-+kvaio.moc: $(srcdir)/kvaio.h
-+	$(MOC) $(srcdir)/kvaio.h -o kvaio.moc
- 
- #>+ 2
--mocs: kmilo_kvaio.moc.cpp
-+mocs: kvaio.moc
- 
- #>+ 3
--kvaio.moc: $(srcdir)/kvaio.h
--	$(MOC) $(srcdir)/kvaio.h -o kvaio.moc
-+kmilo_kvaio.moc.cpp: $(srcdir)/kmilo_kvaio.h
-+	$(MOC) $(srcdir)/kmilo_kvaio.h -o kmilo_kvaio.moc.cpp
- 
- #>+ 2
--mocs: kvaio.moc
-+mocs: kmilo_kvaio.moc.cpp
- 
- #>+ 3
- kvaiodriverinterface.moc: $(srcdir)/kvaiodriverinterface.h
-@@ -919,7 +928,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kmilo_kvaio.moc.cpp kvaio.moc kvaiodriverinterface.moc
-+	-rm -f  kvaio.moc kmilo_kvaio.moc.cpp kvaiodriverinterface.moc
- 
- #>+ 2
- KDE_DIST=README.sonypi.h sonypi.h kmilo_kvaio.desktop Makefile.in Makefile.am 
 --- kmilo/Makefile.in
 +++ kmilo/Makefile.in
 @@ -111,6 +111,7 @@
@@ -62003,138 +58899,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1137,13 +1146,6 @@
- 
- 
- #>+ 3
--kregexpeditorprivate.moc: $(srcdir)/kregexpeditorprivate.h
--	$(MOC) $(srcdir)/kregexpeditorprivate.h -o kregexpeditorprivate.moc
--
--#>+ 2
--mocs: kregexpeditorprivate.moc
--
--#>+ 3
- textwidget.moc: $(srcdir)/textwidget.h
- 	$(MOC) $(srcdir)/textwidget.h -o textwidget.moc
- 
-@@ -1158,6 +1160,13 @@
- mocs: verifier.moc
- 
- #>+ 3
-+kregexpeditorprivate.moc: $(srcdir)/kregexpeditorprivate.h
-+	$(MOC) $(srcdir)/kregexpeditorprivate.h -o kregexpeditorprivate.moc
-+
-+#>+ 2
-+mocs: kregexpeditorprivate.moc
-+
-+#>+ 3
- regexpwidget.moc: $(srcdir)/regexpwidget.h
- 	$(MOC) $(srcdir)/regexpwidget.h -o regexpwidget.moc
- 
-@@ -1172,18 +1181,18 @@
- mocs: kregexpeditorgui.moc
- 
- #>+ 3
--verifybuttons.moc: $(srcdir)/verifybuttons.h
--	$(MOC) $(srcdir)/verifybuttons.h -o verifybuttons.moc
-+singlecontainerwidget.moc: $(srcdir)/singlecontainerwidget.h
-+	$(MOC) $(srcdir)/singlecontainerwidget.h -o singlecontainerwidget.moc
- 
- #>+ 2
--mocs: verifybuttons.moc
-+mocs: singlecontainerwidget.moc
- 
- #>+ 3
--singlecontainerwidget.moc: $(srcdir)/singlecontainerwidget.h
--	$(MOC) $(srcdir)/singlecontainerwidget.h -o singlecontainerwidget.moc
-+verifybuttons.moc: $(srcdir)/verifybuttons.h
-+	$(MOC) $(srcdir)/verifybuttons.h -o verifybuttons.moc
- 
- #>+ 2
--mocs: singlecontainerwidget.moc
-+mocs: verifybuttons.moc
- 
- #>+ 3
- compoundwidget.moc: $(srcdir)/compoundwidget.h
-@@ -1200,18 +1209,18 @@
- mocs: scrollededitorwindow.moc
- 
- #>+ 3
--editorwindow.moc: $(srcdir)/editorwindow.h
--	$(MOC) $(srcdir)/editorwindow.h -o editorwindow.moc
-+charselector.moc: $(srcdir)/charselector.h
-+	$(MOC) $(srcdir)/charselector.h -o charselector.moc
- 
- #>+ 2
--mocs: editorwindow.moc
-+mocs: charselector.moc
- 
- #>+ 3
--charselector.moc: $(srcdir)/charselector.h
--	$(MOC) $(srcdir)/charselector.h -o charselector.moc
-+editorwindow.moc: $(srcdir)/editorwindow.h
-+	$(MOC) $(srcdir)/editorwindow.h -o editorwindow.moc
- 
- #>+ 2
--mocs: charselector.moc
-+mocs: editorwindow.moc
- 
- #>+ 3
- userdefinedregexps.moc: $(srcdir)/userdefinedregexps.h
-@@ -1280,7 +1289,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  kregexpeditorprivate.moc textwidget.moc verifier.moc regexpwidget.moc kregexpeditorgui.moc verifybuttons.moc singlecontainerwidget.moc compoundwidget.moc scrollededitorwindow.moc editorwindow.moc charselector.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
-+	-rm -f  textwidget.moc verifier.moc kregexpeditorprivate.moc regexpwidget.moc kregexpeditorgui.moc singlecontainerwidget.moc verifybuttons.moc compoundwidget.moc scrollededitorwindow.moc charselector.moc editorwindow.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
- 
- #>+ 2
- KDE_DIST=hi64-app-kregexpeditor.png gen_qregexpparser.hh hi16-app-kregexpeditor.png kregexpeditor.svgz kregexpeditor.desktop qregexpparser.l altnwidget.h extractrc-from-regexp hi32-app-kregexpeditor.png hi48-app-kregexpeditor.png hi22-app-kregexpeditor.png Comments Makefile.in qregexpparser.y kregexpeditorgui.desktop hi128-app-kregexpeditor.png Makefile.am 
-@@ -1294,26 +1303,26 @@
- 
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
--	$(INSTALL_DATA) $(srcdir)/hi22-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kregexpeditor.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
-+	$(INSTALL_DATA) $(srcdir)/hi32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
-+	$(INSTALL_DATA) $(srcdir)/hi22-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kregexpeditor.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/hi128-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kregexpeditor.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
--	$(INSTALL_DATA) $(srcdir)/hi32-app-kregexpeditor.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kregexpeditor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kregexpeditor.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kregexpeditor.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kregexpeditor.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kregexpeditor.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kregexpeditor.png
- 
- #>+ 15
- force-reedit:
-@@ -1354,7 +1363,7 @@
- 
- 
- #>+ 11
--libkregexpeditorcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kregexpeditorgui.cpp $(srcdir)/editorwindow.cpp $(srcdir)/regexpwidget.cpp $(srcdir)/drag.cpp $(srcdir)/concwidget.cpp $(srcdir)/zerowidgets.cpp $(srcdir)/dragaccepter.cpp $(srcdir)/repeatwidget.cpp $(srcdir)/characterswidget.cpp $(srcdir)/altnwidget.cpp $(srcdir)/limitedcharlineedit.cpp $(srcdir)/textregexp.cpp $(srcdir)/textrangeregexp.cpp $(srcdir)/concregexp.cpp $(srcdir)/altnregexp.cpp $(srcdir)/positionregexp.cpp $(srcdir)/dotregexp.cpp $(srcdir)/repeatregexp.cpp $(srcdir)/textwidget.cpp $(srcdir)/selectablelineedit.cpp $(srcdir)/multicontainerwidget.cpp $(srcdir)/scrollededitorwindow.cpp $(srcdir)/compoundwidget.cpp $(srcdir)/singlecontainerwidget.cpp $(srcdir)/widgetfactory.cpp $(srcdir)/dcbutton.cpp $(srcdir)/gen_qregexplexer.cpp $(srcdir)/charselector.cpp $(srcdir)/lookaheadregexp.cpp $(srcdir)/lookaheadwidget.cpp $(srcdir)/regexp.cpp $(srcdir)/infopage.cpp $(srcdir)/kregexpeditorprivate.cpp $(srcdir)/compoundregexp.cpp $(srcdir)/auxbuttons.cpp $(srcdir)/myfontmetrics.cpp $(srcdir)/regexpbuttons.cpp $(srcdir)/userdefinedregexps.cpp $(srcdir)/verifier.cpp $(srcdir)/verifybuttons.cpp $(srcdir)/errormap.cpp $(srcdir)/qtregexphighlighter.cpp $(srcdir)/regexpconverter.cpp $(srcdir)/qtregexpconverter.cpp $(srcdir)/emacsregexpconverter.cpp $(srcdir)/regexphighlighter.cpp $(srcdir)/util.cpp  verifier.moc textwidget.moc kregexpeditorprivate.moc kregexpeditorgui.moc regexpwidget.moc verifybuttons.moc singlecontainerwidget.moc compoundwidget.moc scrollededitorwindow.moc charselector.moc editorwindow.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
-+libkregexpeditorcommon_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/kregexpeditorgui.cpp $(srcdir)/editorwindow.cpp $(srcdir)/regexpwidget.cpp $(srcdir)/drag.cpp $(srcdir)/concwidget.cpp $(srcdir)/zerowidgets.cpp $(srcdir)/dragaccepter.cpp $(srcdir)/repeatwidget.cpp $(srcdir)/characterswidget.cpp $(srcdir)/altnwidget.cpp $(srcdir)/limitedcharlineedit.cpp $(srcdir)/textregexp.cpp $(srcdir)/textrangeregexp.cpp $(srcdir)/concregexp.cpp $(srcdir)/altnregexp.cpp $(srcdir)/positionregexp.cpp $(srcdir)/dotregexp.cpp $(srcdir)/repeatregexp.cpp $(srcdir)/textwidget.cpp $(srcdir)/selectablelineedit.cpp $(srcdir)/multicontainerwidget.cpp $(srcdir)/scrollededitorwindow.cpp $(srcdir)/compoundwidget.cpp $(srcdir)/singlecontainerwidget.cpp $(srcdir)/widgetfactory.cpp $(srcdir)/dcbutton.cpp $(srcdir)/gen_qregexplexer.cpp $(srcdir)/charselector.cpp $(srcdir)/lookaheadregexp.cpp $(srcdir)/lookaheadwidget.cpp $(srcdir)/regexp.cpp $(srcdir)/infopage.cpp $(srcdir)/kregexpeditorprivate.cpp $(srcdir)/compoundregexp.cpp $(srcdir)/auxbuttons.cpp $(srcdir)/myfontmetrics.cpp $(srcdir)/regexpbuttons.cpp $(srcdir)/userdefinedregexps.cpp $(srcdir)/verifier.cpp $(srcdir)/verifybuttons.cpp $(srcdir)/errormap.cpp $(srcdir)/qtregexphighlighter.cpp $(srcdir)/regexpconverter.cpp $(srcdir)/qtregexpconverter.cpp $(srcdir)/emacsregexpconverter.cpp $(srcdir)/regexphighlighter.cpp $(srcdir)/util.cpp  kregexpeditorprivate.moc verifier.moc textwidget.moc kregexpeditorgui.moc regexpwidget.moc singlecontainerwidget.moc verifybuttons.moc compoundwidget.moc scrollededitorwindow.moc editorwindow.moc charselector.moc userdefinedregexps.moc lookaheadwidget.moc auxbuttons.moc dcbutton.moc characterswidget.moc repeatwidget.moc selectablelineedit.moc regexpbuttons.moc
- 	@echo 'creating libkregexpeditorcommon_la.all_cpp.cpp ...'; \
- 	rm -f libkregexpeditorcommon_la.all_cpp.files libkregexpeditorcommon_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libkregexpeditorcommon_la.all_cpp.final; \
 --- kregexpeditor/picts/Makefile.in
 +++ kregexpeditor/picts/Makefile.in
 @@ -104,6 +104,7 @@
@@ -62232,15 +58996,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -579,7 +588,7 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=autoverify.png begline.png characters.png wordboundary.png neglookahead.png compound.png poslookahead.png repeat.png select.png verify.png error.png endline.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am 
-+KDE_DIST=autoverify.png begline.png characters.png wordboundary.png neglookahead.png poslookahead.png compound.png repeat.png select.png verify.png error.png endline.png Makefile.in anychar.png nonwordboundary.png text.png altn.png Makefile.am 
- 
- #>+ 2
- docs-am:
 --- kregexpeditor/predefined/General/Makefile.in
 +++ kregexpeditor/predefined/General/Makefile.in
 @@ -104,6 +104,7 @@
@@ -62629,48 +59384,9 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -799,22 +808,22 @@
- mocs: progress.moc
- 
- #>+ 3
--label.moc: $(srcdir)/label.h
--	$(MOC) $(srcdir)/label.h -o label.moc
-+pluginmodule.moc: $(srcdir)/pluginmodule.h
-+	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
- 
- #>+ 2
--mocs: label.moc
-+mocs: pluginmodule.moc
- 
- #>+ 3
--pluginmodule.moc: $(srcdir)/pluginmodule.h
--	$(MOC) $(srcdir)/pluginmodule.h -o pluginmodule.moc
-+label.moc: $(srcdir)/label.h
-+	$(MOC) $(srcdir)/label.h -o label.moc
- 
- #>+ 2
--mocs: pluginmodule.moc
-+mocs: label.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  chart.moc led.moc pluginloader.moc progress.moc label.moc pluginmodule.moc
-+	-rm -f  chart.moc led.moc pluginloader.moc progress.moc pluginmodule.moc label.moc
- 
- #>+ 2
- KDE_DIST=Makefile.in Makefile.am 
-@@ -865,7 +874,7 @@
- 
- 
- #>+ 11
--libksimcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/common.cpp $(srcdir)/themeloader.cpp $(srcdir)/chart.cpp $(srcdir)/label.cpp $(srcdir)/led.cpp $(srcdir)/progress.cpp $(srcdir)/pluginglobal.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pluginmodule.cpp $(srcdir)/ksimconfig.cpp  chart.moc led.moc progress.moc pluginloader.moc pluginmodule.moc label.moc
-+libksimcore_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/common.cpp $(srcdir)/themeloader.cpp $(srcdir)/chart.cpp $(srcdir)/label.cpp $(srcdir)/led.cpp $(srcdir)/progress.cpp $(srcdir)/pluginglobal.cpp $(srcdir)/pluginloader.cpp $(srcdir)/pluginmodule.cpp $(srcdir)/ksimconfig.cpp  chart.moc led.moc progress.moc pluginloader.moc label.moc pluginmodule.moc
- 	@echo 'creating libksimcore_la.all_cpp.cpp ...'; \
- 	rm -f libksimcore_la.all_cpp.files libksimcore_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> libksimcore_la.all_cpp.final; \
 --- ksim/Makefile.in
 +++ ksim/Makefile.in
-@@ -169,6 +169,7 @@
+@@ -168,6 +168,7 @@
  FFLAGS = @FFLAGS@
  FRAMEWORK_COREAUDIO = @FRAMEWORK_COREAUDIO@
  GMSGFMT = @GMSGFMT@
@@ -62678,7 +59394,7 @@
  HAVE_GCC_VISIBILITY = @HAVE_GCC_VISIBILITY@
  INSTALL_DATA = @INSTALL_DATA@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -250,6 +251,9 @@
+@@ -249,6 +250,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62688,7 +59404,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -290,6 +294,7 @@
+@@ -289,6 +293,7 @@
  VERSION = @VERSION@
  WOVERLOADED_VIRTUAL = @WOVERLOADED_VIRTUAL@
  XGETTEXT = @XGETTEXT@
@@ -62696,7 +59412,7 @@
  XMLLINT = @XMLLINT@
  XMMS_INCLUDES = @XMMS_INCLUDES@
  XMMS_LDFLAGS = @XMMS_LDFLAGS@
-@@ -299,12 +304,9 @@
+@@ -298,12 +303,9 @@
  X_LDFLAGS = @X_LDFLAGS@
  X_PRE_LIBS = @X_PRE_LIBS@
  X_RPATH = @X_RPATH@
@@ -62709,7 +59425,7 @@
  all_includes = @all_includes@
  all_libraries = @all_libraries@
  am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-@@ -327,14 +329,18 @@
+@@ -326,14 +328,18 @@
  charselectapplet_SUBDIR_included_FALSE = @charselectapplet_SUBDIR_included_FALSE@
  charselectapplet_SUBDIR_included_TRUE = @charselectapplet_SUBDIR_included_TRUE@
  datadir = @datadir@
@@ -62728,7 +59444,7 @@
  include_ARTS_FALSE = @include_ARTS_FALSE@
  include_ARTS_TRUE = @include_ARTS_TRUE@
  include_kmilo_delli8k_FALSE = @include_kmilo_delli8k_FALSE@
-@@ -411,12 +417,15 @@
+@@ -410,12 +416,15 @@
  kwallet_SUBDIR_included_TRUE = @kwallet_SUBDIR_included_TRUE@
  libdir = @libdir@
  libexecdir = @libexecdir@
@@ -62744,7 +59460,7 @@
  qt_includes = @qt_includes@
  qt_libraries = @qt_libraries@
  sbindir = @sbindir@
-@@ -472,7 +481,7 @@
+@@ -470,7 +479,7 @@
  
  .SUFFIXES:
  .SUFFIXES: .cpp .lo .o .obj
@@ -62753,7 +59469,7 @@
  #>- 	@for dep in $?; do \
  #>- 	  case '$(am__configure_deps)' in \
  #>- 	    *$$dep*) \
-@@ -510,9 +519,9 @@
+@@ -508,9 +517,9 @@
  $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
@@ -62765,15 +59481,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -1038,7 +1047,7 @@
- 	-rm -f  ksim.moc ksimpref.moc themeprefs.moc generalprefs.moc ksimframe.moc ksimview.moc ksimsysinfo.moc monitorprefs.moc
- 
- #>+ 2
--KDE_DIST=systeminfo.h ksimframe.h ksimpref.h ksim.h baselist.h ksimsysinfo.h configure.in.in ksim_panelextensionrc monitorprefs.h Makefile.in BUGS generalprefs.h themeprefs.h ksimview.h Makefile.am 
-+KDE_DIST=systeminfo.h ksimframe.h ksimpref.h ksim.h baselist.h ksimsysinfo.h configure.in.in monitorprefs.h ksim_panelextensionrc Makefile.in BUGS generalprefs.h themeprefs.h ksimview.h Makefile.am 
- 
- #>+ 5
- clean-idl:
 --- ksim/monitors/cpu/Makefile.in
 +++ ksim/monitors/cpu/Makefile.in
 @@ -135,6 +135,7 @@
@@ -63065,15 +59772,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -791,7 +800,7 @@
- 	-rm -f  filesystemwidget.moc ksimfsystem.moc fsystemconfig.moc
- 
- #>+ 2
--KDE_DIST=fsystemconfig.h filesystemstats.h fsystemiface.h filesystemwidget.h ksimfsystem.h configure.in.in Makefile.in Makefile.am 
-+KDE_DIST=fsystemconfig.h fsystemiface.h filesystemstats.h filesystemwidget.h ksimfsystem.h configure.in.in Makefile.in Makefile.am 
- 
- #>+ 4
- clean-idl:
 --- ksim/monitors/i8k/Makefile.in
 +++ ksim/monitors/i8k/Makefile.in
 @@ -135,6 +135,7 @@
@@ -63268,49 +59966,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -810,18 +819,18 @@
- mocs: ksimsensors.moc
- 
- #>+ 3
--sensorbase.moc: $(srcdir)/sensorbase.h
--	$(MOC) $(srcdir)/sensorbase.h -o sensorbase.moc
-+sensorsconfig.moc: $(srcdir)/sensorsconfig.h
-+	$(MOC) $(srcdir)/sensorsconfig.h -o sensorsconfig.moc
- 
- #>+ 2
--mocs: sensorbase.moc
-+mocs: sensorsconfig.moc
- 
- #>+ 3
--sensorsconfig.moc: $(srcdir)/sensorsconfig.h
--	$(MOC) $(srcdir)/sensorsconfig.h -o sensorsconfig.moc
-+sensorbase.moc: $(srcdir)/sensorbase.h
-+	$(MOC) $(srcdir)/sensorbase.h -o sensorbase.moc
- 
- #>+ 2
--mocs: sensorsconfig.moc
-+mocs: sensorbase.moc
- 
- #>+ 5
- ksimsensorsiface.kidl: $(srcdir)/ksimsensorsiface.h $(DCOP_DEPENDENCIES)
-@@ -831,7 +840,7 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  ksimsensors.moc sensorbase.moc sensorsconfig.moc
-+	-rm -f  ksimsensors.moc sensorsconfig.moc sensorbase.moc
- 
- #>+ 2
- KDE_DIST=ksimsensorsiface.h sensorsconfig.h NVCtrl.h nv_control.h NVCtrlLib.h Makefile.in ksimsensors.h sensorbase.h Makefile.am 
-@@ -883,7 +892,7 @@
- 
- 
- #>+ 11
--ksim_sensors_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksimsensors.cpp $(srcdir)/sensorsconfig.cpp $(srcdir)/sensorbase.cpp ksimsensorsiface_skel.cpp  ksimsensors.moc sensorsconfig.moc sensorbase.moc
-+ksim_sensors_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/ksimsensors.cpp $(srcdir)/sensorsconfig.cpp $(srcdir)/sensorbase.cpp ksimsensorsiface_skel.cpp  ksimsensors.moc sensorbase.moc sensorsconfig.moc
- 	@echo 'creating ksim_sensors_la.all_cpp.cpp ...'; \
- 	rm -f ksim_sensors_la.all_cpp.files ksim_sensors_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> ksim_sensors_la.all_cpp.final; \
 --- ksim/monitors/mail/Makefile.in
 +++ ksim/monitors/mail/Makefile.in
 @@ -137,6 +137,7 @@
@@ -63699,45 +60354,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-kde_moduleLTLIBRARIES: $(kde_module_LTLIBRARIES)
  	@$(NORMAL_INSTALL)
-@@ -850,22 +859,22 @@
- mocs: hostdialog.moc
- 
- #>+ 3
--chartmonitor.moc: $(srcdir)/chartmonitor.h
--	$(MOC) $(srcdir)/chartmonitor.h -o chartmonitor.moc
-+probedialog.moc: $(srcdir)/probedialog.h
-+	$(MOC) $(srcdir)/probedialog.h -o probedialog.moc
- 
- #>+ 2
--mocs: chartmonitor.moc
-+mocs: probedialog.moc
- 
- #>+ 3
--probedialog.moc: $(srcdir)/probedialog.h
--	$(MOC) $(srcdir)/probedialog.h -o probedialog.moc
-+chartmonitor.moc: $(srcdir)/chartmonitor.h
-+	$(MOC) $(srcdir)/chartmonitor.h -o chartmonitor.moc
- 
- #>+ 2
--mocs: probedialog.moc
-+mocs: chartmonitor.moc
- 
- #>+ 3
- clean-metasources:
--	-rm -f  monitordialog.moc monitor.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc walker.moc view.moc configpage.moc hostdialog.moc chartmonitor.moc probedialog.moc
-+	-rm -f  monitordialog.moc monitor.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc walker.moc view.moc configpage.moc hostdialog.moc probedialog.moc chartmonitor.moc
- 
- #>+ 2
- KDE_DIST=snmp.h browsedialogbase.ui identifier.h hostconfig.h plugin.h monitorconfig.h walker.h snmp_p.h value.h labelmonitor.h probedialog.h pdu.h hostdialogbase.ui proberesultdialog.h monitor.h snmplib.h monitordialogbase.ui proberesultdialogbase.ui chartmonitor.h monitordialog.h configure.in.in hostdialog.h value_p.h view.h Makefile.in browsedialog.h configpage.h session.h Snmp.desktop configwidget.ui Makefile.am 
-@@ -925,7 +934,7 @@
- 
- 
- #>+ 11
--ksim_snmp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/view.cpp $(srcdir)/configpage.cpp $(srcdir)/snmp.cpp $(srcdir)/hostdialog.cpp $(srcdir)/value.cpp $(srcdir)/monitor.cpp $(srcdir)/monitordialog.cpp $(srcdir)/labelmonitor.cpp $(srcdir)/chartmonitor.cpp $(srcdir)/identifier.cpp $(srcdir)/monitorconfig.cpp $(srcdir)/hostconfig.cpp $(srcdir)/session.cpp $(srcdir)/probedialog.cpp $(srcdir)/snmplib.cpp $(srcdir)/pdu.cpp $(srcdir)/proberesultdialog.cpp $(srcdir)/browsedialog.cpp $(srcdir)/walker.cpp configwidget.cpp hostdialogbase.cpp monitordialogbase.cpp proberesultdialogbase.cpp browsedialogbase.cpp  monitordialog.moc monitor.moc hostdialogbase.moc view.moc browsedialogbase.moc configwidget.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc monitordialogbase.moc proberesultdialogbase.moc walker.moc configpage.moc hostdialog.moc chartmonitor.moc probedialog.moc
-+ksim_snmp_la.all_cpp.cpp: $(srcdir)/Makefile.in $(srcdir)/plugin.cpp $(srcdir)/view.cpp $(srcdir)/configpage.cpp $(srcdir)/snmp.cpp $(srcdir)/hostdialog.cpp $(srcdir)/value.cpp $(srcdir)/monitor.cpp $(srcdir)/monitordialog.cpp $(srcdir)/labelmonitor.cpp $(srcdir)/chartmonitor.cpp $(srcdir)/identifier.cpp $(srcdir)/monitorconfig.cpp $(srcdir)/hostconfig.cpp $(srcdir)/session.cpp $(srcdir)/probedialog.cpp $(srcdir)/snmplib.cpp $(srcdir)/pdu.cpp $(srcdir)/proberesultdialog.cpp $(srcdir)/browsedialog.cpp $(srcdir)/walker.cpp configwidget.cpp hostdialogbase.cpp monitordialogbase.cpp proberesultdialogbase.cpp browsedialogbase.cpp  monitordialog.moc monitor.moc hostdialogbase.moc view.moc browsedialogbase.moc configwidget.moc proberesultdialog.moc browsedialog.moc labelmonitor.moc monitordialogbase.moc proberesultdialogbase.moc walker.moc configpage.moc hostdialog.moc probedialog.moc chartmonitor.moc
- 	@echo 'creating ksim_snmp_la.all_cpp.cpp ...'; \
- 	rm -f ksim_snmp_la.all_cpp.files ksim_snmp_la.all_cpp.final; \
- 	echo "#define KDE_USE_FINAL 1" >> ksim_snmp_la.all_cpp.final; \
 --- ksim/pics/Makefile.in
 +++ ksim/pics/Makefile.in
 @@ -110,6 +110,7 @@
@@ -63835,34 +60451,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -717,23 +726,23 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=cr16-app-ksim.png cr32-app-ksim.png cr48-app-ksim.png Makefile.in Makefile.am 
-+KDE_DIST=cr16-app-ksim.png cr48-app-ksim.png cr32-app-ksim.png Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
- #>+ 13
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksim.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-ksim.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksim.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/ksim.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/ksim.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/ksim.png
- 
- #>+ 15
 --- ksim/pics/misc/Makefile.in
 +++ ksim/pics/misc/Makefile.in
 @@ -104,6 +104,7 @@
@@ -64445,33 +61033,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -774,20 +783,20 @@
- 
- #>+ 16
- install-kde-icons:
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/hi48-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktimer.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/hi16-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktimer.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/hi48-app-ktimer.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/ktimer.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/ktimer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/ktimer.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/ktimer.png
- 
- #>+ 15
- force-reedit:
 --- kwallet/icons/Makefile.in
 +++ kwallet/icons/Makefile.in
 @@ -94,6 +94,7 @@
@@ -64569,27 +61130,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -562,16 +571,16 @@
- #>+ 13
- install-kde-icons:
- 	$(mkinstalldirs) $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-wallet_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-wallet_closed.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_closed.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-folder_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
- 	$(INSTALL_DATA) $(srcdir)/cr22-action-folder_closed.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_closed.png
--	$(INSTALL_DATA) $(srcdir)/cr22-action-wallet_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
-+	$(INSTALL_DATA) $(srcdir)/cr22-action-folder_open.png $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
- 
- uninstall-kde-icons:
-+	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
- 	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_closed.png
--	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
- 	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_closed.png
--	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/wallet_open.png
-+	-rm -f $(DESTDIR)$(picsdir)/crystalsvg/22x22/actions/folder_open.png
- 
- #>+ 15
- force-reedit:
 --- kwallet/konfigurator/Makefile.in
 +++ kwallet/konfigurator/Makefile.in
 @@ -141,6 +141,7 @@
@@ -64784,38 +61324,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -970,25 +979,25 @@
- 
- #>+ 22
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
--	$(INSTALL_DATA) $(srcdir)/hi128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/hi22-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwalletmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/hi32-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwalletmanager.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
--	$(INSTALL_DATA) $(srcdir)/hi16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps
-+	$(INSTALL_DATA) $(srcdir)/hi128-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps
- 	$(INSTALL_DATA) $(srcdir)/hi64-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwalletmanager.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps
-+	$(INSTALL_DATA) $(srcdir)/hi16-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps
- 	$(INSTALL_DATA) $(srcdir)/hi48-app-kwalletmanager.png $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwalletmanager.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/22x22/apps/kwalletmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/kwalletmanager.png
--	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/128x128/apps/kwalletmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/64x64/apps/kwalletmanager.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/16x16/apps/kwalletmanager.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/hicolor/48x48/apps/kwalletmanager.png
- 
- #>+ 15
 --- Makefile.in
 +++ Makefile.in
 @@ -128,6 +128,7 @@
@@ -64930,7 +61438,7 @@
  
  #>+ 2
 -KDE_DIST=Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in acinclude.m4 Makefile.am Makefile.am.in 
-+KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 Makefile.am.in 
++KDE_DIST=stamp-h.in Mainpage.dox COPYING-DOCS subdirs Makefile.in configure.files config.h.in kdeutils.lsm configure.in Makefile.cvs aclocal.m4 configure.in.in configure acinclude.m4 Makefile.am Makefile.am.in 
  
  #>+ 2
  docs-am:
@@ -65128,77 +61636,6 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
  mostlyclean-libtool:
-@@ -559,49 +568,49 @@
- 
- #>+ 46
- install-kde-icons:
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr128-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr22-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr16-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/superkaramba_theme.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr64-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr48-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps
- 	$(INSTALL_DATA) $(srcdir)/cr22-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/superkaramba.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr64-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
-+	$(INSTALL_DATA) $(srcdir)/cr64-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps
- 	$(INSTALL_DATA) $(srcdir)/cr32-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/superkaramba.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
--	$(INSTALL_DATA) $(srcdir)/crsc-mime-superkaramba_theme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes
--	$(INSTALL_DATA) $(srcdir)/cr22-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr128-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
-+	$(INSTALL_DATA) $(srcdir)/cr48-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps
- 	$(INSTALL_DATA) $(srcdir)/cr16-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/superkaramba.png
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps
--	$(INSTALL_DATA) $(srcdir)/cr64-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/crsc-mime-superkaramba_theme.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-+	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes
-+	$(INSTALL_DATA) $(srcdir)/cr48-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps
- 	$(INSTALL_DATA) $(srcdir)/cr128-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/superkaramba.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps
- 	$(INSTALL_DATA) $(srcdir)/crsc-app-superkaramba.svgz $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/superkaramba.svgz
--	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps
--	$(INSTALL_DATA) $(srcdir)/cr48-app-superkaramba.png $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
- 	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes
- 	$(INSTALL_DATA) $(srcdir)/cr32-mime-superkaramba_theme.png $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/superkaramba_theme.png
- 
- uninstall-kde-icons:
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/mimetypes/superkaramba_theme.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/apps/superkaramba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/mimetypes/superkaramba_theme.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/apps/superkaramba.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/22x22/mimetypes/superkaramba_theme.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/mimetypes/superkaramba_theme.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/16x16/apps/superkaramba.png
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/64x64/apps/superkaramba.png
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/mimetypes/superkaramba_theme.svgz
-+	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/mimetypes/superkaramba_theme.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/128x128/apps/superkaramba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/scalable/apps/superkaramba.svgz
--	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/48x48/apps/superkaramba.png
- 	-rm -f $(DESTDIR)$(kde_icondir)/crystalsvg/32x32/mimetypes/superkaramba_theme.png
- 
- #>+ 15
 --- superkaramba/Makefile.in
 +++ superkaramba/Makefile.in
 @@ -112,6 +112,7 @@
@@ -65521,116 +61958,3 @@
  	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
-@@ -944,18 +953,18 @@
- mocs: input.moc
- 
- #>+ 3
--taskmanager.moc: $(srcdir)/taskmanager.h
--	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
-+sensor.moc: $(srcdir)/sensor.h
-+	$(MOC) $(srcdir)/sensor.h -o sensor.moc
- 
- #>+ 2
--mocs: taskmanager.moc
-+mocs: sensor.moc
- 
- #>+ 3
--sensor.moc: $(srcdir)/sensor.h
--	$(MOC) $(srcdir)/sensor.h -o sensor.moc
-+taskmanager.moc: $(srcdir)/taskmanager.h
-+	$(MOC) $(srcdir)/taskmanager.h -o taskmanager.moc
- 
- #>+ 2
--mocs: sensor.moc
-+mocs: taskmanager.moc
- 
- #>+ 3
- datesensor.moc: $(srcdir)/datesensor.h
-@@ -972,18 +981,18 @@
- mocs: themesdlg.moc
- 
- #>+ 3
--textlabel.moc: $(srcdir)/textlabel.h
--	$(MOC) $(srcdir)/textlabel.h -o textlabel.moc
-+programsensor.moc: $(srcdir)/programsensor.h
-+	$(MOC) $(srcdir)/programsensor.h -o programsensor.moc
- 
- #>+ 2
--mocs: textlabel.moc
-+mocs: programsensor.moc
- 
- #>+ 3
--programsensor.moc: $(srcdir)/programsensor.h
--	$(MOC) $(srcdir)/programsensor.h -o programsensor.moc
-+textlabel.moc: $(srcdir)/textlabel.h
-+	$(MOC) $(srcdir)/textlabel.h -o textlabel.moc
- 
- #>+ 2
--mocs: programsensor.moc
-+mocs: textlabel.moc
- 
- #>+ 3
- bar.moc: $(srcdir)/bar.h
-@@ -1007,18 +1016,18 @@
- mocs: themewidget.moc
- 
- #>+ 3
--imagelabel.moc: $(srcdir)/imagelabel.h
--	$(MOC) $(srcdir)/imagelabel.h -o imagelabel.moc
-+karamba.moc: $(srcdir)/karamba.h
-+	$(MOC) $(srcdir)/karamba.h -o karamba.moc
- 
- #>+ 2
--mocs: imagelabel.moc
-+mocs: karamba.moc
- 
- #>+ 3
--karamba.moc: $(srcdir)/karamba.h
--	$(MOC) $(srcdir)/karamba.h -o karamba.moc
-+imagelabel.moc: $(srcdir)/imagelabel.h
-+	$(MOC) $(srcdir)/imagelabel.h -o imagelabel.moc
- 
- #>+ 2
--mocs: karamba.moc
-+mocs: imagelabel.moc
- 
- #>+ 3
- richtextlabel.moc: $(srcdir)/richtextlabel.h
-@@ -1091,18 +1100,18 @@
- mocs: meter.moc
- 
- #>+ 3
--networksensor.moc: $(srcdir)/networksensor.h
--	$(MOC) $(srcdir)/networksensor.h -o networksensor.moc
-+xmmssensor.moc: $(srcdir)/xmmssensor.h
-+	$(MOC) $(srcdir)/xmmssensor.h -o xmmssensor.moc
- 
- #>+ 2
--mocs: networksensor.moc
-+mocs: xmmssensor.moc
- 
- #>+ 3
--xmmssensor.moc: $(srcdir)/xmmssensor.h
--	$(MOC) $(srcdir)/xmmssensor.h -o xmmssensor.moc
-+networksensor.moc: $(srcdir)/networksensor.h
-+	$(MOC) $(srcdir)/networksensor.h -o networksensor.moc
- 
- #>+ 2
--mocs: xmmssensor.moc
-+mocs: networksensor.moc
- 
- #>+ 3
- graph.moc: $(srcdir)/graph.h
-@@ -1127,10 +1136,10 @@
- 
- #>+ 3
- clean-metasources:
--	-rm -f  cpusensor.moc input.moc taskmanager.moc sensor.moc datesensor.moc themesdlg.moc textlabel.moc programsensor.moc bar.moc rsssensor.moc themewidget.moc imagelabel.moc karamba.moc richtextlabel.moc sensorsensor.moc clickmap.moc clickarea.moc kwidgetlistbox.moc systemtray.moc disksensor.moc memsensor.moc showdesktop.moc meter.moc networksensor.moc xmmssensor.moc graph.moc karambaapp.moc textfilesensor.moc
-+	-rm -f  cpusensor.moc input.moc sensor.moc taskmanager.moc datesensor.moc themesdlg.moc programsensor.moc textlabel.moc bar.moc rsssensor.moc themewidget.moc karamba.moc imagelabel.moc richtextlabel.moc sensorsensor.moc clickmap.moc clickarea.moc kwidgetlistbox.moc systemtray.moc disksensor.moc memsensor.moc showdesktop.moc meter.moc xmmssensor.moc networksensor.moc graph.moc karambaapp.moc textfilesensor.moc
- 
- #>+ 2
--KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h karambasessionmanaged.h richtextlabel.h showdesktop.h superkaramba.kcfg imagelabel.h svcgrp_python.h uptimesensor.h systray_python.h taskbartest.h disksensor.h misc_python.h datesensor.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp widget_python.h bar.h taskbartest.cpp systemtray.h superkarambasettings.kcfgc rsssensor.h clickable.h graph.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h sensorparams.h themewidget_layout.ui clickarea.h karambarootpixmap.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
-+KDE_DIST=themes_layout.ui noatunsensor.h sensor.h meter.h meter_python.h clickmap.h menu_python.h task_python.h richtextlabel_python.h sensorsensor.h karambalistboxitem.h taskmanager.h textlabel.h textlabel_python.h richtextlabel.h karambasessionmanaged.h showdesktop.h superkaramba.kcfg imagelabel.h uptimesensor.h svcgrp_python.h systray_python.h disksensor.h taskbartest.h datesensor.h misc_python.h textfield.h imagelabel_python.h textfilesensor.h clickable.cpp bar.h taskbartest.cpp widget_python.h superkarambasettings.kcfgc systemtray.h rsssensor.h graph.h clickable.h xmmssensor.h dcopinterface.h superkaramba.lsm config_python.h graph_python.h karambainterface.h Makefile.in bar_python.h superkaramba.desktop networksensor.h themewidget_layout.ui sensorparams.h karambarootpixmap.h clickarea.h memsensor.h programsensor.h superkarambaui.rc Makefile.am cpusensor.h 
- 
- #>+ 5
- clean-idl:




More information about the pkg-kde-commits mailing list